diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..14bee08e3811
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,16 @@
+**/deps.nix linguist-generated
+**/node-packages.nix linguist-generated
+
+pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated
+pkgs/development/r-modules/*-packages.nix linguist-generated
+pkgs/development/haskell-modules/hackage-packages.nix linguist-generated
+pkgs/development/beam-modules/hex-packages.nix linguist-generated
+
+doc/** linguist-documentation
+doc/default.nix linguist-documentation=false
+
+nixos/doc/** linguist-documentation
+nixos/doc/default.nix linguist-documentation=false
+
+nixos/modules/module-list.nix merge=union
+pkgs/top-level/all-packages.nix merge=union
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9e89cc78954f..dde31a2c0c01 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -10,18 +10,19 @@
# This file
/.github/CODEOWNERS @edolstra
-# Boostraping and core infra
-/pkgs/stdenv @edolstra
-/pkgs/build-support/cc-wrapper @edolstra
-
# Libraries
/lib @edolstra @nbp
+/lib/systems @nbp @ericson2314
# Nixpkgs Internals
-/default.nix @nbp
-/pkgs/top-level/default.nix @nbp
-/pkgs/top-level/impure.nix @nbp
-/pkgs/top-level/stage.nix @nbp
+/default.nix @nbp
+/pkgs/top-level/default.nix @nbp @Ericson2314
+/pkgs/top-level/impure.nix @nbp @Ericson2314
+/pkgs/top-level/stage.nix @nbp @Ericson2314
+/pkgs/stdenv
+/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
+/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
+/pkgs/build-support/setup-hooks @Ericson2314
# NixOS Internals
/nixos/default.nix @nbp
@@ -82,4 +83,10 @@
/pkgs/applications/editors/eclipse @rycee
# https://github.com/NixOS/nixpkgs/issues/31401
-/lib/maintainers.nix @ghost
+/lib/licenses.nix @ghost
+
+# Qt / KDE
+/pkgs/applications/kde @ttuegel
+/pkgs/desktops/plasma-5 @ttuegel
+/pkgs/development/libraries/kde-frameworks @ttuegel
+/pkgs/development/libraries/qt-5 @ttuegel
diff --git a/.version b/.version
index a88d2ca32319..770bde1f44b3 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-18.03
+18.09
diff --git a/COPYING b/COPYING
index afc460fff5cb..198597a1b410 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2017 Eelco Dolstra and the Nixpkgs/NixOS contributors
+Copyright (c) 2003-2018 Eelco Dolstra and the Nixpkgs/NixOS contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/README.md b/README.md
index 64cfb25eac34..3f2ff48dd92a 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
-[
](https://nixos.org/nixos)
+[
](https://nixos.org/nixos)
-[](https://travis-ci.org/NixOS/nixpkgs)
[](https://www.codetriage.com/nixos/nixpkgs)
Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package
-manager. It is periodically built and tested by the [hydra](http://hydra.nixos.org/)
+manager. It is periodically built and tested by the [Hydra](https://hydra.nixos.org/)
build daemon as so-called channels. To get channel information via git, add
[nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote:
@@ -23,7 +22,7 @@ release and `nixos-unstable` for the latest successful build of master:
For pull-requests, please rebase onto nixpkgs `master`.
-[NixOS](https://nixos.org/nixos/) linux distribution source code is located inside
+[NixOS](https://nixos.org/nixos/) Linux distribution source code is located inside
`nixos/` folder.
* [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation)
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 765fc56c3bb3..d556c7ebe1ed 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -18,9 +18,9 @@
tab settings so it’s asking for trouble.
Use lowerCamelCase for variable
- names, not UpperCamelCase. TODO: naming of
- attributes in
- all-packages.nix?
+ names, not UpperCamelCase. Note, this rule does
+ not apply to package attribute names, which instead follow the rules
+ in .
Function calls with attribute set arguments are
written as
@@ -220,9 +220,10 @@ args.stdenv.mkDerivation (args // {
The variable name used for the instantiated package
in all-packages.nix, and when passing it as a
- dependency to other functions. This is what Nix expression authors
- see. It can also be used when installing using nix-env
- -iA.
+ dependency to other functions. Typically this is called the
+ package attribute name. This is what Nix
+ expression authors see. It can also be used when installing using
+ nix-env -iA.
The filename for (the directory containing) the Nix
expression.
@@ -259,12 +260,12 @@ bound to the variable name e2fsprogs in
Also append "unstable" to the name - e.g.,
"pkgname-unstable-2014-09-23".
- Dashes in the package name should be preserved
- in new variable names, rather than converted to underscores
- (which was convention up to around 2013 and most names
- still have underscores instead of dashes) — e.g.,
- http-parser instead of
- http_parser.
+ Dashes in the package name should be preserved in
+ new variable names, rather than converted to underscores or camel
+ cased — e.g., http-parser instead of
+ http_parser or httpParser. The
+ hyphenated style is preferred in all three package
+ names.
If there are multiple versions of a package, this
should be reflected in the variable names in
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 4b35b72feae0..10e4706b0590 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -61,7 +61,7 @@
The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software.
- Instead, it is only relevant for compatability with building certain specific compilers and build tools.
+ Instead, it is only relevant for compatibility with building certain specific compilers and build tools.
It can be safely ignored for all other packages.
@@ -162,7 +162,7 @@
A runtime dependency between 2 packages implies that between them both the host and target platforms match.
This is directly implied by the meaning of "host platform" and "runtime dependency":
- The package dependency exists while both packages are runnign on a single host platform.
+ The package dependency exists while both packages are running on a single host platform.
A build time dependency, however, implies a shift in platforms between the depending package and the depended-on package.
@@ -187,7 +187,7 @@
How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from buildPackages, whereas run-time dependencies are taken from the top level attribute set.
For example, buildPackages.gcc should be used at build time, while gcc should be used at run time.
Now, for most of Nixpkgs's history, there was no buildPackages, and most packages have not been refactored to use it explicitly.
- Instead, one can use the four attributes used for specifying dependencies as documented in .
+ Instead, one can use the six (gasp) attributes used for specifying dependencies as documented in .
We "splice" together the run-time and build-time package sets with callPackage, and then mkDerivation for each of four attributes pulls the right derivation out.
This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling.
Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of buildPackages needed.
@@ -200,6 +200,45 @@
+
+ Cross packagaing cookbook
+
+ Some frequently problems when packaging for cross compilation are good to just spell and answer.
+ Ideally the information above is exhaustive, so this section cannot provide any new information,
+ but its ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem.
+ Feel free to add to this list!
+
+
+
+
+ What if my package's build system needs to build a C program to be run under the build environment?
+
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ Add it to your mkDerivation invocation.
+
+
+
+
+ My package fails to find ar.
+
+
+ Many packages assume that an unprefixed ar is available, but Nix doesn't provide one.
+ It only provides a prefixed one, just as it only does for all the other binutils programs.
+ It may be necessary to patch the package to fix the build system to use a prefixed `ar`.
+
+
+
+
+ My package's testsuite needs to run host platform code.
+
+
+ doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom;
+ Add it to your mkDerivation invocation.
+
+
+
+
@@ -214,8 +253,19 @@
or also with crossSystem, in which case packages run on the latter, but all building happens on the former.
Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section.
As mentioned above, lib.systems.examples has some platforms which are used as arguments for these parameters in practice.
- You can use them programmatically, or on the command line like nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz'.
+ You can use them programmatically, or on the command line:
+nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz' -A whatever
+
+
+ Eventually we would like to make these platform examples an unnecessary convenience so that
+nix-build <nixpkgs> --arg crossSystem.config '<arch>-<os>-<vendor>-<abi>' -A whatever
+ works in the vast majority of cases.
+ The problem today is dependencies on other sorts of configuration which aren't given proper defaults.
+ We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf.
+ Issue #34274 tracks this inconvenience along with its root cause in crufty configuration options.
+
+
While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields.
As discussed in the previous section, only one of system, config, and parsed is needed to infer the other two.
diff --git a/doc/default.nix b/doc/default.nix
index cfd51fba257e..ec458634a42c 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -23,11 +23,12 @@ pkgs.stdenv.mkDerivation {
buildCommand = let toDocbook = { useChapters ? false, inputFile, outputFile }:
let
- extraHeader = ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" '';
+ extraHeader = lib.optionalString (!useChapters)
+ ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" '';
in ''
{
- pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--top-level-division=chapter"} \
- --smart \
+ pandoc '${inputFile}' -w docbook+smart ${lib.optionalString useChapters "--top-level-division=chapter"} \
+ -f markdown+smart \
| sed -e 's|||' \
-e 's| .version
diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml
index d16c9f3dc87f..0ce1abd6194c 100644
--- a/doc/languages-frameworks/coq.xml
+++ b/doc/languages-frameworks/coq.xml
@@ -11,31 +11,53 @@
in the Coq derivation.
- Some libraries require OCaml and sometimes also Camlp5. The exact
- versions that were used to build Coq are saved in the
+ Some libraries require OCaml and sometimes also Camlp5 or findlib.
+ The exact versions that were used to build Coq are saved in the
coq.ocaml and coq.camlp5
- attributes.
+ and coq.findlib attributes.
+
+
+ Coq libraries may be compatible with some specific versions of Coq only.
+ The compatibleCoqVersions attribute is used to
+ precisely select those versions of Coq that are compatible with this
+ derivation.
Here is a simple package example. It is a pure Coq library, thus it
- only depends on Coq. Its makefile has been
- generated using coq_makefile so we only have to
+ depends on Coq. It builds on the Mathematical Components library, thus it
+ also takes mathcomp as buildInputs.
+ Its Makefile has been generated using
+ coq_makefile so we only have to
set the $COQLIB variable at install time.
-{stdenv, fetchurl, coq}:
-stdenv.mkDerivation {
- src = fetchurl {
- url = http://coq.inria.fr/pylons/contribs/files/Karatsuba/v8.4/Karatsuba.tar.gz;
- sha256 = "0ymfpv4v49k4fm63nq6gcl1hbnnxrvjjp7yzc4973n49b853c5b1";
+{ stdenv, fetchFromGitHub, coq, mathcomp }:
+
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-multinomials-${version}";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "math-comp";
+ repo = "multinomials";
+ rev = version;
+ sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
};
- name = "coq-karatsuba";
-
buildInputs = [ coq ];
+ propagatedBuildInputs = [ mathcomp ];
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ meta = {
+ description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
+ inherit (src.meta) homepage;
+ license = stdenv.lib.licenses.cecill-b;
+ inherit (coq.meta) platforms;
+ };
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+ };
}
-
diff --git a/doc/languages-frameworks/emscripten.md b/doc/languages-frameworks/emscripten.md
new file mode 100644
index 000000000000..24c49ec1409c
--- /dev/null
+++ b/doc/languages-frameworks/emscripten.md
@@ -0,0 +1,185 @@
+# User's Guide to Emscripten in Nixpkgs
+
+[Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler
+
+This section of the manual covers how to use `emscripten` in nixpkgs.
+
+Minimal requirements:
+
+* nix
+* nixpkgs
+
+Modes of use of `emscripten`:
+
+* **Imperative usage** (on the command line):
+
+ If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions you can use these commands:
+
+ * `nix-env -i emscripten`
+ * `nix-shell -p emscripten`
+
+* **Declarative usage**:
+
+ This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`.
+ * build and install all packages:
+ * `nix-env -iA emscriptenPackages`
+
+ * dev-shell for zlib implementation hacking:
+ * `nix-shell -A emscriptenPackages.zlib`
+
+
+## Imperative usage
+
+A few things to note:
+
+* `export EMCC_DEBUG=2` is nice for debugging
+* `~/.emscripten`, the build artifact cache sometimes creates issues and needs to be removed from time to time
+
+
+## Declarative usage
+
+Let's see two different examples from `pkgs/top-level/emscripten-packages.nix`:
+
+* `pkgs.zlib.override`
+* `pkgs.buildEmscriptenPackage`
+
+Both are interesting concepts.
+
+A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = true` is a default meaning that each emscriptenPackage requires a `checkPhase` implemented.
+
+* Use `export EMCC_DEBUG=2` from within a emscriptenPackage's `phase` to get more detailed debug output what is going wrong.
+* ~/.emscripten cache is requiring us to set `HOME=$TMPDIR` in individual phases. This makes compilation slower but also makes it more deterministic.
+
+### Usage 1: pkgs.zlib.override
+
+This example uses `zlib` from nixpkgs but instead of compiling **C** to **ELF** it compiles **C** to **JS** since we were using `pkgs.zlib.override` and changed stdenv to `pkgs.emscriptenStdenv`. A few adaptions and hacks were set in place to make it working. One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. However, this can also be the downside...
+
+See the `zlib` example:
+
+ zlib = (pkgs.zlib.override {
+ stdenv = pkgs.emscriptenStdenv;
+ }).overrideDerivation
+ (old: rec {
+ buildInputs = old.buildInputs ++ [ pkgconfig ];
+ # we need to reset this setting!
+ NIX_CFLAGS_COMPILE="";
+ configurePhase = ''
+ # FIXME: Some tests require writing at $HOME
+ HOME=$TMPDIR
+ runHook preConfigure
+
+ #export EMCC_DEBUG=2
+ emconfigure ./configure --prefix=$out --shared
+
+ runHook postConfigure
+ '';
+ dontStrip = true;
+ outputs = [ "out" ];
+ buildPhase = ''
+ emmake make
+ '';
+ installPhase = ''
+ emmake make install
+ '';
+ checkPhase = ''
+ echo "================= testing zlib using node ================="
+
+ echo "Compiling a custom test"
+ set -x
+ emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \
+ libz.so.${old.version} -I . -o example.js
+
+ echo "Using node to execute the test"
+ ${pkgs.nodejs}/bin/node ./example.js
+
+ set +x
+ if [ $? -ne 0 ]; then
+ echo "test failed for some reason"
+ exit 1;
+ else
+ echo "it seems to work! very good."
+ fi
+ echo "================= /testing zlib using node ================="
+ '';
+
+ postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin ''
+ substituteInPlace configure \
+ --replace '/usr/bin/libtool' 'ar' \
+ --replace 'AR="libtool"' 'AR="ar"' \
+ --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
+ '';
+ });
+
+### Usage 2: pkgs.buildEmscriptenPackage
+
+This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used.
+
+ xmlmirror = pkgs.buildEmscriptenPackage rec {
+ name = "xmlmirror";
+
+ buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ];
+ nativeBuildInputs = [ pkgconfig zlib ];
+
+ src = pkgs.fetchgit {
+ url = "https://gitlab.com/odfplugfest/xmlmirror.git";
+ rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd";
+ sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b";
+ };
+
+ configurePhase = ''
+ rm -f fastXmlLint.js*
+ # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728
+ # https://gitlab.com/odfplugfest/xmlmirror/issues/8
+ sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv
+ # https://github.com/kripken/emscripten/issues/6344
+ # https://gitlab.com/odfplugfest/xmlmirror/issues/9
+ sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv
+ # https://gitlab.com/odfplugfest/xmlmirror/issues/11
+ sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv
+ '';
+
+ buildPhase = ''
+ HOME=$TMPDIR
+ make -f Makefile.emEnv
+ '';
+
+ outputs = [ "out" "doc" ];
+
+ installPhase = ''
+ mkdir -p $out/share
+ mkdir -p $doc/share/${name}
+
+ cp Demo* $out/share
+ cp -R codemirror-5.12 $out/share
+ cp fastXmlLint.js* $out/share
+ cp *.xsd $out/share
+ cp *.js $out/share
+ cp *.xhtml $out/share
+ cp *.html $out/share
+ cp *.json $out/share
+ cp *.rng $out/share
+ cp README.md $doc/share/${name}
+ '';
+ checkPhase = ''
+
+ '';
+ };
+
+### Declarative debugging
+
+Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go trough the individual steps. This makes it easy to build a good `unit test` or list the files of the project.
+
+1. `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz`
+2. `cd /tmp/`
+3. `unpackPhase`
+4. cd libz-1.2.3
+5. `configurePhase`
+6. `buildPhase`
+7. ... happy hacking...
+
+## Summary
+
+Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from.
+
+If in trouble, ask the maintainers.
+
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index da3fd770ce72..1623e0d276f2 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -48,7 +48,7 @@ trouble with packages like `3dmodels` and `4Blocks`, because these names are
invalid identifiers in the Nix language. The issue of how to deal with these
rare corner cases is currently unresolved.)
-Haskell packages who's Nix name (second column) begins with a `haskell-` prefix
+Haskell packages whose Nix name (second column) begins with a `haskell-` prefix
are packages that provide a library whereas packages without that prefix
provide just executables. Libraries may provide executables too, though: the
package `haskell-pandoc`, for example, installs both a library and an
@@ -334,14 +334,10 @@ navigate there.
Finally, you can run
```shell
-hoogle server -p 8080
+hoogle server -p 8080 --local
```
and navigate to http://localhost:8080/ for your own local
-[Hoogle](https://www.haskell.org/hoogle/). Note, however, that Firefox and
-possibly other browsers disallow navigation from `http:` to `file:` URIs for
-security reasons, which might be quite an inconvenience. See [this
-page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for
-workarounds.
+[Hoogle](https://www.haskell.org/hoogle/).
### How to build a Haskell project using Stack
@@ -581,8 +577,8 @@ nix-shell "" -A haskellPackages.bar.env
Every Haskell package set takes a function called `overrides` that you can use
to manipulate the package as much as you please. One useful application of this
feature is to replace the default `mkDerivation` function with one that enables
-library profiling for all packages. To accomplish that, add configure the
-following snippet in your `~/.config/nixpkgs/config.nix` file:
+library profiling for all packages. To accomplish that add the following
+snippet to your `~/.config/nixpkgs/config.nix` file:
```nix
{
packageOverrides = super: let self = super.pkgs; in
@@ -693,9 +689,7 @@ might be necessary to purge the local caches that store data from those
machines to disable these binary channels for the duration of the previous
command, i.e. by running:
```shell
-rm /nix/var/nix/binary-cache-v3.sqlite
-rm /nix/var/nix/manifests/*
-rm /nix/var/nix/channel-cache/*
+rm ~/.cache/nix/binary-cache*.sqlite
```
### Builds on Darwin fail with `math.h` not found
@@ -777,14 +771,14 @@ to find out the store path of the system's zlib library. Now, you can
stack --extra-lib-dirs=/nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8/lib build
```
- Typically, you'll need `--extra-include-dirs` as well. It's possible
- to add those flag to the project's `stack.yaml` or your user's
- global `~/.stack/global/stack.yaml` file so that you don't have to
- specify them manually every time. But again, you're likely better off
- using Stack's Nix support instead.
+Typically, you'll need `--extra-include-dirs` as well. It's possible
+to add those flag to the project's `stack.yaml` or your user's
+global `~/.stack/global/stack.yaml` file so that you don't have to
+specify them manually every time. But again, you're likely better off
+using Stack's Nix support instead.
- The same thing applies to `cabal configure`, of course, if you're
- building with `cabal-install` instead of Stack.
+The same thing applies to `cabal configure`, of course, if you're
+building with `cabal-install` instead of Stack.
### Creating statically linked binaries
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index fc15d847d15f..6743c131201f 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -30,6 +30,7 @@ such as Perl or Haskell. These are described in this chapter.
+
diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml
index dfb463b99912..149fcb275a09 100644
--- a/doc/languages-frameworks/perl.xml
+++ b/doc/languages-frameworks/perl.xml
@@ -177,5 +177,19 @@ you need it.
+Cross-compiling modules
+
+Nixpkgs has experimental support for cross-compiling Perl
+modules. In many cases, it will just work out of the box, even for
+modules with native extensions. Sometimes, however, the Makefile.PL
+for a module may (indirectly) import a native module. In that case,
+you will need to make a stub for that module that will satisfy the
+Makefile.PL and install it into
+lib/perl5/site_perl/cross_perl/${perl.version}.
+See the postInstall for DBI for
+an example.
+
+
+
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 9172d7122139..0f871395854c 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -134,7 +134,7 @@ with
```nix
with import {};
-python35.withPackages (ps: [ps.numpy ps.toolz])
+(python35.withPackages (ps: [ps.numpy ps.toolz])).env
```
Executing `nix-shell` gives you again a Nix shell from which you can run Python.
@@ -191,7 +191,6 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th
toolz = buildPythonPackage rec {
pname = "toolz";
version = "0.7.4";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
@@ -237,7 +236,6 @@ with import {};
my_toolz = python35.pkgs.buildPythonPackage rec {
pname = "toolz";
version = "0.7.4";
- name = "${pname}-${version}";
src = python35.pkgs.fetchPypi {
inherit pname version;
@@ -283,15 +281,15 @@ order to build [`datashape`](https://github.com/blaze/datashape).
{ # ...
datashape = buildPythonPackage rec {
- name = "datashape-${version}";
+ pname = "datashape";
version = "0.4.7";
- src = pkgs.fetchurl {
- url = "mirror://pypi/D/DataShape/${name}.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278";
};
- buildInputs = with self; [ pytest ];
+ checkInputs = with self; [ pytest ];
propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
meta = {
@@ -318,10 +316,11 @@ when building the bindings and are therefore added as `buildInputs`.
{ # ...
lxml = buildPythonPackage rec {
- name = "lxml-3.4.4";
+ pname = "lxml";
+ version = "3.4.4";
- src = pkgs.fetchurl {
- url = "mirror://pypi/l/lxml/${name}.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk";
};
@@ -351,11 +350,11 @@ and `CFLAGS`.
{ # ...
pyfftw = buildPythonPackage rec {
- name = "pyfftw-${version}";
+ pname = "pyFFTW";
version = "0.9.2";
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pyFFTW/pyFFTW-${version}.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074";
};
@@ -440,11 +439,11 @@ We first create a function that builds `toolz` in `~/path/to/toolz/release.nix`
{ pkgs, buildPythonPackage }:
buildPythonPackage rec {
- name = "toolz-${version}";
+ pname = "toolz";
version = "0.7.4";
- src = pkgs.fetchurl {
- url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
};
@@ -549,25 +548,31 @@ The `buildPythonPackage` function is implemented in
The following is an example:
```nix
-{ # ...
- twisted = buildPythonPackage {
- name = "twisted-8.1.0";
+buildPythonPackage rec {
+ version = "3.3.1";
+ pname = "pytest";
- src = pkgs.fetchurl {
- url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
- sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
- };
+ preCheck = ''
+ # don't test bash builtins
+ rm testing/test_argcomplete.py
+ '';
- propagatedBuildInputs = [ self.ZopeInterface ];
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93";
+ };
- meta = {
- homepage = http://twistedmatrix.com/;
- description = "Twisted, an event-driven networking engine written in Python";
- license = stdenv.lib.licenses.mit;
- };
+ checkInputs = [ hypothesis ];
+ buildInputs = [ setuptools_scm ];
+ propagatedBuildInputs = [ attrs py setuptools six pluggy ];
+
+ meta = with stdenv.lib; {
+ maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
+ description = "Framework for writing tests";
};
}
+
```
The `buildPythonPackage` mainly does four things:
@@ -623,7 +628,6 @@ with import {};
packageOverrides = self: super: {
pandas = super.pandas.overridePythonAttrs(old: rec {
version = "0.19.1";
- name = "pandas-${version}";
src = super.fetchPypi {
pname = "pandas";
inherit version;
@@ -867,8 +871,10 @@ Executing `python setup.py bdist_wheel` in a `nix-shell `fails with
```
ValueError: ZIP does not support timestamps before 1980
```
-This is because files are included that depend on items in the Nix store which have a timestamp of, that is, it corresponds to January the 1st, 1970 at 00:00:00. And as the error informs you, ZIP does not support that.
-The command `bdist_wheel` takes into account `SOURCE_DATE_EPOCH`, and `nix-shell` sets this to 1. By setting it to a value corresponding to 1980 or later, or by unsetting it, it is possible to build wheels.
+
+This is because files from the Nix store (which have a timestamp of the UNIX epoch of January 1, 1970) are included in the .ZIP, but .ZIP archives follow the DOS convention of counting timestamps from 1980.
+
+The command `bdist_wheel` reads the `SOURCE_DATE_EPOCH` environment variable, which `nix-shell` sets to 1. Unsetting this variable or giving it a value corresponding to 1980 or later enables building wheels.
Use 1980 as timestamp:
```shell
@@ -878,7 +884,7 @@ or the current time:
```shell
nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel"
```
-or unset:
+or unset `SOURCE_DATE_EPOCH`:
```shell
nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel"
```
diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index 7c6955af812b..f0498eac5b19 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -9,17 +9,18 @@ date: 2017-03-05
To install the rust compiler and cargo put
```
-rust
+rustc
+cargo
```
into the `environment.systemPackages` or bring them into
-scope with `nix-shell -p rust`.
+scope with `nix-shell -p rustc cargo`.
For daily builds (beta and nightly) use either rustup from
nixpkgs or use the [Rust nightlies
overlay](#using-the-rust-nightlies-overlay).
-## Packaging Rust applications
+## Compiling Rust applications with Cargo
Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:
@@ -55,6 +56,226 @@ checksum can be then take from the failed build.
To install crates with nix there is also an experimental project called
[nixcrates](https://github.com/fractalide/nixcrates).
+## Compiling Rust crates using Nix instead of Cargo
+
+### Simple operation
+
+When run, `cargo build` produces a file called `Cargo.lock`,
+containing pinned versions of all dependencies. Nixpkgs contains a
+tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used
+to turn a `Cargo.lock` into a Nix expression.
+
+That Nix expression calls `rustc` directly (hence bypassing Cargo),
+and can be used to compile a crate and all its dependencies. Here is
+an example for a minimal `hello` crate:
+
+
+ $ cargo new hello
+ $ cd hello
+ $ cargo build
+ Compiling hello v0.1.0 (file:///tmp/hello)
+ Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
+ $ carnix -o hello.nix --src ./. Cargo.lock --standalone
+ $ nix-build hello.nix
+
+Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
+
+```
+# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+ # ... (content skipped)
+in
+rec {
+ hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; };
+ hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "hello";
+ version = "0.1.0";
+ authors = [ "pe@pijul.org " ];
+ src = ./.;
+ inherit dependencies buildDependencies features;
+ };
+ hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ {};
+ hello_0_1_0_features = f: updateFeatures f (rec {
+ hello_0_1_0.default = (f.hello_0_1_0.default or true);
+ }) [ ];
+}
+```
+
+In particular, note that the argument given as `--src` is copied
+verbatim to the source. If we look at a more complicated
+dependencies, for instance by adding a single line `libc="*"` to our
+`Cargo.toml`, we first need to run `cargo build` to update the
+`Cargo.lock`. Then, `carnix` needs to be run again, and produces the
+following nix file:
+
+```
+# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+ # ... (content skipped)
+in
+rec {
+ hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; };
+ hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "hello";
+ version = "0.1.0";
+ authors = [ "pe@pijul.org " ];
+ src = ./.;
+ inherit dependencies buildDependencies features;
+ };
+ libc_0_2_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libc";
+ version = "0.2.36";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "01633h4yfqm0s302fm0dlba469bx8y6cs4nqc8bqrmjqxfxn515l";
+ inherit dependencies buildDependencies features;
+ };
+ hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ {
+ dependencies = mapFeatures features ([ libc_0_2_36 ]);
+ };
+ hello_0_1_0_features = f: updateFeatures f (rec {
+ hello_0_1_0.default = (f.hello_0_1_0.default or true);
+ libc_0_2_36.default = true;
+ }) [ libc_0_2_36_features ];
+ libc_0_2_36 = { features?(libc_0_2_36_features {}) }: libc_0_2_36_ {
+ features = mkFeatures (features.libc_0_2_36 or {});
+ };
+ libc_0_2_36_features = f: updateFeatures f (rec {
+ libc_0_2_36.default = (f.libc_0_2_36.default or true);
+ libc_0_2_36.use_std =
+ (f.libc_0_2_36.use_std or false) ||
+ (f.libc_0_2_36.default or false) ||
+ (libc_0_2_36.default or false);
+ }) [];
+}
+```
+
+Here, the `libc` crate has no `src` attribute, so `buildRustCrate`
+will fetch it from [crates.io](https://crates.io). A `sha256`
+attribute is still needed for Nix purity.
+
+### Handling external dependencies
+
+Some crates require external libraries. For crates from
+[crates.io](https://crates.io), such libraries can be specified in
+`defaultCrateOverrides` package in nixpkgs itself.
+
+Starting from that file, one can add more overrides, to add features
+or build inputs by overriding the hello crate in a seperate file.
+
+```
+with import {};
+((import ./hello.nix).hello {}).override {
+ crateOverrides = defaultCrateOverrides // {
+ hello = attrs: { buildInputs = [ openssl ]; };
+ };
+}
+```
+
+Here, `crateOverrides` is expected to be a attribute set, where the
+key is the crate name without version number and the value a function.
+The function gets all attributes passed to `buildRustCrate` as first
+argument and returns a set that contains all attribute that should be
+overwritten.
+
+For more complicated cases, such as when parts of the crate's
+derivation depend on the the crate's version, the `attrs` argument of
+the override above can be read, as in the following example, which
+patches the derivation:
+
+```
+with import {};
+((import ./hello.nix).hello {}).override {
+ crateOverrides = defaultCrateOverrides // {
+ hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") {
+ postPatch = ''
+ substituteInPlace lib/zoneinfo.rs \
+ --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+ '';
+ };
+ };
+}
+```
+
+Another situation is when we want to override a nested
+dependency. This actually works in the exact same way, since the
+`crateOverrides` parameter is forwarded to the crate's
+dependencies. For instance, to override the build inputs for crate
+`libc` in the example above, where `libc` is a dependency of the main
+crate, we could do:
+
+```
+with import {};
+((import hello.nix).hello {}).override {
+ crateOverrides = defaultCrateOverrides // {
+ libc = attrs: { buildInputs = []; };
+ };
+}
+```
+
+### Options and phases configuration
+
+Actually, the overrides introduced in the previous section are more
+general. A number of other parameters can be overridden:
+
+- The version of rustc used to compile the crate:
+
+ ```
+ (hello {}).override { rust = pkgs.rust; };
+ ```
+
+- Whether to build in release mode or debug mode (release mode by
+ default):
+
+ ```
+ (hello {}).override { release = false; };
+ ```
+
+- Whether to print the commands sent to rustc when building
+ (equivalent to `--verbose` in cargo:
+
+ ```
+ (hello {}).override { verbose = false; };
+ ```
+
+- Extra arguments to be passed to `rustc`:
+
+ ```
+ (hello {}).override { extraRustcOpts = "-Z debuginfo=2"; };
+ ```
+
+- Phases, just like in any other derivation, can be specified using
+ the following attributes: `preUnpack`, `postUnpack`, `prePatch`,
+ `patches`, `postPatch`, `preConfigure` (in the case of a Rust crate,
+ this is run before calling the "build" script), `postConfigure`
+ (after the "build" script),`preBuild`, `postBuild`, `preInstall` and
+ `postInstall`. As an example, here is how to create a new module
+ before running the build script:
+
+ ```
+ (hello {}).override {
+ preConfigure = ''
+ echo "pub const PATH=\"${hi.out}\";" >> src/path.rs"
+ '';
+ };
+ ```
+
+### Features
+
+One can also supply features switches. For example, if we want to
+compile `diesel_cli` only with the `postgres` feature, and no default
+features, we would write:
+
+```
+(callPackage ./diesel.nix {}).diesel {
+ default = false;
+ postgres = true;
+}
+```
+
+Where `diesel.nix` is the file generated by Carnix, as explained above.
+
## Using the Rust nightlies overlay
Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.
diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml
index fdee1e405ecc..4515e17ec09e 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -39,6 +39,9 @@ nix-repl> :l <nixpkgs>
nix-repl> texlive.collection-<TAB>
+
+ Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example scheme-basic, into the combination.
+
diff --git a/doc/meta.xml b/doc/meta.xml
index 0f9dccfb91b5..5dbe810810d1 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -53,7 +53,7 @@ $ nix-env -qa hello --json
"x86_64-linux",
"armv5tel-linux",
"armv7l-linux",
- "mips64el-linux",
+ "mips32-linux",
"x86_64-darwin",
"i686-cygwin",
"i686-freebsd",
@@ -174,7 +174,7 @@ meta-attributes
maintainers of this Nix expression. If
you would like to be a maintainer of a package, you may want to add
yourself to nixpkgs/lib/maintainers.nix
+ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix">nixpkgs/maintainers/maintainer-list.nix
and write something like [ stdenv.lib.maintainers.alice
stdenv.lib.maintainers.bob ].
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index a2acc91e55a2..2f23da8df01e 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -68,7 +68,7 @@
$outputDevdoc
- is for developer documentation. Currently we count gtk-doc in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
+ is for developer documentation. Currently we count gtk-doc and devhelp books in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 184bee089ae3..2d6c87c3d07a 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -660,6 +660,32 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
passing -q to the Emacs command.
+
+ Sometimes emacsWithPackages is not enough, as
+ this package set has some priorities imposed on packages (with
+ the lowest priority assigned to Melpa Unstable, and the highest for
+ packages manually defined in
+ pkgs/top-level/emacs-packages.nix). But you
+ can't control this priorities when some package is installed as a
+ dependency. You can override it on per-package-basis, providing all
+ the required dependencies manually - but it's tedious and there is
+ always a possibility that an unwanted dependency will sneak in
+ through some other package. To completely override such a package
+ you can use overrideScope.
+
+
+
+overrides = super: self: rec {
+ haskell-mode = self.melpaPackages.haskell-mode;
+ ...
+};
+((emacsPackagesNgGen emacs).overrideScope overrides).emacsWithPackages (p: with p; [
+ # here both these package will use haskell-mode of our own choice
+ ghc-mod
+ dante
+])
+
+
@@ -667,11 +693,13 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
Weechat
-Weechat can currently be configured to include your choice of plugins.
-To make use of this functionality, install an expression that overrides its configuration such as
+Weechat can be configured to include your choice of plugins, reducing its
+closure size from the default configuration which includes all available
+plugins. To make use of this functionality, install an expression that
+overrides its configuration such as
weechat.override {configure = {availablePlugins, ...}: {
- plugins = with availablePlugins; [ python perl ];
- }
+ plugins = with availablePlugins; [ python perl ];
+ }
}
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index 0813e0968e86..c4bd6c57ffdb 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -7,123 +7,123 @@
Reviewing contributions
- The following section is a draft and reviewing policy is still being
+ The following section is a draft and reviewing policy is still being
discussed.
-The nixpkgs projects receives a fairly high number of contributions via
- GitHub pull-requests. Reviewing and approving these is an important task and a
+The nixpkgs projects receives a fairly high number of contributions via
+ GitHub pull-requests. Reviewing and approving these is an important task and a
way to contribute to the project.
-The high change rate of nixpkgs make any pull request that is open for
- long enough subject to conflicts that will require extra work from the
- submitter or the merger. Reviewing pull requests in a timely manner and being
- responsive to the comments is the key to avoid these. GitHub provides sort
- filters that can be used to see the most
- recently and the least
+The high change rate of nixpkgs make any pull request that is open for
+ long enough subject to conflicts that will require extra work from the
+ submitter or the merger. Reviewing pull requests in a timely manner and being
+ responsive to the comments is the key to avoid these. GitHub provides sort
+ filters that can be used to see the most
+ recently and the least
recently updated pull-requests.
-When reviewing a pull request, please always be nice and polite.
- Controversial changes can lead to controversial opinions, but it is important
+When reviewing a pull request, please always be nice and polite.
+ Controversial changes can lead to controversial opinions, but it is important
to respect every community members and their work.
-GitHub provides reactions, they are a simple and quick way to provide
- feedback to pull-requests or any comments. The thumb-down reaction should be
- used with care and if possible accompanied with some explanations so the
+GitHub provides reactions, they are a simple and quick way to provide
+ feedback to pull-requests or any comments. The thumb-down reaction should be
+ used with care and if possible accompanied with some explanations so the
submitter has directions to improve his contribution.
-Pull-requests reviews should include a list of what has been reviewed in a
- comment, so other reviewers and mergers can know the state of the
+Pull-requests reviews should include a list of what has been reviewed in a
+ comment, so other reviewers and mergers can know the state of the
review.
-All the review template samples provided in this section are generic and
- meant as examples. Their usage is optional and the reviewer is free to adapt
+All the review template samples provided in this section are generic and
+ meant as examples. Their usage is optional and the reviewer is free to adapt
them to his liking.
Package updates
-A package update is the most trivial and common type of pull-request.
- These pull-requests mainly consist in updating the version part of the package
+A package update is the most trivial and common type of pull-request.
+ These pull-requests mainly consist in updating the version part of the package
name and the source hash.
-It can happen that non trivial updates include patches or more complex
+It can happen that non trivial updates include patches or more complex
changes.
Reviewing process:
- Add labels to the pull-request. (Requires commit
+ Add labels to the pull-request. (Requires commit
rights)
- 8.has: package (update) and any topic
+ 8.has: package (update) and any topic
label that fit the updated package.
- Ensure that the package versioning is fitting the
+ Ensure that the package versioning is fitting the
guidelines.
- Ensure that the commit text is fitting the
+ Ensure that the commit text is fitting the
guidelines.
Ensure that the package maintainers are notified.
- mention-bot usually notify GitHub users based on the
- submitted changes, but it can happen that it misses some of the
+ mention-bot usually notify GitHub users based on the
+ submitted changes, but it can happen that it misses some of the
package maintainers.
- Ensure that the meta field contains correct
+ Ensure that the meta field contains correct
information.
- License can change with version updates, so it should be
+ License can change with version updates, so it should be
checked to be fitting upstream license.
- If the package has no maintainer, a maintainer must be
- set. This can be the update submitter or a community member that
+ If the package has no maintainer, a maintainer must be
+ set. This can be the update submitter or a community member that
accepts to take maintainership of the package.
Ensure that the code contains no typos.
Building the package locally.
- Pull-requests are often targeted to the master or staging
- branch so building the pull-request locally as it is submitted can
+ Pull-requests are often targeted to the master or staging
+ branch so building the pull-request locally as it is submitted can
trigger a large amount of source builds.
- It is possible to rebase the changes on nixos-unstable or
- nixpkgs-unstable for easier review by running the following commands
+ It is possible to rebase the changes on nixos-unstable or
+ nixpkgs-unstable for easier review by running the following commands
from a nixpkgs clone.
-$ git remote add channels https://github.com/NixOS/nixpkgs-channels.git
$ git fetch channels nixos-unstable
$ git fetch origin pull/PRNUMBER/head
-$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD
- This should be done only once to be able to fetch channel
+ This should be done only once to be able to fetch channel
branches from the nixpkgs-channels repository.
Fetching the nixos-unstable branch.
- Fetching the pull-request changes, PRNUMBER
- is the number at the end of the pull-request title and
- BASEBRANCH the base branch of the
+ Fetching the pull-request changes, PRNUMBER
+ is the number at the end of the pull-request title and
+ BASEBRANCH the base branch of the
pull-request.
- Rebasing the pull-request changes to the nixos-unstable
+ Rebasing the pull-request changes to the nixos-unstable
branch.
- The nox
- tool can be used to review a pull-request content in a single command.
- It doesn't rebase on a channel branch so it might trigger multiple
- source builds. PRNUMBER should be replaced by the
+ The nox
+ tool can be used to review a pull-request content in a single command.
+ It doesn't rebase on a channel branch so it might trigger multiple
+ source builds. PRNUMBER should be replaced by the
number at the end of the pull-request title.
$ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
@@ -153,42 +153,42 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
New packages
-New packages are a common type of pull-requests. These pull requests
+New packages are a common type of pull-requests. These pull requests
consists in adding a new nix-expression for a package.
Reviewing process:
- Add labels to the pull-request. (Requires commit
+ Add labels to the pull-request. (Requires commit
rights)
- 8.has: package (new) and any topic
+ 8.has: package (new) and any topic
label that fit the new package.
- Ensure that the package versioning is fitting the
+ Ensure that the package versioning is fitting the
guidelines.
- Ensure that the commit name is fitting the
+ Ensure that the commit name is fitting the
guidelines.
- Ensure that the meta field contains correct
+ Ensure that the meta field contains correct
information.
- License must be checked to be fitting upstream
+ License must be checked to be fitting upstream
license.
- Platforms should be set or the package will not get binary
+ Platforms should be set or the package will not get binary
substitutes.
- A maintainer must be set, this can be the package
- submitter or a community member that accepts to take maintainership of
+ A maintainer must be set, this can be the package
+ submitter or a community member that accepts to take maintainership of
the package.
Ensure that the code contains no typos.
Ensure the package source.
- Mirrors urls should be used when
+ Mirrors urls should be used when
available.
- The most appropriate function should be used (e.g.
- packages from GitHub should use
+ The most appropriate function should be used (e.g.
+ packages from GitHub should use
fetchFromGitHub).
@@ -223,49 +223,49 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
Module updates
-Module updates are submissions changing modules in some ways. These often
+Module updates are submissions changing modules in some ways. These often
contains changes to the options or introduce new options.
Reviewing process
- Add labels to the pull-request. (Requires commit
+ Add labels to the pull-request. (Requires commit
rights)
- 8.has: module (update) and any topic
+ 8.has: module (update) and any topic
label that fit the module.
Ensure that the module maintainers are notified.
- Mention-bot notify GitHub users based on the submitted
- changes, but it can happen that it miss some of the package
+ Mention-bot notify GitHub users based on the submitted
+ changes, but it can happen that it miss some of the package
maintainers.
- Ensure that the module tests, if any, are
+ Ensure that the module tests, if any, are
succeeding.
Ensure that the introduced options are correct.
- Type should be appropriate (string related types differs
- in their merging capabilities, optionSet and
+ Type should be appropriate (string related types differs
+ in their merging capabilities, optionSet and
string types are deprecated).
- Description, default and example should be
+ Description, default and example should be
provided.
Ensure that option changes are backward compatible.
- mkRenamedOptionModule and
- mkAliasOptionModule functions provide way to make
+ mkRenamedOptionModule and
+ mkAliasOptionModule functions provide way to make
option changes backward compatible.
- Ensure that removed options are declared with
+ Ensure that removed options are declared with
mkRemovedOptionModule
- Ensure that changes that are not backward compatible are
+ Ensure that changes that are not backward compatible are
mentioned in release notes.
- Ensure that documentations affected by the change is
+ Ensure that documentations affected by the change is
updated.
@@ -294,37 +294,37 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
New modules submissions introduce a new module to NixOS.
- Add labels to the pull-request. (Requires commit
+ Add labels to the pull-request. (Requires commit
rights)
- 8.has: module (new) and any topic label
+ 8.has: module (new) and any topic label
that fit the module.
- Ensure that the module tests, if any, are
+ Ensure that the module tests, if any, are
succeeding.
Ensure that the introduced options are correct.
- Type should be appropriate (string related types differs
- in their merging capabilities, optionSet and
+ Type should be appropriate (string related types differs
+ in their merging capabilities, optionSet and
string types are deprecated).
- Description, default and example should be
+ Description, default and example should be
provided.
- Ensure that module meta field is
+ Ensure that module meta field is
present
- Maintainers should be declared in
+ Maintainers should be declared in
meta.maintainers.
- Module documentation should be declared with
+ Module documentation should be declared with
meta.doc.
- Ensure that the module respect other modules
+ Ensure that the module respect other modules
functionality.
- For example, enabling a module should not open firewall
+ For example, enabling a module should not open firewall
ports by default.
@@ -340,7 +340,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
- [ ] options have default
- [ ] options have example
- [ ] options have descriptions
-- [ ] No unneeded package is added to system.environmentPackages
+- [ ] No unneeded package is added to environment.systemPackages
- [ ] meta.maintainers is set
- [ ] module documentation is declared in meta.doc
@@ -355,22 +355,22 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
Other type of submissions requires different reviewing steps.
-If you consider having enough knowledge and experience in a topic and
- would like to be a long-term reviewer for related submissions, please contact
- the current reviewers for that topic. They will give you information about the
+If you consider having enough knowledge and experience in a topic and
+ would like to be a long-term reviewer for related submissions, please contact
+ the current reviewers for that topic. They will give you information about the
reviewing process.
-The main reviewers for a topic can be hard to find as there is no list, but
-checking past pull-requests to see who reviewed or git-blaming the code to see
+The main reviewers for a topic can be hard to find as there is no list, but
+checking past pull-requests to see who reviewed or git-blaming the code to see
who committed to that topic can give some hints.
-Container system, boot system and library changes are some examples of the
+Container system, boot system and library changes are some examples of the
pull requests fitting this category.
Merging pull-requests
-It is possible for community members that have enough knowledge and
+It is possible for community members that have enough knowledge and
experience on a special topic to contribute by merging pull requests.
TODO: add the procedure to request merging rights.
@@ -380,13 +380,13 @@ The following paragraph about how to deal with unactive contributors is just a
proposition and should be modified to what the community agrees to be the right
policy.
-Please note that contributors with commit rights unactive for more than
+Please note that contributors with commit rights unactive for more than
three months will have their commit rights revoked.
-->
-In a case a contributor leaves definitively the Nix community, he should
- create an issue or notify the mailing list with references of packages and
- modules he maintains so the maintainership can be taken over by other
+In a case a contributor leaves definitively the Nix community, he should
+ create an issue or notify the mailing list with references of packages and
+ modules he maintains so the maintainership can be taken over by other
contributors.
diff --git a/doc/shell.md b/doc/shell.md
new file mode 100644
index 000000000000..079574d4ae86
--- /dev/null
+++ b/doc/shell.md
@@ -0,0 +1,20 @@
+---
+title: pkgs.mkShell
+author: zimbatm
+date: 2017-10-30
+---
+
+pkgs.mkShell is a special kind of derivation that is only useful when using
+it combined with nix-shell. It will in fact fail to instantiate when invoked
+with nix-build.
+
+## Usage
+
+```nix
+{ pkgs ? import {} }:
+pkgs.mkShell {
+ # this will make all the build inputs from hello and gnutar available to the shell environment
+ inputsFrom = with pkgs; [ hello gnutar ];
+ buildInputs = [ pkgs.gnumake ];
+}
+```
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 46b562a794f0..2a3316b8d018 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -179,6 +179,269 @@ genericBuild
+Specifying dependencies
+
+
+ As described in the Nix manual, almost any *.drv store path in a derivation's attribute set will induce a dependency on that derivation.
+ mkDerivation, however, takes a few attributes intended to, between them, include all the dependencies of a package.
+ This is done both for structure and consistency, but also so that certain other setup can take place.
+ For example, certain dependencies need their bin directories added to the PATH.
+ That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes.
+ See for details.
+
+
+ Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated.
+ The platform distinctions are motivated by cross compilation; see for exactly what each platform means.
+
+ The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency:
+ As a general programming principle, dependencies are always specified as interfaces, not concrete implementation.
+
+ But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation.
+ For now, the run-time/build-time distinction is just a hint for mental clarity, but in the future it perhaps could be enforced.
+
+
+ The extension of PATH with dependencies, alluded to above, proceeds according to the relative platforms alone.
+ The process is carried out only for dependencies whose host platform matches the new derivation's build platform–i.e. which run on the platform where the new derivation will be built.
+
+ Currently, that means for native builds all dependencies are put on the PATH.
+ But in the future that may not be the case for sake of matching cross:
+ the platforms would be assumed to be unique for native and cross builds alike, so only the depsBuild* and nativeBuildDependencies dependencies would affect the PATH.
+
+ For each dependency dep of those dependencies, dep/bin, if present, is added to the PATH environment variable.
+
+
+ The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency.
+ Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency.
+
+
+ It is important to note dependencies are not necessary propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up.
+ The exact rules for dependency propagation can be given by assigning each sort of dependency two integers based one how it's host and target platforms are offset from the depending derivation's platforms.
+ Those offsets are given are given below in the descriptions of each dependency list attribute.
+ Algorithmically, we traverse propagated inputs, accumulating every propagated dep's propagated deps and adjusting them to account for the "shift in perspective" described by the current dep's platform offsets.
+ This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined.
+ We also prune transitive deps whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd.
+
+
+ We can define the process precisely with Natural Deduction using the inference rules.
+ This probably seems a bit obtuse, but so is the bash code that actually implements it!
+
+ The findInputs function, currently residing in pkgs/stdenv/generic/setup.sh, implements the propagation logic.
+
+ They're confusing in very different ways so...hopefully if something doesn't make sense in one presentation, it does in the other!
+
+let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
+
+propagated-dep(h0, t0, A, B)
+propagated-dep(h1, t1, B, C)
+h0 + h1 in {-1, 0, 1}
+h0 + t1 in {-1, 0, 1}
+-------------------------------------- Transitive property
+propagated-dep(mapOffset(h0, t0, h1),
+ mapOffset(h0, t0, t1),
+ A, C)
+
+let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
+
+dep(h0, _, A, B)
+propagated-dep(h1, t1, B, C)
+h0 + h1 in {-1, 0, 1}
+h0 + t1 in {-1, 0, -1}
+-------------------------------------- Take immediate deps' propagated deps
+propagated-dep(mapOffset(h0, t0, h1),
+ mapOffset(h0, t0, t1),
+ A, C)
+
+propagated-dep(h, t, A, B)
+-------------------------------------- Propagated deps count as deps
+dep(h, t, A, B)
+ Some explanation of this monstrosity is in order.
+ In the common case, the target offset of a dependency is the successor to the target offset: t = h + 1.
+ That means that:
+
+let f(h, t, i) = i + (if i <= 0 then h else t - 1)
+let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1)
+let f(h, h + 1, i) = i + (if i <= 0 then h else h)
+let f(h, h + 1, i) = i + h
+
+ This is where the "sum-like" comes from above:
+ We can just sum all the host offset to get the host offset of the transitive dependency.
+ The target offset is the transitive dep is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one;
+ it can be ignored as it doesn't add any new information.
+
+
+ Because of the bounds checks, the uncommon cases are h = t and h + 2 = t.
+ In the former case, the motivation for mapOffset is that since its host and target platforms are the same, no transitive dep of it should be able to "discover" an offset greater than its reduced target offsets.
+ mapOffset effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original h = t package.
+ In the other case, h + 1 is skipped over between the host and target offsets.
+ Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one.
+
+
+Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the needing package is unaware of.
+The offset bounds checking and definition of mapOffset together ensure that this is the case.
+Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant.
+From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency.
+
+
+
+ Variables specifying dependencies
+
+
+ depsBuildBuild
+
+
+ A list of dependencies whose host and target platforms are the new derivation's build platform.
+ This means a -1 host and -1 target offset from the new derivation's platforms.
+ They are programs/libraries used at build time that furthermore produce programs/libraries also used at build time.
+ If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in nativeBuildInputsinstead.
+ The most common use for this buildPackages.stdenv.cc, the default C compiler for this role.
+ That example crops up more than one might think in old commonly used C libraries.
+
+
+ Since these packages are able to be run at build time, that are always added to the PATH, as described above.
+ But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies.
+ This isn't currently enforced, but could be in the future.
+
+
+
+
+
+ nativeBuildInputs
+
+
+ A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform.
+ This means a -1 host offset and 0 target offset from the new derivation's platforms.
+ They are programs/libraries used at build time that, if they are a compiler or similar tool, produce code to run at run time—i.e. tools used to build the new derivation.
+ If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild or depsBuildTarget.
+ This would be called depsBuildHost but for historical continuity.
+
+
+ Since these packages are able to be run at build time, that are added to the PATH, as described above.
+ But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies.
+ This isn't currently enforced, but could be in the future.
+
+
+
+
+
+ depsBuildTarget
+
+
+ A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform.
+ This means a -1 host offset and 1 target offset from the new derivation's platforms.
+ They are programs used at build time that produce code to run at run with code produced by the depending package.
+ Most commonly, these would tools used to build the runtime or standard library the currently-being-built compiler will inject into any code it compiles.
+ In many cases, the currently-being built compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible.
+ Other times, the compiler relies on some other tool, like binutils, that is always built separately so the dependency is unconditional.
+
+
+ This is a somewhat confusing dependency to wrap ones head around, and for good reason.
+ As the only one where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage two away from the current one.
+ It and it's use-case go hand in hand and are both considered poor form:
+ try not to need this sort dependency, and try not avoid building standard libraries / runtimes in the same derivation as the compiler produces code using them.
+ Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would.
+ In short, do not use this attribute unless you are packaging a compiler and are sure it is needed.
+
+
+ Since these packages are able to be run at build time, that are added to the PATH, as described above.
+ But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies.
+ This isn't currently enforced, but could be in the future.
+
+
+
+
+
+ depsHostHost
+
+ A list of dependencies whose host and target platforms match the new derivation's host platform.
+ This means a both 0 host offset and 0 target offset from the new derivation's host platform.
+ These are packages used at run-time to generate code also used at run-time.
+ In practice, that would usually be tools used by compilers for metaprogramming/macro systems, or libraries used by the macros/metaprogramming code itself.
+ It's always preferable to use a depsBuildBuild dependency in the derivation being built than a depsHostHost on the tool doing the building for this purpose.
+
+
+
+
+ buildInputs
+
+
+ A list of dependencies whose host platform and target platform match the new derivation's.
+ This means a 0 host offset and 1 target offset from the new derivation's host platform.
+ This would be called depsHostTarget but for historical continuity.
+ If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild.
+
+
+ These often are programs/libraries used by the new derivation at run-time, but that isn't always the case.
+ For example, the machine code in a statically linked library is only used at run time, but the derivation containing the library is only needed at build time.
+ Even in the dynamic case, the library may also be needed at build time to appease the linker.
+
+
+
+
+
+ depsTargetTarget
+
+ A list of dependencies whose host platform matches the new derivation's target platform.
+ This means a 1 offset from the new derivation's platforms.
+ These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about.
+ It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset].
+ Do not use this attribute unless you are packaging a compiler and are sure it is needed.
+
+
+
+
+ depsBuildBuildPropagated
+
+ The propagated equivalent of depsBuildBuild.
+ This perhaps never ought to be used, but it is included for consistency [see below for the others].
+
+
+
+
+ propagatedNativeBuildInputs
+
+ The propagated equivalent of nativeBuildInputs.
+ This would be called depsBuildHostPropagated but for historical continuity.
+ For example, if package Y has propagatedNativeBuildInputs = [X], and package Z has buildInputs = [Y], then package Z will be built as if it included package X in its nativeBuildInputs.
+ If instead, package Z has nativeBuildInputs = [Y], then Z will be built as if it included X in the depsBuildBuild of package Z, because of the sum of the two -1 host offsets.
+
+
+
+
+ depsBuildTargetPropagated
+
+ The propagated equivalent of depsBuildTarget.
+ This is prefixed for the same reason of alerting potential users.
+
+
+
+
+ depsHostHostPropagated
+
+ The propagated equivalent of depsHostHost.
+
+
+
+
+ propagatedBuildInputs
+
+ The propagated equivalent of buildInputs.
+ This would be called depsHostTargetPropagated but for historical continuity.
+
+
+
+
+ depsTargetTarget
+
+ The propagated equivalent of depsTargetTarget.
+ This is prefixed for the same reason of alerting potential users.
+
+
+
+
+
+
+
+
Attributes
@@ -198,63 +461,22 @@ genericBuild
-
- Variables specifying dependencies
-
-
- nativeBuildInputs
-
- A list of dependencies used by the new derivation at build-time.
- I.e. these dependencies should not make it into the package's runtime-closure, though this is currently not checked.
- For each dependency dir, the directory dir/bin, if it exists, is added to the PATH environment variable.
- Other environment variables are also set up via a pluggable mechanism.
- For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable.
- See for details.
-
-
-
-
- buildInputs
-
- A list of dependencies used by the new derivation at run-time.
- Currently, the build-time environment is modified in the exact same way as with nativeBuildInputs.
- This is problematic in that when cross-compiling, foreign executables can clobber native ones on the PATH.
- Even more confusing is static-linking.
- A statically-linked library should be listed here because ultimately that generated machine code will be used at run-time, even though a derivation containing the object files or static archives will only be used at build-time.
- A less confusing solution to this would be nice.
-
-
-
-
-
- propagatedNativeBuildInputs
-
- Like nativeBuildInputs, but these dependencies are propagated:
- that is, the dependencies listed here are added to the nativeBuildInputs of any package that uses this package as a dependency.
- So if package Y has propagatedNativeBuildInputs = [X], and package Z has nativeBuildInputs = [Y],
- then package X will appear in Z’s build environment automatically.
-
-
-
-
- propagatedBuildInputs
-
- Like buildInputs, but propagated just like propagatedNativeBuildInputs.
- This inherits buildInputs's flaws of clobbering native executables when cross-compiling and being confusing for static linking.
-
-
-
-
-
Variables affecting build properties
enableParallelBuilding
- If set, stdenv will pass specific
- flags to make and other build tools to enable
- parallel building with up to build-cores
- workers.
+
+ If set to true, stdenv will
+ pass specific flags to make and other build tools to
+ enable parallel building with up to build-cores
+ workers.
+
+ Unless set to false, some build systems with good
+ support for parallel building including cmake,
+ meson, and qmake will set it to
+ true.
+
@@ -649,7 +871,7 @@ script) if it exists.
By default, when cross compiling, the configure script has and passed.
Packages can instead pass [ "build" "host" "target" ] or a subset to control exactly which platform flags are passed.
Compilers and other tools should use this to also pass the target platform, for example.
- Note eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity.
+ Eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity.
@@ -773,13 +995,14 @@ but only if the doCheck variable is enabled.
doCheck
- If set to a non-empty string, the check phase is
- executed, otherwise it is skipped (default). Thus you should set
-
-
-doCheck = true;
-
- in the derivation to enable checks.
+
+ Controls whether the check phase is executed.
+ By default it is skipped, but if doCheck is set to true, the check phase is usually executed.
+ Thus you should set doCheck = true; in the derivation to enable checks.
+ The exception is cross compilation.
+ Cross compiled builds never run tests, no matter how doCheck is set,
+ as the newly-built program won't run on the platform used to build it.
+
@@ -916,6 +1139,20 @@ following:
If set, libraries and executables are not
stripped. By default, they are.
+
+ dontStripHost
+
+ Like dontStripHost, but only affects the strip command targetting the package's host platform.
+ Useful when supporting cross compilation, but otherwise feel free to ignore.
+
+
+
+ dontStripTarget
+
+ Like dontStripHost, but only affects the strip command targetting the packages' target platform.
+ Useful when supporting cross compilation, but otherwise feel free to ignore.
+
+
dontMoveSbin
@@ -1044,12 +1281,14 @@ installcheck.
doInstallCheck
- If set to a non-empty string, the installCheck phase is
- executed, otherwise it is skipped (default). Thus you should set
-
- doInstallCheck = true;
-
- in the derivation to enable install checks.
+
+ Controls whether the installCheck phase is executed.
+ By default it is skipped, but if doInstallCheck is set to true, the installCheck phase is usually executed.
+ Thus you should set doInstallCheck = true; in the derivation to enable install checks.
+ The exception is cross compilation.
+ Cross compiled builds never run tests, no matter how doInstallCheck is set,
+ as the newly-built program won't run on the platform used to build it.
+
@@ -1346,46 +1585,127 @@ someVar=$(stripHash $name)
Package setup hooks
-The following packages provide a setup hook:
-
+
+ Nix itself considers a build-time dependency merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup.
+ In most cases, that is fine, and the downstream derivation can deal with it's own dependencies.
+ But for a few common tasks, that would result in almost every package doing the same sort of setup work---depending not on the package itself, but entirely on which dependencies were used.
+
+
+ In order to alleviate this burden, the setup hook>mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process.
+ That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves.
+ No boilerplate mirroring the list of dependencies is needed.
+
+
+ The Setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect.
+ The combination of its power and implicit use may be expedient, but isn't without costs.
+ Nix itself is unchanged, but the spirit of adding dependencies being effect-free is violated even if the letter isn't.
+ For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent.
+ However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable).
+ More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so.
+
+
+ The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency.
+ For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libaries and headers.
+ This is done by defining a bash function, and appending its name to one of
+ envBuildBuildHooks`,
+ envBuildHostHooks`,
+ envBuildTargetHooks`,
+ envHostHostHooks`,
+ envHostTargetHooks`, or
+ envTargetTargetHooks`.
+ These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis).
+
+
+ Packages adding a hook should not hard code a specific hook, but rather choose a variable relative to how they are included.
+ Returning to the C compiler wrapper example, if it itself is an n dependency, then it only wants to accumulate flags from n + 1 dependencies, as only those ones match the compiler's target platform.
+ The hostOffset variable is defined with the current dependency's host offset targetOffset with its target offset, before it's setup hook is sourced.
+ Additionally, since most environment hooks don't care about the target platform,
+ That means the setup hook can append to the right bash array by doing something like
+
+addEnvHooks "$hostOffset" myBashFunction
+
+
+
+ The existence of setups hooks has long been documented and packages inside Nixpkgs are free to use these mechanism.
+ Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions.
+ Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time.
+
+
+ Here are some packages that provide a setup hook.
+ Since the mechanism is modular, this probably isn't an exhaustive list.
+ Then again, since the mechanism is only to be used as a last resort, it might be.
- CC Wrapper
+ Bintools Wrapper
- CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
- Specifically, a C compiler (GCC or Clang), Binutils (or the CCTools + binutils mashup when targetting Darwin), and a C standard library (glibc or Darwin's libSystem) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper.
- Packages typically depend on only CC Wrapper, instead of those 3 inputs directly.
+ Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes.
+ These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin.
+ [The "Bintools" name is supposed to be a compromise between "Binutils" and "cctools" not denoting any specific implementation.]
+ Specifically, the underlying bintools package, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by Bintools Wrapper.
+ Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper.
- Dependency finding is undoubtedly the main task of CC wrapper.
+ Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out.
+ For example, it shouldn't care about about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux).
+ Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand.
It is currently accomplished by collecting directories of host-platform dependencies (i.e. buildInputs and nativeBuildInputs) in environment variables.
- CC wrapper's setup hook causes any include subdirectory of such a dependency to be added to NIX_CFLAGS_COMPILE, and any lib and lib64 subdirectories to NIX_LDFLAGS.
- The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished.
+ Bintools Wrapper's setup hook causes any lib and lib64 subdirectories to be added to NIX_LDFLAGS.
+ Since CC Wrapper and Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to CC Wrapper.
+ But CC Wrapper's code, by contrast, has quite lengthy comments.
+ Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync.
A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables full-fill which purpose.
- They are defined to just be the base name of the tools, under the assumption that CC Wrapper's binaries will be on the path.
+ They are defined to just be the base name of the tools, under the assumption that Bintools Wrapper's binaries will be on the path.
Firstly, this helps poorly-written packages, e.g. ones that look for just gcc when CC isn't defined yet clang is to be used.
- Secondly, this helps packages not get confused when cross-compiling, in which case multiple CC wrappers may be simultaneous in use (targeting different platforms).
- BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional CC Wrappers, properly disambiguating them.
+ Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use.
+
+ Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times.
+ As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms.
+
+ BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional Bintools Wrappers, properly disambiguating them.
- A problem with this final task is that CC Wrapper is honest and defines LD as ld.
+ A problem with this final task is that Bintools Wrapper is honest and defines LD as ld.
Most packages, however, firstly use the C compiler for linking, secondly use LD anyways, defining it as the C compiler, and thirdly, only so define LD when it is undefined as a fallback.
- This triple-threat means CC Wrapper will break those packages, as LD is already defined as the actually linker which the package won't override yet doesn't want to use.
+ This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won't override yet doesn't want to use.
The workaround is to define, just for the problematic package, LD as the C compiler.
A good way to do this would be preConfigure = "LD=$CC".
+
+ CC Wrapper
+
+
+ CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
+ Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper.
+ Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper.
+
+
+ Dependency finding is undoubtedly the main task of CC Wrapper.
+ This works just like Bintools Wrapper, except that any include subdirectory of any relevant dependency is added to NIX_CFLAGS_COMPILE.
+ The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished.
+
+
+ CC Wrapper also like Bintools Wrapper defines standard environment variables with the names of the tools it wraps, for the same reasons described above.
+ Importantly, while it includes a cc symlink to the c compiler for portability, the CC will be defined using the compiler's "real name" (i.e. gcc or clang).
+ This helps lousy build systems that inspect on the name of the compiler rather than run it.
+
+
+
+
Perl
- Adds the lib/site_perl subdirectory
- of each build input to the PERL5LIB
- environment variable.
+
+
+ Adds the lib/site_perl subdirectory of each build input to the PERL5LIB environment variable.
+ For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable.
+
+
@@ -1482,6 +1802,20 @@ someVar=$(stripHash $name)
disabled or patched to work with PaX.
+
+ autoPatchelfHook
+ This is a special setup hook which helps in packaging
+ proprietary software in that it automatically tries to find missing shared
+ library dependencies of ELF files. All packages within the
+ runtimeDependencies environment variable are unconditionally
+ added to executables, which is useful for programs that use
+
+ dlopen
+ 3
+
+ to load libraries at runtime.
+
+
diff --git a/lib/customisation.nix b/lib/customisation.nix
index 483ef6fd4866..d942f54ee798 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -1,7 +1,7 @@
{ lib }:
let
- inherit (builtins) attrNames isFunction;
+ inherit (builtins) attrNames;
in
@@ -36,7 +36,7 @@ rec {
overrideDerivation = drv: f:
let
newDrv = derivation (drv.drvAttrs // (f drv));
- in addPassthru newDrv (
+ in lib.flip (extendDerivation true) newDrv (
{ meta = drv.meta or {};
passthru = if drv ? passthru then drv.passthru else {};
}
@@ -72,7 +72,7 @@ rec {
makeOverridable = f: origArgs:
let
ff = f origArgs;
- overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs);
+ overrideWith = newArgs: origArgs // (if lib.isFunction newArgs then newArgs origArgs else newArgs);
in
if builtins.isAttrs ff then (ff // {
override = newArgs: makeOverridable f (overrideWith newArgs);
@@ -81,7 +81,7 @@ rec {
${if ff ? overrideAttrs then "overrideAttrs" else null} = fdrv:
makeOverridable (args: (f args).overrideAttrs fdrv) origArgs;
})
- else if builtins.isFunction ff then {
+ else if lib.isFunction ff then {
override = newArgs: makeOverridable f (overrideWith newArgs);
__functor = self: ff;
overrideDerivation = throw "overrideDerivation not yet supported for functors";
@@ -112,8 +112,8 @@ rec {
*/
callPackageWith = autoArgs: fn: args:
let
- f = if builtins.isFunction fn then fn else import fn;
- auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs;
+ f = if lib.isFunction fn then fn else import fn;
+ auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
in makeOverridable f (auto // args);
@@ -122,8 +122,8 @@ rec {
individual attributes. */
callPackagesWith = autoArgs: fn: args:
let
- f = if builtins.isFunction fn then fn else import fn;
- auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs;
+ f = if lib.isFunction fn then fn else import fn;
+ auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
origArgs = auto // args;
pkgs = f origArgs;
mkAttrOverridable = name: pkg: makeOverridable (newArgs: (f newArgs).${name}) origArgs;
@@ -131,8 +131,8 @@ rec {
/* Add attributes to each output of a derivation without changing
- the derivation itself. */
- addPassthru = drv: passthru:
+ the derivation itself and check a given condition when evaluating. */
+ extendDerivation = condition: passthru: drv:
let
outputs = drv.outputs or [ "out" ];
@@ -142,13 +142,18 @@ rec {
outputToAttrListElement = outputName:
{ name = outputName;
value = commonAttrs // {
- inherit (drv.${outputName}) outPath drvPath type outputName;
+ inherit (drv.${outputName}) type outputName;
+ drvPath = assert condition; drv.${outputName}.drvPath;
+ outPath = assert condition; drv.${outputName}.outPath;
};
};
outputsList = map outputToAttrListElement outputs;
- in commonAttrs // { outputUnspecified = true; };
-
+ in commonAttrs // {
+ outputUnspecified = true;
+ drvPath = assert condition; drv.drvPath;
+ outPath = assert condition; drv.outPath;
+ };
/* Strip a derivation of all non-essential attributes, returning
only those needed by hydra-eval-jobs. Also strictly evaluate the
diff --git a/lib/debug.nix b/lib/debug.nix
index 646ef220ad0a..d163e60b6957 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -2,10 +2,10 @@
let
-inherit (builtins) trace attrNamesToStr isAttrs isFunction isList isInt
+inherit (builtins) trace attrNamesToStr isAttrs isList isInt
isString isBool head substring attrNames;
-inherit (lib) all id mapAttrsFlatten elem;
+inherit (lib) all id mapAttrsFlatten elem isFunction;
in
diff --git a/lib/default.nix b/lib/default.nix
index 3e30ec515fcb..cbe0a0ba21b5 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -21,10 +21,10 @@ let
# packaging
customisation = callLibs ./customisation.nix;
- maintainers = callLibs ./maintainers.nix;
+ maintainers = import ../maintainers/maintainer-list.nix;
meta = callLibs ./meta.nix;
sources = callLibs ./sources.nix;
-
+ versions = callLibs ./versions.nix;
# module system
modules = callLibs ./modules.nix;
@@ -41,23 +41,23 @@ let
generators = callLibs ./generators.nix;
misc = callLibs ./deprecated.nix;
# domain-specific
- sandbox = callLibs ./sandbox.nix;
fetchers = callLibs ./fetchers.nix;
# Eval-time filesystem handling
filesystem = callLibs ./filesystem.nix;
# back-compat aliases
- platforms = systems.doubles;
+ platforms = systems.forMeta;
inherit (builtins) add addErrorContext attrNames
concatLists deepSeq elem elemAt filter genericClosure genList
- getAttr hasAttr head isAttrs isBool isFunction isInt isList
+ getAttr hasAttr head isAttrs isBool isInt isList
isString length lessThan listToAttrs pathExists readFile
replaceStrings seq stringLength sub substring tail;
inherit (trivial) id const concat or and boolToString mergeAttrs
flip mapNullable inNixShell min max importJSON warn info
- nixpkgsVersion mod;
+ nixpkgsVersion mod compare splitByAndCompare
+ functionArgs setFunctionArgs isFunction;
inherit (fixedPoints) fix fix' extends composeExtensions
makeExtensible makeExtensibleWithCustomName;
@@ -72,8 +72,8 @@ let
inherit (lists) singleton foldr fold foldl foldl' imap0 imap1
concatMap flatten remove findSingle findFirst any all count
optional optionals toList range partition zipListsWith zipLists
- reverseList listDfs toposort sort take drop sublist last init
- crossLists unique intersectLists subtractLists
+ reverseList listDfs toposort sort compareLists take drop sublist
+ last init crossLists unique intersectLists subtractLists
mutuallyExclusive;
inherit (strings) concatStrings concatMapStrings concatImapStrings
intersperse concatStringsSep concatMapStringsSep
@@ -88,13 +88,14 @@ let
inherit (stringsWithDeps) textClosureList textClosureMap
noDepEntry fullDepEntry packEntry stringAfter;
inherit (customisation) overrideDerivation makeOverridable
- callPackageWith callPackagesWith addPassthru hydraJob makeScope;
+ callPackageWith callPackagesWith extendDerivation
+ hydraJob makeScope;
inherit (meta) addMetaAttrs dontDistribute setName updateName
appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio
hiPrioSet;
inherit (sources) pathType pathIsDirectory cleanSourceFilter
cleanSource sourceByRegex sourceFilesBySuffices
- commitIdFromGitRepo;
+ commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource;
inherit (modules) evalModules closeModules unifyModuleSyntax
applyIfFunction unpackSubmodule packSubmodule mergeModules
mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
diff --git a/lib/deprecated.nix b/lib/deprecated.nix
index 2a0f5a55bf14..34cf336d1f42 100644
--- a/lib/deprecated.nix
+++ b/lib/deprecated.nix
@@ -1,6 +1,6 @@
{ lib }:
let
- inherit (builtins) isFunction head tail isList isAttrs isInt attrNames;
+ inherit (builtins) head tail isList isAttrs isInt attrNames;
in
@@ -53,7 +53,7 @@ rec {
f: # the function applied to the arguments
initial: # you pass attrs, the functions below are passing a function taking the fix argument
let
- takeFixed = if isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument
+ takeFixed = if lib.isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument
tidy = args:
let # apply all functions given in "applyPreTidy" in sequence
applyPreTidyFun = fold ( n: a: x: n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args);
@@ -63,7 +63,7 @@ rec {
let args = takeFixed fixed;
mergeFun = args.${n};
in if isAttrs x then (mergeFun args x)
- else assert isFunction x;
+ else assert lib.isFunction x;
mergeFun args (x ( args // { inherit fixed; }));
in overridableDelayableArgs f newArgs;
in
@@ -374,7 +374,7 @@ rec {
if isAttrs x then
if x ? outPath then "derivation"
else "attrs"
- else if isFunction x then "function"
+ else if lib.isFunction x then "function"
else if isList x then "list"
else if x == true then "bool"
else if x == false then "bool"
diff --git a/lib/generators.nix b/lib/generators.nix
index 5f9da234f447..73017f2c6796 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -14,6 +14,8 @@ let
libAttr = lib.attrsets;
flipMapAttrs = flip libAttr.mapAttrs;
+
+ inherit (lib) isFunction;
in
rec {
@@ -22,11 +24,15 @@ rec {
* character sep. If sep appears in k, it is escaped.
* Helper for synaxes with different separators.
*
- * mkKeyValueDefault ":" "f:oo" "bar"
+ * mkValueString specifies how values should be formatted.
+ *
+ * mkKeyValueDefault {} ":" "f:oo" "bar"
* > "f\:oo:bar"
*/
- mkKeyValueDefault = sep: k: v:
- "${libStr.escape [sep] k}${sep}${toString v}";
+ mkKeyValueDefault = {
+ mkValueString ? toString
+ }: sep: k: v:
+ "${libStr.escape [sep] k}${sep}${mkValueString v}";
/* Generate a key-value-style config file from an attrset.
@@ -34,7 +40,7 @@ rec {
* mkKeyValue is the same as in toINI.
*/
toKeyValue = {
- mkKeyValue ? mkKeyValueDefault "="
+ mkKeyValue ? mkKeyValueDefault {} "="
}: attrs:
let mkLine = k: v: mkKeyValue k v + "\n";
in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs);
@@ -64,7 +70,7 @@ rec {
# apply transformations (e.g. escapes) to section names
mkSectionName ? (name: libStr.escape [ "[" "]" ] name),
# format a setting line from key and value
- mkKeyValue ? mkKeyValueDefault "="
+ mkKeyValue ? mkKeyValueDefault {} "="
}: attrsOfAttrs:
let
# map function to string for each key val
@@ -106,7 +112,7 @@ rec {
else if isString v then "\"" + v + "\""
else if null == v then "null"
else if isFunction v then
- let fna = functionArgs v;
+ let fna = lib.functionArgs v;
showFnas = concatStringsSep "," (libAttr.mapAttrsToList
(name: hasDefVal: if hasDefVal then "(${name})" else name)
fna);
@@ -126,6 +132,6 @@ rec {
(name: value:
"${toPretty args name} = ${toPretty args value};") v)
+ " }"
- else "toPretty: should never happen (v = ${v})";
+ else abort "toPretty: should never happen (v = ${v})";
}
diff --git a/lib/licenses.nix b/lib/licenses.nix
index cbd737dc57f1..ba575c27052d 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -2,7 +2,7 @@
let
spdx = lic: lic // {
- url = "http://spdx.org/licenses/${lic.spdxId}";
+ url = "http://spdx.org/licenses/${lic.spdxId}.html";
};
in
@@ -15,7 +15,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
afl21 = spdx {
spdxId = "AFL-2.1";
- fullName = "Academic Free License";
+ fullName = "Academic Free License v2.1";
+ };
+
+ afl3 = spdx {
+ spdxId = "AFL-3.0";
+ fullName = "Academic Free License v3.0";
};
agpl3 = spdx {
@@ -74,6 +79,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = ''Beerware License'';
};
+ bsd0 = spdx {
+ spdxId = "0BSD";
+ fullName = "BSD Zero Clause License";
+ };
+
bsd2 = spdx {
spdxId = "BSD-2-Clause";
fullName = ''BSD 2-clause "Simplified" License'';
@@ -89,6 +99,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = ''BSD 4-clause "Original" or "Old" License'';
};
+ clArtistic = spdx {
+ spdxId = "ClArtistic";
+ fullName = "Clarified Artistic License";
+ };
+
cc0 = spdx {
spdxId = "CC0-1.0";
fullName = "Creative Commons Zero v1.0 Universal";
@@ -164,6 +179,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "CeCILL-C Free Software License Agreement";
};
+ cpal10 = spdx {
+ spdxId = "CPAL-1.0";
+ fullName = "Common Public Attribution License 1.0";
+ };
+
cpl10 = spdx {
spdxId = "CPL-1.0";
fullName = "Common Public License 1.0";
@@ -195,6 +215,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Eclipse Public License 1.0";
};
+ epl20 = spdx {
+ spdxId = "EPL-2.0";
+ fullName = "Eclipse Public License 2.0";
+ };
+
epson = {
fullName = "Seiko Epson Corporation Software License Agreement for Linux";
url = https://download.ebz.epson.net/dsc/du/02/eula/global/LINUX_EN.html;
@@ -304,6 +329,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
free = false;
};
+ inria-icesl = {
+ fullName = "INRIA Non-Commercial License Agreement for IceSL";
+ url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf";
+ free = false;
+ };
+
ipa = spdx {
spdxId = "IPA";
fullName = "IPA Font License";
@@ -426,6 +457,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Notion modified LGPL";
};
+ nposl3 = spdx {
+ spdxId = "NPOSL-3.0";
+ fullName = "Non-Profit Open Software License 3.0";
+ };
+
ofl = spdx {
spdxId = "OFL-1.1";
fullName = "SIL Open Font License 1.1";
@@ -441,6 +477,16 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "OpenSSL License";
};
+ osl21 = spdx {
+ spdxId = "OSL-2.1";
+ fullName = "Open Software License 2.1";
+ };
+
+ osl3 = spdx {
+ spdxId = "OSL-3.0";
+ fullName = "Open Software License 3.0";
+ };
+
php301 = spdx {
spdxId = "PHP-3.01";
fullName = "PHP License v3.01";
@@ -451,6 +497,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "PostgreSQL License";
};
+ postman = {
+ fullName = "Postman EULA";
+ url = https://www.getpostman.com/licenses/postman_base_app;
+ free = false;
+ };
+
psfl = spdx {
spdxId = "Python-2.0";
fullName = "Python Software Foundation License version 2";
@@ -538,6 +590,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Vovida Software License v1.0";
};
+ watcom = spdx {
+ spdxId = "Watcom-1.0";
+ fullName = "Sybase Open Watcom Public License 1.0";
+ };
+
w3c = spdx {
spdxId = "W3C";
fullName = "W3C Software Notice and License";
@@ -572,5 +629,4 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
spdxId = "ZPL-2.1";
fullName = "Zope Public License 2.1";
};
-
}
diff --git a/lib/lists.nix b/lib/lists.nix
index 8f67c6bb0ca3..424d2c57f556 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -385,6 +385,30 @@ rec {
if len < 2 then list
else (sort strictLess pivot.left) ++ [ first ] ++ (sort strictLess pivot.right));
+ /* Compare two lists element-by-element.
+
+ Example:
+ compareLists compare [] []
+ => 0
+ compareLists compare [] [ "a" ]
+ => -1
+ compareLists compare [ "a" ] []
+ => 1
+ compareLists compare [ "a" "b" ] [ "a" "c" ]
+ => 1
+ */
+ compareLists = cmp: a: b:
+ if a == []
+ then if b == []
+ then 0
+ else -1
+ else if b == []
+ then 1
+ else let rel = cmp (head a) (head b); in
+ if rel == 0
+ then compareLists cmp (tail a) (tail b)
+ else rel;
+
/* Return the first (at most) N elements of a list.
Example:
@@ -440,8 +464,12 @@ rec {
init = list: assert list != []; take (length list - 1) list;
- /* FIXME(zimbatm) Not used anywhere
- */
+ /* return the image of the cross product of some lists by a function
+
+ Example:
+ crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]]
+ => [ "13" "14" "23" "24" ]
+ */
crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f];
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
deleted file mode 100644
index f050904896fc..000000000000
--- a/lib/maintainers.nix
+++ /dev/null
@@ -1,723 +0,0 @@
-{ ...}:
-/* List of NixOS maintainers. The format is:
-
- handle = "Real Name ";
-
- where is preferred to be your GitHub username (so it's easy
- to ping a package @), and is your real name, not
- a pseudonym. Please keep the list alphabetically sorted. */
-{
- a1russell = "Adam Russell ";
- aaronschif = "Aaron Schif ";
- abaldeau = "Andreas Baldeau ";
- abbradar = "Nikolay Amiantov ";
- abigailbuccaneer = "Abigail Bunyan ";
- aboseley = "Adam Boseley ";
- abuibrahim = "Ruslan Babayev ";
- acowley = "Anthony Cowley ";
- adelbertc = "Adelbert Chang ";
- adev = "Adrien Devresse ";
- adisbladis = "Adam Hose ";
- Adjective-Object = "Maxwell Huang-Hobbs ";
- adnelson = "Allen Nelson ";
- adolfogc = "Adolfo E. García Castro ";
- aespinosa = "Allan Espinosa ";
- aflatter = "Alexander Flatter ";
- afldcr = "James Alexander Feldman-Crough ";
- aforemny = "Alexander Foremny ";
- afranchuk = "Alex Franchuk ";
- aherrmann = "Andreas Herrmann ";
- ahmedtd = "Taahir Ahmed ";
- ak = "Alexander Kjeldaas ";
- akaWolf = "Artjom Vejsel ";
- akc = "Anders Claesson ";
- alexvorobiev = "Alex Vorobiev ";
- dezgeg = "Tuomas Tynkkynen ";
- dfordivam = "Divam ";
- dfoxfranke = "Daniel Fox Franke ";
- dgonyeo = "Derek Gonyeo ";
- dipinhora = "Dipin Hora ";
- disassembler = "Samuel Leathers ";
- dizfer = "David Izquierdo ";
- dmalikov = "Dmitry Malikov ";
- DmitryTsygankov = "Dmitry Tsygankov ";
- dmjio = "David Johnson ";
- dochang = "Desmond O. Chang ";
- domenkozar = "Domen Kozar ";
- dotlambda = "Robert Schütz ";
- doublec = "Chris Double ";
- dpaetzel = "David Pätzel ";
- dpflug = "David Pflug ";
- drets = "Dmytro Rets ";
- drewkett = "Andrew Burkett ";
- dsferruzza = "David Sferruzza ";
- dtzWill = "Will Dietz ";
- dupgit = "Olivier Delhomme ";
- dywedir = "Vladyslav M. ";
- e-user = "Alexander Kahl ";
- earldouglas = "James Earl Douglas ";
- ebzzry = "Rommel Martinez ";
- edanaher = "Evan Danaher ";
- edef = "edef ";
- ederoyd46 = "Matthew Brown ";
- eduarrrd = "Eduard Bachmakov ";
- edwtjo = "Edward Tjörnhammar ";
- eelco = "Eelco Dolstra ";
- ehegnes = "Eric Hegnes ";
- ehmry = "Emery Hemingway ";
- eikek = "Eike Kettner ";
- ekleog = "Leo Gaspard ";
- elasticdog = "Aaron Bull Schaefer ";
- eleanor = "Dejan Lukan ";
- elijahcaine = "Elijah Caine ";
- elitak = "Eric Litak ";
- ellis = "Ellis Whitehead ";
- eperuffo = "Emanuele Peruffo ";
- epitrochoid = "Mabry Cervin ";
- eqyiel = "Ruben Maher ";
- ericbmerritt = "Eric Merritt ";
- ericsagnes = "Eric Sagnes ";
- erictapen = "Justin Humm ";
- erikryb = "Erik Rybakken ";
- ertes = "Ertugrul Söylemez ";
- ethercrow = "Dmitry Ivanov ";
- etu = "Elis Hirwing ";
- exi = "Reno Reckling ";
- exlevan = "Alexey Levan ";
- expipiplus1 = "Joe Hermaszewski ";
- fadenb = "Tristan Helmich ";
- falsifian = "James Cook ";
- fare = "Francois-Rene Rideau ";
- fgaz = "Francesco Gazzetta ";
- FireyFly = "Jonas Höglund ";
- flokli = "Florian Klink ";
- florianjacob = "Florian Jacob ";
- flosse = "Markus Kohlhase ";
- fluffynukeit = "Daniel Austin ";
- fmthoma = "Franz Thoma ";
- forkk = "Andrew Okin ";
- fornever = "Friedrich von Never ";
- fpletz = "Franz Pletz ";
- fps = "Florian Paul Schmidt ";
- fridh = "Frederik Rietdijk ";
- frlan = "Frank Lanitz ";
- fro_ozen = "fro_ozen ";
- ftrvxmtrx = "Siarhei Zirukin ";
- funfunctor = "Edward O'Callaghan ";
- fuuzetsu = "Mateusz Kowalczyk ";
- fuzzy-id = "Thomas Bach ";
- fxfactorial = "Edgar Aroutiounian ";
- gabesoft = "Gabriel Adomnicai ";
- gal_bolle = "Florent Becker ";
- garbas = "Rok Garbas ";
- garrison = "Jim Garrison ";
- gavin = "Gavin Rogers ";
- gebner = "Gabriel Ebner ";
- geistesk = "Alvar Penning ";
- georgewhewell = "George Whewell ";
- gilligan = "Tobias Pflug ";
- giogadi = "Luis G. Torres ";
- gleber = "Gleb Peregud ";
- glenns = "Glenn Searby ";
- globin = "Robin Gloster ";
- gnidorah = "Alex Ivanov ";
- goibhniu = "Cillian de Róiste ";
- Gonzih = "Max Gonzih ";
- goodrone = "Andrew Trachenko ";
- gpyh = "Yacine Hmito ";
- grahamc = "Graham Christensen ";
- grburst = "Julius Elias ";
- gridaphobe = "Eric Seidel ";
- guibert = "David Guibert ";
- guibou = "Guillaume Bouchard ";
- guillaumekoenig = "Guillaume Koenig ";
- guyonvarch = "Joris Guyonvarch ";
- hakuch = "Jesse Haber-Kucharsky ";
- hamhut1066 = "Hamish Hutchings ";
- havvy = "Ryan Scheel ";
- hbunke = "Hendrik Bunke ";
- hce = "Hans-Christian Esperer ";
- hectorj = "Hector Jusforgues ";
- hedning = "Tor Hedin Brønner ";
- heel = "Sergii Paryzhskyi ";
- henrytill = "Henry Till ";
- hhm = "hhm ";
- hinton = "Tom Hinton ";
- hodapp = "Chris Hodapp ";
- hrdinka = "Christoph Hrdinka ";
- htr = "Hugo Tavares Reis ";
- iand675 = "Ian Duncan ";
- ianwookim = "Ian-Woo Kim ";
- iblech = "Ingo Blechschmidt ";
- igsha = "Igor Sharonov ";
- ikervagyok = "Balázs Lengyel ";
- infinisil = "Silvan Mosberger ";
- ironpinguin = "Michele Catalano ";
- ivan-tkatchev = "Ivan Tkatchev ";
- ixmatus = "Parnell Springmeyer ";
- j-keck = "Jürgen Keck ";
- jagajaga = "Arseniy Seroka ";
- jammerful = "jammerful ";
- jansol = "Jan Solanti ";
- javaguirre = "Javier Aguirre ";
- jb55 = "William Casarin ";
- jbedo = "Justin Bedő ";
- jcumming = "Jack Cummings ";
- jdagilliland = "Jason Gilliland ";
- jefdaj = "Jeffrey David Johnson ";
- jensbin = "Jens Binkert ";
- jerith666 = "Matt McHenry ";
- jfb = "James Felix Black ";
- jfrankenau = "Johannes Frankenau ";
- jgeerds = "Jascha Geerds ";
- jgertm = "Tim Jaeger ";
- jgillich = "Jakob Gillich ";
- jhhuh = "Ji-Haeng Huh ";
- jirkamarsik = "Jirka Marsik ";
- jlesquembre = "José Luis Lafuente ";
- jluttine = "Jaakko Luttinen ";
- joachifm = "Joachim Fasting ";
- joamaki = "Jussi Maki ";
- joelmo = "Joel Moberg ";
- joelteon = "Joel Taylor ";
- johbo = "Johannes Bornhold ";
- johnmh = "John M. Harris, Jr. ";
- johnramsden = "John Ramsden ";
- joko = "Ioannis Koutras ";
- jonafato = "Jon Banafato ";
- joncojonathan = "Jonathan Haddock ";
- jpierre03 = "Jean-Pierre PRUNARET ";
- jpotier = "Martin Potier ";
- jraygauthier = "Raymond Gauthier ";
- jtojnar = "Jan Tojnar ";
- juliendehos = "Julien Dehos ";
- jwiegley = "John Wiegley ";
- jwilberding = "Jordan Wilberding ";
- jyp = "Jean-Philippe Bernardy ";
- jzellner = "Jeff Zellner ";
- kaiha = "Kai Harries ";
- kamilchm = "Kamil Chmielewski ";
- kampfschlaefer = "Arnold Krille ";
- karolchmist = "karolchmist ";
- kentjames = "James Kent "(allow file-read* (literal \"/usr/bin/file\"))";
-
-lib.sandbox.allowFileRead {
- literal = [ "/usr/bin/file" ];
- subpath = [ "/usr/lib/system" ];
-}
- # => "(allow file-read* (literal \"/usr/bin/file\") (subpath \"/usr/lib/system\"))"
-*/
-
-let
-
-sexp = tokens: "(" + builtins.concatStringsSep " " tokens + ")";
-generateFileList = files:
- if builtins.isList files
- then concatMapStringsSep " " (x: sexp [ "literal" ''"${x}"'' ]) files
- else if builtins.isString files
- then generateFileList [ files ]
- else concatStringsSep " " (
- (map (x: sexp [ "literal" ''"${x}"'' ]) (files.literal or [])) ++
- (map (x: sexp [ "subpath" ''"${x}"'' ]) (files.subpath or []))
- );
-applyToFiles = f: act: files: f "${act} ${generateFileList files}";
-genActions = actionName: let
- action = feature: sexp [ actionName feature ];
- self = {
- "${actionName}" = action;
- "${actionName}File" = applyToFiles action "file*";
- "${actionName}FileRead" = applyToFiles action "file-read*";
- "${actionName}FileReadMetadata" = applyToFiles action "file-read-metadata";
- "${actionName}DirectoryList" = self."${actionName}FileReadMetadata";
- "${actionName}FileWrite" = applyToFiles action "file-write*";
- "${actionName}FileWriteMetadata" = applyToFiles action "file-write-metadata";
- };
- in self;
-
-in
-
-genActions "allow" // genActions "deny" // {
- importProfile = derivation: ''
- (import "${derivation}")
- '';
-}
diff --git a/lib/sources.nix b/lib/sources.nix
index 0fd56d58ddd2..704711b20cd9 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -26,14 +26,35 @@ rec {
(type == "symlink" && lib.hasPrefix "result" baseName)
);
- cleanSource = builtins.filterSource cleanSourceFilter;
+ cleanSource = src: cleanSourceWith { filter = cleanSourceFilter; inherit src; };
+
+ # Like `builtins.filterSource`, except it will compose with itself,
+ # allowing you to chain multiple calls together without any
+ # intermediate copies being put in the nix store.
+ #
+ # lib.cleanSourceWith f (lib.cleanSourceWith g ./.) # Succeeds!
+ # builtins.filterSource f (builtins.filterSource g ./.) # Fails!
+ cleanSourceWith = { filter, src }:
+ let
+ isFiltered = src ? _isLibCleanSourceWith;
+ origSrc = if isFiltered then src.origSrc else src;
+ filter' = if isFiltered then name: type: filter name type && src.filter name type else filter;
+ in {
+ inherit origSrc;
+ filter = filter';
+ outPath = builtins.filterSource filter' origSrc;
+ _isLibCleanSourceWith = true;
+ };
# Filter sources by a list of regular expressions.
#
# E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]`
- sourceByRegex = src: regexes: builtins.filterSource (path: type:
- let relPath = lib.removePrefix (toString src + "/") (toString path);
- in lib.any (re: builtins.match re relPath != null) regexes) src;
+ sourceByRegex = src: regexes: cleanSourceWith {
+ filter = (path: type:
+ let relPath = lib.removePrefix (toString src + "/") (toString path);
+ in lib.any (re: builtins.match re relPath != null) regexes);
+ inherit src;
+ };
# Get all files ending with the specified suffices from the given
# directory or its descendants. E.g. `sourceFilesBySuffices ./dir
@@ -42,7 +63,7 @@ rec {
let filter = name: type:
let base = baseNameOf (toString name);
in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;
- in builtins.filterSource filter path;
+ in cleanSourceWith { inherit filter; src = path; };
# Get the commit id of a git repo
@@ -72,4 +93,8 @@ rec {
else lib.head matchRef
else throw ("Not a .git directory: " + path);
in lib.flip readCommitFromFile "HEAD";
+
+ pathHasContext = builtins.hasContext or (lib.hasPrefix builtins.storeDir);
+
+ canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src));
}
diff --git a/lib/strings.nix b/lib/strings.nix
index aca9ef45e615..e6df7d99cb2e 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -219,6 +219,14 @@ rec {
*/
escapeShellArgs = concatMapStringsSep " " escapeShellArg;
+ /* Turn a string into a Nix expression representing that string
+
+ Example:
+ escapeNixString "hello\${}\n"
+ => "\"hello\\\${}\\n\""
+ */
+ escapeNixString = s: escape ["$"] (builtins.toJSON s);
+
/* Obsolete - use replaceStrings instead. */
replaceChars = builtins.replaceStrings or (
del: new: s:
@@ -429,6 +437,13 @@ rec {
*/
fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
+ /* Check whether a value can be coerced to a string */
+ isCoercibleToString = x:
+ builtins.elem (builtins.typeOf x) [ "path" "string" "null" "int" "float" "bool" ] ||
+ (builtins.isList x && lib.all isCoercibleToString x) ||
+ x ? outPath ||
+ x ? __toString;
+
/* Check whether a value is a store path.
Example:
@@ -442,7 +457,7 @@ rec {
=> false
*/
isStorePath = x:
- builtins.isString x
+ isCoercibleToString x
&& builtins.substring 0 1 (toString x) == "/"
&& dirOf (builtins.toPath x) == builtins.storeDir;
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index b1036b80c4db..bd408e00bb14 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -3,6 +3,7 @@
rec {
doubles = import ./doubles.nix { inherit lib; };
+ forMeta = import ./for-meta.nix { inherit lib; };
parse = import ./parse.nix { inherit lib; };
inspect = import ./inspect.nix { inherit lib; };
platforms = import ./platforms.nix { inherit lib; };
@@ -23,12 +24,15 @@ rec {
config = parse.tripleFromSystem final.parsed;
# Just a guess, based on `system`
platform = platforms.selectBySystem final.system;
+ # Derived meta-data
libc =
- /**/ if final.isDarwin then "libSystem"
- else if final.isMinGW then "msvcrt"
- else if final.isLinux then "glibc"
+ /**/ if final.isDarwin then "libSystem"
+ else if final.isMinGW then "msvcrt"
+ else if final.isMusl then "musl"
+ else if final.isAndroid then "bionic"
+ else if final.isLinux /* default */ then "glibc"
# TODO(@Ericson2314) think more about other operating systems
- else "native/impure";
+ else "native/impure";
extensions = {
sharedLibrary =
/**/ if final.isDarwin then ".dylib"
@@ -38,7 +42,10 @@ rec {
/**/ if final.isWindows then ".exe"
else "";
};
+ # Misc boolean options
+ useAndroidPrebuilt = false;
} // mapAttrs (n: v: v final.parsed) inspect.predicates
// args;
- in final;
+ in assert final.useAndroidPrebuilt -> final.isAndroid;
+ final;
}
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 0cae8ec56fdf..012a1786a3cc 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -1,15 +1,15 @@
{ lib }:
let
inherit (lib) lists;
- parse = import ./parse.nix { inherit lib; };
- inherit (import ./inspect.nix { inherit lib; }) predicates;
+ inherit (lib.systems) parse;
+ inherit (lib.systems.inspect) predicates;
inherit (lib.attrsets) matchAttrs;
all = [
"aarch64-linux"
"armv5tel-linux" "armv6l-linux" "armv7l-linux"
- "mips64el-linux"
+ "mipsel-linux"
"i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"
@@ -24,19 +24,20 @@ let
in rec {
inherit all;
- allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
none = [];
arm = filterDoubles predicates.isArm;
+ aarch64 = filterDoubles predicates.isAarch64;
+ x86 = filterDoubles predicates.isx86;
i686 = filterDoubles predicates.isi686;
- mips = filterDoubles predicates.isMips;
x86_64 = filterDoubles predicates.isx86_64;
+ mips = filterDoubles predicates.isMips;
cygwin = filterDoubles predicates.isCygwin;
darwin = filterDoubles predicates.isDarwin;
freebsd = filterDoubles predicates.isFreeBSD;
# Should be better, but MinGW is unclear, and HURD is bit-rotted.
- gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; });
+ gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; });
illumos = filterDoubles predicates.isSunOS;
linux = filterDoubles predicates.isLinux;
netbsd = filterDoubles predicates.isNetBSD;
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index ff2273febcb0..848737700b0b 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -11,84 +11,78 @@ rec {
sheevaplug = rec {
config = "armv5tel-unknown-linux-gnueabi";
- bigEndian = false;
arch = "armv5tel";
float = "soft";
- withTLS = true;
- libc = "glibc";
platform = platforms.sheevaplug;
- openssl.system = "linux-generic32";
- inherit (platform) gcc;
};
raspberryPi = rec {
config = "armv6l-unknown-linux-gnueabihf";
- bigEndian = false;
arch = "armv6l";
float = "hard";
fpu = "vfp";
- withTLS = true;
- libc = "glibc";
platform = platforms.raspberrypi;
- openssl.system = "linux-generic32";
- inherit (platform) gcc;
};
armv7l-hf-multiplatform = rec {
config = "arm-unknown-linux-gnueabihf";
- bigEndian = false;
arch = "armv7-a";
float = "hard";
fpu = "vfpv3-d16";
- withTLS = true;
- libc = "glibc";
platform = platforms.armv7l-hf-multiplatform;
- openssl.system = "linux-generic32";
- inherit (platform) gcc;
};
aarch64-multiplatform = rec {
config = "aarch64-unknown-linux-gnu";
- bigEndian = false;
arch = "aarch64";
- withTLS = true;
- libc = "glibc";
platform = platforms.aarch64-multiplatform;
- inherit (platform) gcc;
+ };
+
+ aarch64-android-prebuilt = rec {
+ config = "aarch64-unknown-linux-android";
+ arch = "aarch64";
+ platform = platforms.aarch64-multiplatform;
+ useAndroidPrebuilt = true;
};
scaleway-c1 = armv7l-hf-multiplatform // rec {
platform = platforms.scaleway-c1;
- inherit (platform) gcc;
- inherit (gcc) fpu;
+ inherit (platform.gcc) fpu;
};
pogoplug4 = rec {
arch = "armv5tel";
- config = "armv5tel-softfloat-linux-gnueabi";
+ config = "armv5tel-unknown-linux-gnueabi";
float = "soft";
-
platform = platforms.pogoplug4;
-
- inherit (platform) gcc;
- libc = "glibc";
-
- withTLS = true;
- openssl.system = "linux-generic32";
};
fuloongminipc = rec {
- config = "mips64el-unknown-linux-gnu";
- bigEndian = false;
+ config = "mipsel-unknown-linux-gnu";
arch = "mips";
float = "hard";
- withTLS = true;
- libc = "glibc";
platform = platforms.fuloong2f_n32;
- openssl.system = "linux-generic32";
- inherit (platform) gcc;
};
+ muslpi = raspberryPi // {
+ config = "armv6l-unknown-linux-musleabihf";
+ };
+
+ aarch64-multiplatform-musl = aarch64-multiplatform // {
+ config = "aarch64-unknown-linux-musl";
+ };
+
+ musl64 = { config = "x86_64-unknown-linux-musl"; };
+ musl32 = { config = "i686-unknown-linux-musl"; };
+
+ riscv = bits: {
+ config = "riscv${bits}-unknown-linux-gnu";
+ platform = platforms.riscv-multiplatform bits;
+ };
+ riscv64 = riscv "64";
+ riscv32 = riscv "32";
+
+
#
# Darwin
#
diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
new file mode 100644
index 000000000000..63f24b465355
--- /dev/null
+++ b/lib/systems/for-meta.nix
@@ -0,0 +1,30 @@
+{ lib }:
+let
+ inherit (lib.systems) parse;
+ inherit (lib.systems.inspect) patterns;
+
+in rec {
+ all = [ {} ]; # `{}` matches anything
+ none = [];
+
+ arm = [ patterns.isArm ];
+ aarch64 = [ patterns.isAarch64 ];
+ x86 = [ patterns.isx86 ];
+ i686 = [ patterns.isi686 ];
+ x86_64 = [ patterns.isx86_64 ];
+ mips = [ patterns.isMips ];
+
+ cygwin = [ patterns.isCygwin ];
+ darwin = [ patterns.isDarwin ];
+ freebsd = [ patterns.isFreeBSD ];
+ # Should be better, but MinGW is unclear, and HURD is bit-rotted.
+ gnu = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ];
+ illumos = [ patterns.isSunOS ];
+ linux = [ patterns.isLinux ];
+ netbsd = [ patterns.isNetBSD ];
+ openbsd = [ patterns.isOpenBSD ];
+ unix = patterns.isUnix; # Actually a list
+ windows = [ patterns.isWindows ];
+
+ inherit (lib.systems.doubles) mesaPlatforms;
+}
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index a4fa9af4e0a8..e8ea2bed25f5 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -5,38 +5,51 @@ with lib.lists;
rec {
patterns = rec {
- "32bit" = { cpu = { bits = 32; }; };
- "64bit" = { cpu = { bits = 64; }; };
- i686 = { cpu = cpuTypes.i686; };
- x86_64 = { cpu = cpuTypes.x86_64; };
- PowerPC = { cpu = cpuTypes.powerpc; };
- x86 = { cpu = { family = "x86"; }; };
- Arm = { cpu = { family = "arm"; }; };
- Aarch64 = { cpu = { family = "aarch64"; }; };
- Mips = { cpu = { family = "mips"; }; };
- BigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; };
- LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
+ isi686 = { cpu = cpuTypes.i686; };
+ isx86_64 = { cpu = cpuTypes.x86_64; };
+ isPowerPC = { cpu = cpuTypes.powerpc; };
+ isx86 = { cpu = { family = "x86"; }; };
+ isArm = { cpu = { family = "arm"; }; };
+ isAarch64 = { cpu = { family = "aarch64"; }; };
+ isMips = { cpu = { family = "mips"; }; };
+ isRiscV = { cpu = { family = "riscv"; }; };
+ isWasm = { cpu = { family = "wasm"; }; };
- BSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
- Unix = [ BSD Darwin Linux SunOS Hurd Cygwin ];
+ is32bit = { cpu = { bits = 32; }; };
+ is64bit = { cpu = { bits = 64; }; };
+ isBigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; };
+ isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
- Darwin = { kernel = kernels.darwin; };
- Linux = { kernel = kernels.linux; };
- SunOS = { kernel = kernels.solaris; };
- FreeBSD = { kernel = kernels.freebsd; };
- Hurd = { kernel = kernels.hurd; };
- NetBSD = { kernel = kernels.netbsd; };
- OpenBSD = { kernel = kernels.openbsd; };
- Windows = { kernel = kernels.windows; };
- Cygwin = { kernel = kernels.windows; abi = abis.cygnus; };
- MinGW = { kernel = kernels.windows; abi = abis.gnu; };
+ isBSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
+ isDarwin = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; };
+ isUnix = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ];
+
+ isMacOS = { kernel = kernels.macos; };
+ isiOS = { kernel = kernels.ios; };
+ isLinux = { kernel = kernels.linux; };
+ isSunOS = { kernel = kernels.solaris; };
+ isFreeBSD = { kernel = kernels.freebsd; };
+ isHurd = { kernel = kernels.hurd; };
+ isNetBSD = { kernel = kernels.netbsd; };
+ isOpenBSD = { kernel = kernels.openbsd; };
+ isWindows = { kernel = kernels.windows; };
+ isCygwin = { kernel = kernels.windows; abi = abis.cygnus; };
+ isMinGW = { kernel = kernels.windows; abi = abis.gnu; };
+
+ isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
+ isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
+
+ isKexecable = map (family: { kernel = kernels.linux; cpu.family = family; })
+ [ "x86" "arm" "aarch64" "mips" ];
+ isEfi = map (family: { cpu.family = family; })
+ [ "x86" "arm" "aarch64" ];
+ isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
+ [ "x86" "arm" "aarch64" "mips" ];
};
matchAnyAttrs = patterns:
if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns
else matchAttrs patterns;
- predicates = mapAttrs'
- (name: value: nameValuePair ("is" + name) (matchAnyAttrs value))
- patterns;
+ predicates = mapAttrs (_: matchAnyAttrs) patterns;
}
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index d14ca04bfb9e..641a7f5d7584 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -4,6 +4,16 @@
# http://llvm.org/docs/doxygen/html/Triple_8cpp_source.html especially
# Triple::normalize. Parsing should essentially act as a more conservative
# version of that last function.
+#
+# Most of the types below come in "open" and "closed" pairs. The open ones
+# specify what information we need to know about systems in general, and the
+# closed ones are sub-types representing the whitelist of systems we support in
+# practice.
+#
+# Code in the remainder of nixpkgs shouldn't rely on the closed ones in
+# e.g. exhaustive cases. Its more a sanity check to make sure nobody defines
+# systems that overlap with existing ones and won't notice something amiss.
+#
{ lib }:
with lib.lists;
with lib.types;
@@ -11,29 +21,52 @@ with lib.attrsets;
with (import ./inspect.nix { inherit lib; }).predicates;
let
- setTypesAssert = type: pred:
+ inherit (lib.options) mergeOneOption;
+
+ setTypes = type:
mapAttrs (name: value:
- assert pred value;
- setType type ({ inherit name; } // value));
- setTypes = type: setTypesAssert type (_: true);
+ assert type.check value;
+ setType type.name ({ inherit name; } // value));
in
rec {
- isSignificantByte = isType "significant-byte";
- significantBytes = setTypes "significant-byte" {
+ ################################################################################
+
+ types.openSignifiantByte = mkOptionType {
+ name = "significant-byte";
+ description = "Endianness";
+ merge = mergeOneOption;
+ };
+
+ types.significantByte = enum (attrValues significantBytes);
+
+ significantBytes = setTypes types.openSignifiantByte {
bigEndian = {};
littleEndian = {};
};
- isCpuType = isType "cpu-type";
- cpuTypes = with significantBytes; setTypesAssert "cpu-type"
- (x: elem x.bits [8 16 32 64 128]
- && (if 8 < x.bits
- then isSignificantByte x.significantByte
- else !(x ? significantByte)))
- {
+ ################################################################################
+
+ # Reasonable power of 2
+ types.bitWidth = enum [ 8 16 32 64 128 ];
+
+ ################################################################################
+
+ types.openCpuType = mkOptionType {
+ name = "cpu-type";
+ description = "instruction set architecture name and information";
+ merge = mergeOneOption;
+ check = x: types.bitWidth.check x.bits
+ && (if 8 < x.bits
+ then types.significantByte.check x.significantByte
+ else !(x ? significantByte));
+ };
+
+ types.cpuType = enum (attrValues cpuTypes);
+
+ cpuTypes = with significantBytes; setTypes types.openCpuType {
arm = { bits = 32; significantByte = littleEndian; family = "arm"; };
armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; };
armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; };
@@ -42,20 +75,45 @@ rec {
aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; };
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; };
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; };
- mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };
+ mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
+ mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
+ mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
+ mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
powerpc = { bits = 32; significantByte = bigEndian; family = "power"; };
+ riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; };
+ riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };
+ wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
+ wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
};
- isVendor = isType "vendor";
- vendors = setTypes "vendor" {
+ ################################################################################
+
+ types.openVendor = mkOptionType {
+ name = "vendor";
+ description = "vendor for the platform";
+ merge = mergeOneOption;
+ };
+
+ types.vendor = enum (attrValues vendors);
+
+ vendors = setTypes types.openVendor {
apple = {};
pc = {};
unknown = {};
};
- isExecFormat = isType "exec-format";
- execFormats = setTypes "exec-format" {
+ ################################################################################
+
+ types.openExecFormat = mkOptionType {
+ name = "exec-format";
+ description = "executable container used by the kernel";
+ merge = mergeOneOption;
+ };
+
+ types.execFormat = enum (attrValues execFormats);
+
+ execFormats = setTypes types.openExecFormat {
aout = {}; # a.out
elf = {};
macho = {};
@@ -64,16 +122,38 @@ rec {
unknown = {};
};
- isKernelFamily = isType "kernel-family";
- kernelFamilies = setTypes "kernel-family" {
- bsd = {};
+ ################################################################################
+
+ types.openKernelFamily = mkOptionType {
+ name = "exec-format";
+ description = "executable container used by the kernel";
+ merge = mergeOneOption;
};
- isKernel = x: isType "kernel" x;
- kernels = with execFormats; with kernelFamilies; setTypesAssert "kernel"
- (x: isExecFormat x.execFormat && all isKernelFamily (attrValues x.families))
- {
- darwin = { execFormat = macho; families = { }; };
+ types.kernelFamily = enum (attrValues kernelFamilies);
+
+ kernelFamilies = setTypes types.openKernelFamily {
+ bsd = {};
+ darwin = {};
+ };
+
+ ################################################################################
+
+ types.openKernel = mkOptionType {
+ name = "kernel";
+ description = "kernel name and information";
+ merge = mergeOneOption;
+ check = x: types.execFormat.check x.execFormat
+ && all types.kernelFamily.check (attrValues x.families);
+ };
+
+ types.kernel = enum (attrValues kernels);
+
+ kernels = with execFormats; with kernelFamilies; setTypes types.openKernel {
+ # TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as
+ # the nnormalized name for macOS.
+ macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; };
+ ios = { execFormat = macho; families = { inherit darwin; }; };
freebsd = { execFormat = elf; families = { inherit bsd; }; };
hurd = { execFormat = elf; families = { }; };
linux = { execFormat = elf; families = { }; };
@@ -83,14 +163,28 @@ rec {
solaris = { execFormat = elf; families = { }; };
windows = { execFormat = pe; families = { }; };
} // { # aliases
+ # 'darwin' is the kernel for all of them. We choose macOS by default.
+ darwin = kernels.macos;
# TODO(@Ericson2314): Handle these Darwin version suffixes more generally.
- darwin10 = kernels.darwin;
- darwin14 = kernels.darwin;
+ darwin10 = kernels.macos;
+ darwin14 = kernels.macos;
+ watchos = kernels.ios;
+ tvos = kernels.ios;
win32 = kernels.windows;
};
- isAbi = isType "abi";
- abis = setTypes "abi" {
+ ################################################################################
+
+ types.openAbi = mkOptionType {
+ name = "abi";
+ description = "binary interface for compiled code and syscalls";
+ merge = mergeOneOption;
+ };
+
+ types.abi = enum (attrValues abis);
+
+ abis = setTypes types.openAbi {
+ android = {};
cygnus = {};
gnu = {};
msvc = {};
@@ -98,16 +192,31 @@ rec {
androideabi = {};
gnueabi = {};
gnueabihf = {};
+ musleabi = {};
+ musleabihf = {};
+ musl = {};
unknown = {};
};
+ ################################################################################
+
+ types.system = mkOptionType {
+ name = "system";
+ description = "fully parsed representation of llvm- or nix-style platform tuple";
+ merge = mergeOneOption;
+ check = { cpu, vendor, kernel, abi }:
+ types.cpuType.check cpu
+ && types.vendor.check vendor
+ && types.kernel.check kernel
+ && types.abi.check abi;
+ };
+
isSystem = isType "system";
- mkSystem = { cpu, vendor, kernel, abi }:
- assert isCpuType cpu && isVendor vendor && isKernel kernel && isAbi abi;
- setType "system" {
- inherit cpu vendor kernel abi;
- };
+
+ mkSystem = components:
+ assert types.system.check components;
+ setType "system" components;
mkSkeletonFromList = l: {
"2" = # We only do 2-part hacks for things Nix already supports
@@ -162,12 +271,14 @@ rec {
mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
doubleFromSystem = { cpu, vendor, kernel, abi, ... }:
- if abi == abis.cygnus
- then "${cpu.name}-cygwin"
+ /**/ if abi == abis.cygnus then "${cpu.name}-cygwin"
+ else if kernel.families ? darwin then "${cpu.name}-darwin"
else "${cpu.name}-${kernel.name}";
tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let
optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}";
in "${cpu.name}-${vendor.name}-${kernel.name}${optAbi}";
+ ################################################################################
+
}
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index fd43ceaa0df2..f39e890fbf1c 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -2,7 +2,6 @@
rec {
pcBase = {
name = "pc";
- kernelHeadersBaseConfig = "defconfig";
kernelBaseConfig = "defconfig";
# Build whatever possible as a module, if not stated in the extra config.
kernelAutoModules = true;
@@ -30,7 +29,6 @@ rec {
};
kernelMajor = "2.6";
- kernelHeadersBaseConfig = "multi_v5_defconfig";
kernelBaseConfig = "multi_v5_defconfig";
kernelArch = "arm";
kernelAutoModules = false;
@@ -54,7 +52,6 @@ rec {
sheevaplug = {
name = "sheevaplug";
kernelMajor = "2.6";
- kernelHeadersBaseConfig = "multi_v5_defconfig";
kernelBaseConfig = "multi_v5_defconfig";
kernelArch = "arm";
kernelAutoModules = false;
@@ -168,7 +165,6 @@ rec {
raspberrypi = {
name = "raspberrypi";
kernelMajor = "2.6";
- kernelHeadersBaseConfig = "bcm2835_defconfig";
kernelBaseConfig = "bcmrpi_defconfig";
kernelDTB = true;
kernelArch = "arm";
@@ -347,7 +343,6 @@ rec {
utilite = {
name = "utilite";
kernelMajor = "2.6";
- kernelHeadersBaseConfig = "multi_v7_defconfig";
kernelBaseConfig = "multi_v7_defconfig";
kernelArch = "arm";
kernelAutoModules = false;
@@ -379,13 +374,11 @@ rec {
# patch.
kernelBaseConfig = "guruplug_defconfig";
- #kernelHeadersBaseConfig = "guruplug_defconfig";
};
fuloong2f_n32 = {
name = "fuloong2f_n32";
kernelMajor = "2.6";
- kernelHeadersBaseConfig = "fuloong2e_defconfig";
kernelBaseConfig = "lemote2f_defconfig";
kernelArch = "mips";
kernelAutoModules = false;
@@ -471,7 +464,6 @@ rec {
armv7l-hf-multiplatform = {
name = "armv7l-hf-multiplatform";
kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.
- kernelHeadersBaseConfig = "multi_v7_defconfig";
kernelBaseConfig = "multi_v7_defconfig";
kernelArch = "arm";
kernelDTB = true;
@@ -479,6 +471,11 @@ rec {
kernelPreferBuiltin = true;
kernelTarget = "zImage";
kernelExtraConfig = ''
+ # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
+ SERIAL_8250_BCM2835AUX y
+ SERIAL_8250_EXTENDED y
+ SERIAL_8250_SHARE_IRQ y
+
# Fix broken sunxi-sid nvmem driver.
TI_CPTS y
@@ -512,7 +509,6 @@ rec {
aarch64-multiplatform = {
name = "aarch64-multiplatform";
kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.
- kernelHeadersBaseConfig = "defconfig";
kernelBaseConfig = "defconfig";
kernelArch = "arm64";
kernelDTB = true;
@@ -545,6 +541,19 @@ rec {
};
};
+ riscv-multiplatform = bits: {
+ name = "riscv-multiplatform";
+ kernelArch = "riscv";
+ bfdEmulation = "elf${bits}lriscv";
+ kernelTarget = "vmlinux";
+ kernelAutoModules = true;
+ kernelBaseConfig = "defconfig";
+ kernelExtraConfig = ''
+ FTRACE n
+ SERIAL_OF_PLATFORM y
+ '';
+ };
+
selectBySystem = system: {
"i686-linux" = pc32;
"x86_64-linux" = pc64;
@@ -552,6 +561,6 @@ rec {
"armv6l-linux" = raspberrypi;
"armv7l-linux" = armv7l-hf-multiplatform;
"aarch64-linux" = aarch64-multiplatform;
- "mips64el-linux" = fuloong2f_n32;
+ "mipsel-linux" = fuloong2f_n32;
}.${system} or pcBase;
}
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 4c4c06fe78da..e10aea48e48e 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -93,6 +93,7 @@ runTests {
"${builtins.storeDir}/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11";
in {
storePath = isStorePath goodPath;
+ storePathDerivation = isStorePath (import ../.. {}).hello;
storePathAppendix = isStorePath
"${goodPath}/bin/python";
nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
@@ -106,6 +107,7 @@ runTests {
};
expected = {
storePath = true;
+ storePathDerivation = true;
storePathAppendix = false;
nonAbsolute = false;
asPath = true;
@@ -201,7 +203,7 @@ runTests {
# in alphabetical order
testMkKeyValueDefault = {
- expr = generators.mkKeyValueDefault ":" "f:oo" "bar";
+ expr = generators.mkKeyValueDefault {} ":" "f:oo" "bar";
expected = ''f\:oo:bar'';
};
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index a6184041682f..d9a8a0067253 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -13,7 +13,6 @@ pkgs.stdenv.mkDerivation {
export NIX_DB_DIR=$TEST_ROOT/db
export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
- export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
export NIX_STATE_DIR=$TEST_ROOT/var/nix
export NIX_STORE_DIR=$TEST_ROOT/store
export PAGER=cat
@@ -21,7 +20,7 @@ pkgs.stdenv.mkDerivation {
nix-store --init
cd ${pkgs.path}/lib/tests
- ./modules.sh
+ bash ./modules.sh
[[ "$(nix-instantiate --eval --strict misc.nix)" == "[ ]" ]]
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index 523fd3feb3b0..ffdd8ae929c8 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -16,7 +16,7 @@ in with lib.systems.doubles; lib.runTests {
arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]);
i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]);
- mips = assertTrue (mseteq mips [ "mips64el-linux" ]);
+ mips = assertTrue (mseteq mips [ "mipsel-linux" ]);
x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]);
cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]);
@@ -24,7 +24,7 @@ in with lib.systems.doubles; lib.runTests {
freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]);
gnu = assertTrue (mseteq gnu (linux /* ++ hurd ++ kfreebsd ++ ... */));
illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]);
- linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]);
+ linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]);
netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]);
openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]);
unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
diff --git a/lib/trivial.nix b/lib/trivial.nix
index c452c7b65bc1..a928e1dbca98 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -52,7 +52,7 @@ rec {
# Pull in some builtins not included elsewhere.
inherit (builtins)
- pathExists readFile isBool isFunction
+ pathExists readFile isBool
isInt add sub lessThan
seq deepSeq genericClosure;
@@ -81,6 +81,42 @@ rec {
*/
mod = base: int: base - (int * (builtins.div base int));
+ /* C-style comparisons
+
+ a < b, compare a b => -1
+ a == b, compare a b => 0
+ a > b, compare a b => 1
+ */
+ compare = a: b:
+ if a < b
+ then -1
+ else if a > b
+ then 1
+ else 0;
+
+ /* Split type into two subtypes by predicate `p`, take all elements
+ of the first subtype to be less than all the elements of the
+ second subtype, compare elements of a single subtype with `yes`
+ and `no` respectively.
+
+ Example:
+
+ let cmp = splitByAndCompare (hasPrefix "foo") compare compare; in
+
+ cmp "a" "z" => -1
+ cmp "fooa" "fooz" => -1
+
+ cmp "f" "a" => 1
+ cmp "fooa" "a" => -1
+ # while
+ compare "fooa" "a" => 1
+
+ */
+ splitByAndCompare = p: yes: no: a: b:
+ if p a
+ then if p b then yes a b else -1
+ else if p b then 1 else no a b;
+
/* Reads a JSON file. */
importJSON = path:
builtins.fromJSON (builtins.readFile path);
@@ -99,4 +135,29 @@ rec {
*/
warn = msg: builtins.trace "WARNING: ${msg}";
info = msg: builtins.trace "INFO: ${msg}";
+
+ # | Add metadata about expected function arguments to a function.
+ # The metadata should match the format given by
+ # builtins.functionArgs, i.e. a set from expected argument to a bool
+ # representing whether that argument has a default or not.
+ # setFunctionArgs : (a → b) → Map String Bool → (a → b)
+ #
+ # This function is necessary because you can't dynamically create a
+ # function of the { a, b ? foo, ... }: format, but some facilities
+ # like callPackage expect to be able to query expected arguments.
+ setFunctionArgs = f: args:
+ { # TODO: Should we add call-time "type" checking like built in?
+ __functor = self: f;
+ __functionArgs = args;
+ };
+
+ # | Extract the expected function arguments from a function.
+ # This works both with nix-native { a, b ? foo, ... }: style
+ # functions and functions with args set with 'setFunctionArgs'. It
+ # has the same return type and semantics as builtins.functionArgs.
+ # setFunctionArgs : (a → b) → Map String Bool.
+ functionArgs = f: f.__functionArgs or (builtins.functionArgs f);
+
+ isFunction = f: builtins.isFunction f ||
+ (f ? __functor && isFunction (f.__functor f));
}
diff --git a/lib/types.nix b/lib/types.nix
index 46ed05d288f2..a334db5c7247 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -174,6 +174,13 @@ rec {
merge = mergeOneOption;
};
+ strMatching = pattern: mkOptionType {
+ name = "strMatching ${escapeNixString pattern}";
+ description = "string matching the pattern ${pattern}";
+ check = x: str.check x && builtins.match pattern x != null;
+ inherit (str) merge;
+ };
+
# Merge multiple definitions by concatenating them (with the given
# separator between the values).
separatedString = sep: mkOptionType rec {
@@ -249,6 +256,10 @@ rec {
functor = (defaultFunctor name) // { wrapped = elemType; };
};
+ nonEmptyListOf = elemType:
+ let list = addCheck (types.listOf elemType) (l: l != []);
+ in list // { description = "non-empty " + list.description; };
+
attrsOf = elemType: mkOptionType rec {
name = "attrsOf";
description = "attribute set of ${elemType.description}s";
diff --git a/lib/versions.nix b/lib/versions.nix
new file mode 100644
index 000000000000..8f7f98ff5e1e
--- /dev/null
+++ b/lib/versions.nix
@@ -0,0 +1,47 @@
+/* Version string functions. */
+{ lib }:
+
+let
+
+ splitVersion = builtins.splitVersion or (lib.splitString ".");
+
+in
+
+rec {
+
+ /* Get the major version string from a string.
+
+ Example:
+ major "1.2.3"
+ => "1"
+ */
+ major = v: builtins.elemAt (splitVersion v) 0;
+
+ /* Get the minor version string from a string.
+
+ Example:
+ minor "1.2.3"
+ => "2"
+ */
+ minor = v: builtins.elemAt (splitVersion v) 1;
+
+ /* Get the patch version string from a string.
+
+ Example:
+ patch "1.2.3"
+ => "3"
+ */
+ patch = v: builtins.elemAt (splitVersion v) 2;
+
+ /* Get string of the first two parts (major and minor)
+ of a version string.
+
+ Example:
+ majorMinor "1.2.3"
+ => "1.2"
+ */
+ majorMinor = v:
+ builtins.concatStringsSep "."
+ (lib.take 2 (splitVersion v));
+
+}
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
new file mode 100644
index 000000000000..0524b26b8315
--- /dev/null
+++ b/maintainers/maintainer-list.nix
@@ -0,0 +1,4028 @@
+/* List of NixOS maintainers.
+
+ handle = {
+ name = "Real name";
+ email = "address@example.org";
+ github = "GithubUsername";
+ };
+
+ where `name` is your real name, `email` is your maintainer email
+ address and `github` is your GitHub handle (as it appears in the
+ URL of your profile page, `https://github.com/`).
+ address
+ The only required fields are `name` and `email`.
+ More fields may be added in the future.
+
+ Please keep the list alphabetically sorted.
+ See `../maintainers/scripts/check-maintainer-github-handles.sh`
+ for an example on how to work with this data.
+ */
+{
+ Adjective-Object = {
+ email = "mhuan13@gmail.com";
+ github = "Adjective-Object";
+ name = "Maxwell Huang-Hobbs";
+ };
+ AndersonTorres = {
+ email = "torres.anderson.85@gmail.com";
+ github = "AndersonTorres";
+ name = "Anderson Torres";
+ };
+ Baughn = {
+ email = "sveina@gmail.com";
+ github = "Baughn";
+ name = "Svein Ove Aas";
+ };
+ ChengCat = {
+ email = "yu@cheng.cat";
+ github = "ChengCat";
+ name = "Yucheng Zhang";
+ };
+ CrystalGamma = {
+ email = "nixos@crystalgamma.de";
+ github = "CrystalGamma";
+ name = "Jona Stubbe";
+ };
+ DamienCassou = {
+ email = "damien@cassou.me";
+ github = "DamienCassou";
+ name = "Damien Cassou";
+ };
+ DerGuteMoritz = {
+ email = "moritz@twoticketsplease.de";
+ github = "DerGuteMoritz";
+ name = "Moritz Heidkamp";
+ };
+ DerTim1 = {
+ email = "tim.digel@active-group.de";
+ github = "DerTim1";
+ name = "Tim Digel";
+ };
+ DmitryTsygankov = {
+ email = "dmitry.tsygankov@gmail.com";
+ github = "DmitryTsygankov";
+ name = "Dmitry Tsygankov";
+ };
+ Esteth = {
+ email = "adam.copp@gmail.com";
+ name = "Adam Copp";
+ };
+ FireyFly = {
+ email = "nix@firefly.nu";
+ github = "FireyFly";
+ name = "Jonas Höglund";
+ };
+ Gonzih = {
+ email = "gonzih@gmail.com";
+ github = "Gonzih";
+ name = "Max Gonzih";
+ };
+ Jo = {
+ email = "0x4A6F@shackspace.de";
+ name = "Joachim Ernst";
+ };
+ KibaFox = {
+ email = "kiba.fox@foxypossibilities.com";
+ github = "KibaFox";
+ name = "Kiba Fox";
+ };
+ MP2E = {
+ email = "MP2E@archlinux.us";
+ github = "MP2E";
+ name = "Cray Elliott";
+ };
+ Mogria = {
+ email = "m0gr14@gmail.com";
+ github = "mogria";
+ name = "Mogria";
+ };
+ MostAwesomeDude = {
+ email = "cds@corbinsimpson.com";
+ github = "MostAwesomeDude";
+ name = "Corbin Simpson";
+ };
+ Nate-Devv = {
+ email = "natedevv@gmail.com";
+ name = "Nathan Moore";
+ };
+ NikolaMandic = {
+ email = "nikola@mandic.email";
+ github = "NikolaMandic";
+ name = "Ratko Mladic";
+ };
+ Phlogistique = {
+ email = "noe.rubinstein@gmail.com";
+ github = "Phlogistique";
+ name = "Noé Rubinstein";
+ };
+ Profpatsch = {
+ email = "mail@profpatsch.de";
+ github = "Profpatsch";
+ name = "Profpatsch";
+ };
+ roosemberth = {
+ email = "roosembert.palacios+nixpkgs@gmail.com";
+ github = "roosemberth";
+ name = "Roosembert (Roosemberth) Palacios";
+ };
+ SShrike = {
+ email = "severen@shrike.me";
+ github = "severen";
+ name = "Severen Redwood";
+ };
+ SeanZicari = {
+ email = "sean.zicari@gmail.com";
+ github = "SeanZicari";
+ name = "Sean Zicari";
+ };
+ StijnDW = {
+ email = "stekke@airmail.cc";
+ github = "StijnDW";
+ name = "Stijn DW";
+ };
+ StillerHarpo = {
+ email = "florianengel39@gmail.com";
+ github = "StillerHarpo";
+ name = "Florian Engel";
+ };
+ SuprDewd = {
+ email = "suprdewd@gmail.com";
+ github = "SuprDewd";
+ name = "Bjarki Ágúst Guðmundsson";
+ };
+ TealG = {
+ email = "~@Teal.Gr";
+ github = "TealG";
+ name = "Teal Gaure";
+ };
+ ThomasMader = {
+ email = "thomas.mader@gmail.com";
+ github = "ThomasMader";
+ name = "Thomas Mader";
+ };
+ Zimmi48 = {
+ email = "theo.zimmermann@univ-paris-diderot.fr";
+ github = "Zimmi48";
+ name = "Théo Zimmermann";
+ };
+ a1russell = {
+ email = "adamlr6+pub@gmail.com";
+ github = "a1russell";
+ name = "Adam Russell";
+ };
+ aaronschif = {
+ email = "aaronschif@gmail.com";
+ github = "aaronschif";
+ name = "Aaron Schif";
+ };
+ abaldeau = {
+ email = "andreas@baldeau.net";
+ github = "baldo";
+ name = "Andreas Baldeau";
+ };
+ abbradar = {
+ email = "ab@fmap.me";
+ github = "abbradar";
+ name = "Nikolay Amiantov";
+ };
+ abigailbuccaneer = {
+ email = "abigailbuccaneer@gmail.com";
+ github = "abigailbuccaneer";
+ name = "Abigail Bunyan";
+ };
+ aborsu = {
+ email = "a.borsu@gmail.com";
+ github = "aborsu";
+ name = "Augustin Borsu";
+ };
+ aboseley = {
+ email = "adam.boseley@gmail.com";
+ github = "aboseley";
+ name = "Adam Boseley";
+ };
+ abuibrahim = {
+ email = "ruslan@babayev.com";
+ github = "abuibrahim";
+ name = "Ruslan Babayev";
+ };
+ acowley = {
+ email = "acowley@gmail.com";
+ github = "acowley";
+ name = "Anthony Cowley";
+ };
+ adelbertc = {
+ email = "adelbertc@gmail.com";
+ github = "adelbertc";
+ name = "Adelbert Chang";
+ };
+ adev = {
+ email = "adev@adev.name";
+ github = "adevress";
+ name = "Adrien Devresse";
+ };
+ adisbladis = {
+ email = "adis@blad.is";
+ github = "adisbladis";
+ name = "Adam Hose";
+ };
+ adnelson = {
+ email = "ithinkican@gmail.com";
+ github = "adnelson";
+ name = "Allen Nelson";
+ };
+ adolfogc = {
+ email = "adolfo.garcia.cr@gmail.com";
+ github = "adolfogc";
+ name = "Adolfo E. García Castro";
+ };
+ aespinosa = {
+ email = "allan.espinosa@outlook.com";
+ github = "aespinosa";
+ name = "Allan Espinosa";
+ };
+ aflatter = {
+ email = "flatter@fastmail.fm";
+ github = "aflatter";
+ name = "Alexander Flatter";
+ };
+ afldcr = {
+ email = "alex@fldcr.com";
+ github = "afldcr";
+ name = "James Alexander Feldman-Crough";
+ };
+ aforemny = {
+ email = "alexanderforemny@googlemail.com";
+ github = "aforemny";
+ name = "Alexander Foremny";
+ };
+ afranchuk = {
+ email = "alex.franchuk@gmail.com";
+ github = "afranchuk";
+ name = "Alex Franchuk";
+ };
+ aherrmann = {
+ email = "andreash87@gmx.ch";
+ github = "aherrmann";
+ name = "Andreas Herrmann";
+ };
+ ahmedtd = {
+ email = "ahmed.taahir@gmail.com";
+ github = "ahmedtd";
+ name = "Taahir Ahmed";
+ };
+ aij = {
+ email = "aij+git@mrph.org";
+ github = "aij";
+ name = "Ivan Jager";
+ };
+ ajgrf = {
+ email = "a@ajgrf.com";
+ github = "ajgrf";
+ name = "Alex Griffin";
+ };
+ ak = {
+ email = "ak@formalprivacy.com";
+ github = "alexanderkjeldaas";
+ name = "Alexander Kjeldaas";
+ };
+ akaWolf = {
+ email = "akawolf0@gmail.com";
+ github = "akaWolf";
+ name = "Artjom Vejsel";
+ };
+ akc = {
+ email = "akc@akc.is";
+ github = "akc";
+ name = "Anders Claesson";
+ };
+ akru = {
+ email = "mail@akru.me";
+ github = "akru";
+ name = "Alexander Krupenkin ";
+ };
+ alexvorobiev = {
+ email = "alexander.vorobiev@gmail.com";
+ github = "alexvorobiev";
+ name = "Alex Vorobiev";
+ };
+ algorith = {
+ email = "dries_van_daele@telenet.be";
+ name = "Dries Van Daele";
+ };
+ alibabzo = {
+ email = "alistair.bill@gmail.com";
+ github = "alibabzo";
+ name = "Alistair Bill";
+ };
+ all = {
+ email = "nix-commits@lists.science.uu.nl";
+ name = "Nix Committers";
+ };
+ alunduil = {
+ email = "alunduil@alunduil.com";
+ github = "alunduil";
+ name = "Alex Brandt";
+ };
+ ambrop72 = {
+ email = "ambrop7@gmail.com";
+ github = "ambrop72";
+ name = "Ambroz Bizjak";
+ };
+ amiddelk = {
+ email = "amiddelk@gmail.com";
+ github = "amiddelk";
+ name = "Arie Middelkoop";
+ };
+ amiloradovsky = {
+ email = "miloradovsky@gmail.com";
+ github = "amiloradovsky";
+ name = "Andrew Miloradovsky";
+ };
+ aminechikhaoui = {
+ email = "amine.chikhaoui91@gmail.com";
+ github = "AmineChikhaoui";
+ name = "Amine Chikhaoui";
+ };
+ amorsillo = {
+ email = "andrew.morsillo@gmail.com";
+ github = "AndrewMorsillo";
+ name = "Andrew Morsillo";
+ };
+ anderspapitto = {
+ email = "anderspapitto@gmail.com";
+ github = "anderspapitto";
+ name = "Anders Papitto";
+ };
+ andir = {
+ email = "andreas@rammhold.de";
+ github = "andir";
+ name = "Andreas Rammhold";
+ };
+ andres = {
+ email = "ksnixos@andres-loeh.de";
+ github = "kosmikus";
+ name = "Andres Loeh";
+ };
+ andrestylianos = {
+ email = "andre.stylianos@gmail.com";
+ github = "andrestylianos";
+ name = "Andre S. Ramos";
+ };
+ andrew-d = {
+ email = "andrew@du.nham.ca";
+ github = "andrew-d";
+ name = "Andrew Dunham";
+ };
+ andrewrk = {
+ email = "superjoe30@gmail.com";
+ github = "andrewrk";
+ name = "Andrew Kelley";
+ };
+ andsild = {
+ email = "andsild@gmail.com";
+ github = "andsild";
+ name = "Anders Sildnes";
+ };
+ aneeshusa = {
+ email = "aneeshusa@gmail.com";
+ github = "aneeshusa";
+ name = "Aneesh Agrawal";
+ };
+ ankhers = {
+ email = "justin.k.wood@gmail.com";
+ github = "ankhers";
+ name = "Justin Wood";
+ };
+ antono = {
+ email = "self@antono.info";
+ github = "antono";
+ name = "Antono Vasiljev";
+ };
+ antonxy = {
+ email = "anton.schirg@posteo.de";
+ github = "antonxy";
+ name = "Anton Schirg";
+ };
+ apeschar = {
+ email = "albert@peschar.net";
+ github = "apeschar";
+ name = "Albert Peschar";
+ };
+ apeyroux = {
+ email = "alex@px.io";
+ github = "apeyroux";
+ name = "Alexandre Peyroux";
+ };
+ arcadio = {
+ email = "arc@well.ox.ac.uk";
+ github = "arcadio";
+ name = "Arcadio Rubio García";
+ };
+ ardumont = {
+ email = "eniotna.t@gmail.com";
+ github = "ardumont";
+ name = "Antoine R. Dumont";
+ };
+ aristid = {
+ email = "aristidb@gmail.com";
+ github = "aristidb";
+ name = "Aristid Breitkreuz";
+ };
+ arobyn = {
+ email = "shados@shados.net";
+ github = "shados";
+ name = "Alexei Robyn";
+ };
+ artuuge = {
+ email = "artuuge@gmail.com";
+ github = "artuuge";
+ name = "Artur E. Ruuge";
+ };
+ ashalkhakov = {
+ email = "artyom.shalkhakov@gmail.com";
+ github = "ashalkhakov";
+ name = "Artyom Shalkhakov";
+ };
+ ashgillman = {
+ email = "gillmanash@gmail.com";
+ github = "ashgillman";
+ name = "Ashley Gillman";
+ };
+ aske = {
+ email = "aske@fmap.me";
+ github = "aske";
+ name = "Kirill Boltaev";
+ };
+ asppsa = {
+ email = "asppsa@gmail.com";
+ github = "asppsa";
+ name = "Alastair Pharo";
+ };
+ astsmtl = {
+ email = "astsmtl@yandex.ru";
+ github = "astsmtl";
+ name = "Alexander Tsamutali";
+ };
+ asymmetric = {
+ email = "lorenzo@mailbox.org";
+ github = "asymmetric";
+ name = "Lorenzo Manacorda";
+ };
+ aszlig = {
+ email = "aszlig@nix.build";
+ github = "aszlig";
+ name = "aszlig";
+ };
+ auntie = {
+ email = "auntieNeo@gmail.com";
+ github = "auntie";
+ name = "Jonathan Glines";
+ };
+ avnik = {
+ email = "avn@avnik.info";
+ github = "avnik";
+ name = "Alexander V. Nikolaev";
+ };
+ aycanirican = {
+ email = "iricanaycan@gmail.com";
+ github = "aycanirican";
+ name = "Aycan iRiCAN";
+ };
+ babariviere = {
+ email = "babariviere@protonmail.com";
+ github = "babariviere";
+ name = "babariviere";
+ };
+ bachp = {
+ email = "pascal.bach@nextrem.ch";
+ github = "bachp";
+ name = "Pascal Bach";
+ };
+ backuitist = {
+ email = "biethb@gmail.com";
+ github = "backuitist";
+ name = "Bruno Bieth";
+ };
+ badi = {
+ email = "abdulwahidc@gmail.com";
+ github = "badi";
+ name = "Badi' Abdul-Wahid";
+ };
+ balajisivaraman = {
+ email = "sivaraman.balaji@gmail.com";
+ name = "Balaji Sivaraman";
+ };
+ barrucadu = {
+ email = "mike@barrucadu.co.uk";
+ github = "barrucadu";
+ name = "Michael Walker";
+ };
+ basvandijk = {
+ email = "v.dijk.bas@gmail.com";
+ github = "basvandijk";
+ name = "Bas van Dijk";
+ };
+ bcarrell = {
+ email = "brandoncarrell@gmail.com";
+ github = "bcarrell";
+ name = "Brandon Carrell";
+ };
+ bcdarwin = {
+ email = "bcdarwin@gmail.com";
+ github = "bcdarwin";
+ name = "Ben Darwin";
+ };
+ bdimcheff = {
+ email = "brandon@dimcheff.com";
+ github = "bdimcheff";
+ name = "Brandon Dimcheff";
+ };
+ bendlas = {
+ email = "herwig@bendlas.net";
+ github = "bendlas";
+ name = "Herwig Hochleitner";
+ };
+ benley = {
+ email = "benley@gmail.com";
+ github = "benley";
+ name = "Benjamin Staffin";
+ };
+ bennofs = {
+ email = "benno.fuenfstueck@gmail.com";
+ github = "bennofs";
+ name = "Benno Fünfstück";
+ };
+ benwbooth = {
+ email = "benwbooth@gmail.com";
+ github = "benwbooth";
+ name = "Ben Booth";
+ };
+ berce = {
+ email = "bert.moens@gmail.com";
+ github = "berce";
+ name = "Bert Moens";
+ };
+ berdario = {
+ email = "berdario@gmail.com";
+ github = "berdario";
+ name = "Dario Bertini";
+ };
+ bergey = {
+ email = "bergey@teallabs.org";
+ github = "bergey";
+ name = "Daniel Bergey";
+ };
+ bhipple = {
+ email = "bhipple@protonmail.com";
+ github = "bhipple";
+ name = "Benjamin Hipple";
+ };
+ binarin = {
+ email = "binarin@binarin.ru";
+ github = "binarin";
+ name = "Alexey Lebedeff";
+ };
+ bjg = {
+ email = "bjg@gnu.org";
+ name = "Brian Gough";
+ };
+ bjornfor = {
+ email = "bjorn.forsman@gmail.com";
+ github = "bjornfor";
+ name = "Bjørn Forsman";
+ };
+ bluescreen303 = {
+ email = "mathijs@bluescreen303.nl";
+ github = "bluescreen303";
+ name = "Mathijs Kwik";
+ };
+ bobakker = {
+ email = "bobakk3r@gmail.com";
+ github = "bobakker";
+ name = "Bo Bakker";
+ };
+ bobvanderlinden = {
+ email = "bobvanderlinden@gmail.com";
+ github = "bobvanderlinden";
+ name = "Bob van der Linden";
+ };
+ bodil = {
+ email = "nix@bodil.org";
+ github = "bodil";
+ name = "Bodil Stokke";
+ };
+ boothead = {
+ email = "ben@perurbis.com";
+ github = "boothead";
+ name = "Ben Ford";
+ };
+ bosu = {
+ email = "boriss@gmail.com";
+ github = "bosu";
+ name = "Boris Sukholitko";
+ };
+ bradediger = {
+ email = "brad@bradediger.com";
+ github = "bradediger";
+ name = "Brad Ediger";
+ };
+ brainrape = {
+ email = "martonboros@gmail.com";
+ github = "brainrape";
+ name = "Marton Boros";
+ };
+ bramd = {
+ email = "bram@bramd.nl";
+ github = "bramd";
+ name = "Bram Duvigneau";
+ };
+ bstrik = {
+ email = "dutchman55@gmx.com";
+ github = "bstrik";
+ name = "Berno Strik";
+ };
+ bugworm = {
+ email = "bugworm@zoho.com";
+ github = "bugworm";
+ name = "Roman Gerasimenko";
+ };
+ bzizou = {
+ email = "Bruno@bzizou.net";
+ github = "bzizou";
+ name = "Bruno Bzeznik";
+ };
+ c0bw3b = {
+ email = "c0bw3b@gmail.com";
+ github = "c0bw3b";
+ name = "Renaud";
+ };
+ c0dehero = {
+ email = "codehero@nerdpol.ch";
+ name = "CodeHero";
+ };
+ calbrecht = {
+ email = "christian.albrecht@mayflower.de";
+ github = "calbrecht";
+ name = "Christian Albrecht";
+ };
+ calvertvl = {
+ email = "calvertvl@gmail.com";
+ github = "calvertvl";
+ name = "Victor Calvert";
+ };
+ campadrenalin = {
+ email = "campadrenalin@gmail.com";
+ github = "campadrenalin";
+ name = "Philip Horger";
+ };
+ canndrew = {
+ email = "shum@canndrew.org";
+ github = "canndrew";
+ name = "Andrew Cann";
+ };
+ carlsverre = {
+ email = "accounts@carlsverre.com";
+ github = "carlsverre";
+ name = "Carl Sverre";
+ };
+ casey = {
+ email = "casey@rodarmor.net";
+ github = "casey";
+ name = "Casey Rodarmor";
+ };
+ catern = {
+ email = "sbaugh@catern.com";
+ github = "catern";
+ name = "Spencer Baugh";
+ };
+ caugner = {
+ email = "nixos@caugner.de";
+ github = "caugner";
+ name = "Claas Augner";
+ };
+ cdepillabout = {
+ email = "cdep.illabout@gmail.com";
+ github = "cdepillabout";
+ name = "Dennis Gosnell";
+ };
+ cfouche = {
+ email = "chaddai.fouche@gmail.com";
+ github = "Chaddai";
+ name = "Chaddaï Fouché";
+ };
+ changlinli = {
+ email = "mail@changlinli.com";
+ github = "changlinli";
+ name = "Changlin Li";
+ };
+ chaoflow = {
+ email = "flo@chaoflow.net";
+ github = "chaoflow";
+ name = "Florian Friesdorf";
+ };
+ chattered = {
+ email = "me@philscotted.com";
+ name = "Phil Scott";
+ };
+ chiiruno = {
+ email = "okinan@protonmail.com";
+ github = "chiiruno";
+ name = "Okina Matara";
+ };
+ choochootrain = {
+ email = "hurshal@imap.cc";
+ github = "choochootrain";
+ name = "Hurshal Patel";
+ };
+ chpatrick = {
+ email = "chpatrick@gmail.com";
+ github = "chpatrick";
+ name = "Patrick Chilton";
+ };
+ chreekat = {
+ email = "b@chreekat.net";
+ github = "chreekat";
+ name = "Bryan Richter";
+ };
+ chris-martin = {
+ email = "ch.martin@gmail.com";
+ github = "chris-martin";
+ name = "Chris Martin";
+ };
+ chrisjefferson = {
+ email = "chris@bubblescope.net";
+ github = "chrisjefferson";
+ name = "Christopher Jefferson";
+ };
+ chrisrosset = {
+ email = "chris@rosset.org.uk";
+ github = "chrisrosset";
+ name = "Christopher Rosset";
+ };
+ christopherpoole = {
+ email = "mail@christopherpoole.net";
+ github = "christopherpoole";
+ name = "Christopher Mark Poole";
+ };
+ ciil = {
+ email = "simon@lackerbauer.com";
+ github = "ciil";
+ name = "Simon Lackerbauer";
+ };
+ ck3d = {
+ email = "ck3d@gmx.de";
+ github = "ck3d";
+ name = "Christian Kögler";
+ };
+ ckampka = {
+ email = "christian@kampka.net";
+ github = "kampka";
+ name = "Christian Kampka";
+ };
+ ckauhaus = {
+ email = "kc@flyingcircus.io";
+ github = "ckauhaus";
+ name = "Christian Kauhaus";
+ };
+ cko = {
+ email = "christine.koppelt@gmail.com";
+ github = "cko";
+ name = "Christine Koppelt";
+ };
+ cleverca22 = {
+ email = "cleverca22@gmail.com";
+ github = "cleverca22";
+ name = "Michael Bishop";
+ };
+ cmcdragonkai = {
+ email = "roger.qiu@matrix.ai";
+ github = "cmcdragonkai";
+ name = "Roger Qiu";
+ };
+ cmfwyp = {
+ email = "cmfwyp@riseup.net";
+ github = "cmfwyp";
+ name = "cmfwyp";
+ };
+ cobbal = {
+ email = "andrew.cobb@gmail.com";
+ github = "cobbal";
+ name = "Andrew Cobb";
+ };
+ coconnor = {
+ email = "coreyoconnor@gmail.com";
+ github = "coreyoconnor";
+ name = "Corey O'Connor";
+ };
+ codsl = {
+ email = "codsl@riseup.net";
+ github = "codsl";
+ name = "codsl";
+ };
+ codyopel = {
+ email = "codyopel@gmail.com";
+ github = "codyopel";
+ name = "Cody Opel";
+ };
+ colemickens = {
+ email = "cole.mickens@gmail.com";
+ github = "colemickens";
+ name = "Cole Mickens";
+ };
+ colescott = {
+ email = "colescottsf@gmail.com";
+ github = "colescott";
+ name = "Cole Scott";
+ };
+ copumpkin = {
+ email = "pumpkingod@gmail.com";
+ github = "copumpkin";
+ name = "Dan Peebles";
+ };
+ corngood = {
+ email = "corngood@gmail.com";
+ github = "corngood";
+ name = "David McFarland";
+ };
+ coroa = {
+ email = "jonas@chaoflow.net";
+ github = "coroa";
+ name = "Jonas Hörsch";
+ };
+ couchemar = {
+ email = "couchemar@yandex.ru";
+ github = "couchemar";
+ name = "Andrey Pavlov";
+ };
+ cpages = {
+ email = "page@ruiec.cat";
+ github = "cpages";
+ name = "Carles Pagès";
+ };
+ cransom = {
+ email = "cransom@hubns.net";
+ github = "cransom";
+ name = "Casey Ransom";
+ };
+ cryptix = {
+ email = "cryptix@riseup.net";
+ github = "cryptix";
+ name = "Henry Bubert";
+ };
+ csingley = {
+ email = "csingley@gmail.com";
+ github = "csingley";
+ name = "Christopher Singley";
+ };
+ cstrahan = {
+ email = "charles@cstrahan.com";
+ github = "cstrahan";
+ name = "Charles Strahan";
+ };
+ cwoac = {
+ email = "oliver@codersoffortune.net";
+ github = "cwoac";
+ name = "Oliver Matthews";
+ };
+ danbst = {
+ email = "abcz2.uprola@gmail.com";
+ github = "danbst";
+ name = "Danylo Hlynskyi";
+ };
+ dancek = {
+ email = "hannu.hartikainen@gmail.com";
+ github = "dancek";
+ name = "Hannu Hartikainen";
+ };
+ danharaj = {
+ email = "dan@obsidian.systems";
+ github = "danharaj";
+ name = "Dan Haraj";
+ };
+ danielfullmer = {
+ email = "danielrf12@gmail.com";
+ github = "danielfullmer";
+ name = "Daniel Fullmer";
+ };
+ dasuxullebt = {
+ email = "christoph.senjak@googlemail.com";
+ name = "Christoph-Simon Senjak";
+ };
+ david50407 = {
+ email = "me@davy.tw";
+ github = "david50407";
+ name = "David Kuo";
+ };
+ davidak = {
+ email = "post@davidak.de";
+ github = "davidak";
+ name = "David Kleuker";
+ };
+ davidrusu = {
+ email = "davidrusu.me@gmail.com";
+ github = "davidrusu";
+ name = "David Rusu";
+ };
+ davorb = {
+ email = "davor@davor.se";
+ github = "davorb";
+ name = "Davor Babic";
+ };
+ dbohdan = {
+ email = "danyil.bohdan@gmail.com";
+ github = "dbohdan";
+ name = "Danyil Bohdan";
+ };
+ dbrock = {
+ email = "daniel@brockman.se";
+ github = "dbrock";
+ name = "Daniel Brockman";
+ };
+ deepfire = {
+ email = "_deepfire@feelingofgreen.ru";
+ github = "deepfire";
+ name = "Kosyrev Serge";
+ };
+ demin-dmitriy = {
+ email = "demindf@gmail.com";
+ github = "demin-dmitriy";
+ name = "Dmitriy Demin";
+ };
+ derchris = {
+ email = "derchris@me.com";
+ github = "derchrisuk";
+ name = "Christian Gerbrandt";
+ };
+ dermetfan = {
+ email = "serverkorken@gmail.com";
+ github = "dermetfan";
+ name = "Robin Stumm";
+ };
+ desiderius = {
+ email = "didier@devroye.name";
+ github = "desiderius";
+ name = "Didier J. Devroye";
+ };
+ devhell = {
+ email = "\"^\"@regexmail.net";
+ github = "devhell";
+ name = "devhell";
+ };
+ dezgeg = {
+ email = "tuomas.tynkkynen@iki.fi";
+ github = "dezgeg";
+ name = "Tuomas Tynkkynen";
+ };
+ dfordivam = {
+ email = "dfordivam+nixpkgs@gmail.com";
+ github = "dfordivam";
+ name = "Divam";
+ };
+ dfoxfranke = {
+ email = "dfoxfranke@gmail.com";
+ github = "dfoxfranke";
+ name = "Daniel Fox Franke";
+ };
+ dgonyeo = {
+ email = "derek@gonyeo.com";
+ github = "dgonyeo";
+ name = "Derek Gonyeo";
+ };
+ dipinhora = {
+ email = "dipinhora+github@gmail.com";
+ github = "dipinhora";
+ name = "Dipin Hora";
+ };
+ disassembler = {
+ email = "disasm@gmail.com";
+ github = "disassembler";
+ name = "Samuel Leathers";
+ };
+ dizfer = {
+ email = "david@izquierdofernandez.com";
+ github = "dizfer";
+ name = "David Izquierdo";
+ };
+ dmalikov = {
+ email = "malikov.d.y@gmail.com";
+ github = "dmalikov";
+ name = "Dmitry Malikov";
+ };
+ dmjio = {
+ email = "djohnson.m@gmail.com";
+ github = "dmjio";
+ name = "David Johnson";
+ };
+ dochang = {
+ email = "dochang@gmail.com";
+ github = "dochang";
+ name = "Desmond O. Chang";
+ };
+ domenkozar = {
+ email = "domen@dev.si";
+ github = "domenkozar";
+ name = "Domen Kozar";
+ };
+ dotlambda = {
+ email = "rschuetz17@gmail.com";
+ github = "dotlambda";
+ name = "Robert Schütz";
+ };
+ doublec = {
+ email = "chris.double@double.co.nz";
+ github = "doublec";
+ name = "Chris Double";
+ };
+ dpaetzel = {
+ email = "david.a.paetzel@gmail.com";
+ github = "dpaetzel";
+ name = "David Pätzel";
+ };
+ dpflug = {
+ email = "david@pflug.email";
+ github = "dpflug";
+ name = "David Pflug";
+ };
+ drets = {
+ email = "dmitryrets@gmail.com";
+ github = "drets";
+ name = "Dmytro Rets";
+ };
+ drewkett = {
+ email = "burkett.andrew@gmail.com";
+ name = "Andrew Burkett";
+ };
+ dsferruzza = {
+ email = "david.sferruzza@gmail.com";
+ github = "dsferruzza";
+ name = "David Sferruzza";
+ };
+ dtzWill = {
+ email = "nix@wdtz.org";
+ github = "dtzWill";
+ name = "Will Dietz";
+ };
+ dywedir = {
+ email = "dywedir@protonmail.ch";
+ github = "dywedir";
+ name = "Vladyslav M.";
+ };
+ dzabraev = {
+ email = "dzabraew@gmail.com";
+ github = "dzabraev";
+ name = "Maksim Dzabraev";
+ };
+ e-user = {
+ email = "nixos@sodosopa.io";
+ github = "e-user";
+ name = "Alexander Kahl";
+ };
+ earldouglas = {
+ email = "james@earldouglas.com";
+ github = "earldouglas";
+ name = "James Earl Douglas";
+ };
+ earvstedt = {
+ email = "erik.arvstedt@gmail.com";
+ github = "erikarvstedt";
+ name = "Erik Arvstedt";
+ };
+ ebzzry = {
+ email = "ebzzry@ebzzry.io";
+ github = "ebzzry";
+ name = "Rommel Martinez";
+ };
+ edanaher = {
+ email = "nixos@edanaher.net";
+ github = "edanaher";
+ name = "Evan Danaher";
+ };
+ edef = {
+ email = "edef@edef.eu";
+ github = "edef1c";
+ name = "edef";
+ };
+ ederoyd46 = {
+ email = "matt@ederoyd.co.uk";
+ github = "ederoyd46";
+ name = "Matthew Brown";
+ };
+ eduarrrd = {
+ email = "e.bachmakov@gmail.com";
+ github = "eduarrrd";
+ name = "Eduard Bachmakov";
+ };
+ edwtjo = {
+ email = "ed@cflags.cc";
+ github = "edwtjo";
+ name = "Edward Tjörnhammar";
+ };
+ eelco = {
+ email = "eelco.dolstra@logicblox.com";
+ github = "edolstra";
+ name = "Eelco Dolstra";
+ };
+ ehegnes = {
+ email = "eric.hegnes@gmail.com";
+ github = "ehegnes";
+ name = "Eric Hegnes";
+ };
+ ehmry = {
+ email = "emery@vfemail.net";
+ name = "Emery Hemingway";
+ };
+ eikek = {
+ email = "eike.kettner@posteo.de";
+ github = "eikek";
+ name = "Eike Kettner";
+ };
+ ekleog = {
+ email = "leo@gaspard.io";
+ github = "ekleog";
+ name = "Leo Gaspard";
+ };
+ elasticdog = {
+ email = "aaron@elasticdog.com";
+ github = "elasticdog";
+ name = "Aaron Bull Schaefer";
+ };
+ eleanor = {
+ email = "dejan@proteansec.com";
+ github = "proteansec";
+ name = "Dejan Lukan";
+ };
+ elijahcaine = {
+ email = "elijahcainemv@gmail.com";
+ github = "pop";
+ name = "Elijah Caine";
+ };
+ elitak = {
+ email = "elitak@gmail.com";
+ github = "elitak";
+ name = "Eric Litak";
+ };
+ ellis = {
+ email = "nixos@ellisw.net";
+ github = "ellis";
+ name = "Ellis Whitehead";
+ };
+ enzime = {
+ email = "enzime@users.noreply.github.com";
+ github = "enzime";
+ name = "Michael Hoang";
+ };
+ eperuffo = {
+ email = "info@emanueleperuffo.com";
+ github = "emanueleperuffo";
+ name = "Emanuele Peruffo";
+ };
+ epitrochoid = {
+ email = "mpcervin@uncg.edu";
+ name = "Mabry Cervin";
+ };
+ eqyiel = {
+ email = "r@rkm.id.au";
+ github = "eqyiel";
+ name = "Ruben Maher";
+ };
+ ericbmerritt = {
+ email = "eric@afiniate.com";
+ github = "ericbmerritt";
+ name = "Eric Merritt";
+ };
+ erosennin = {
+ email = "ag@sologoc.com";
+ github = "erosennin";
+ name = "Andrey Golovizin";
+ };
+ ericsagnes = {
+ email = "eric.sagnes@gmail.com";
+ github = "ericsagnes";
+ name = "Eric Sagnes";
+ };
+ ericson2314 = {
+ email = "John.Ericson@Obsidian.Systems";
+ github = "ericson2314";
+ name = "John Ericson";
+ };
+ erictapen = {
+ email = "justin.humm@posteo.de";
+ github = "erictapen";
+ name = "Justin Humm";
+ };
+ erikryb = {
+ email = "erik.rybakken@math.ntnu.no";
+ github = "erikryb";
+ name = "Erik Rybakken";
+ };
+ ertes = {
+ email = "esz@posteo.de";
+ github = "ertes";
+ name = "Ertugrul Söylemez";
+ };
+ ethercrow = {
+ email = "ethercrow@gmail.com";
+ github = "ethercrow";
+ name = "Dmitry Ivanov";
+ };
+ etu = {
+ email = "elis@hirwing.se";
+ github = "etu";
+ name = "Elis Hirwing";
+ };
+ exfalso = {
+ email = "0slemi0@gmail.com";
+ github = "exfalso";
+ name = "Andras Slemmer";
+ };
+ exi = {
+ email = "nixos@reckling.org";
+ github = "exi";
+ name = "Reno Reckling";
+ };
+ exlevan = {
+ email = "exlevan@gmail.com";
+ github = "exlevan";
+ name = "Alexey Levan";
+ };
+ expipiplus1 = {
+ email = "nix@monoid.al";
+ github = "expipiplus1";
+ name = "Joe Hermaszewski";
+ };
+ f-breidenstein = {
+ email = "mail@felixbreidenstein.de";
+ github = "f-breidenstein";
+ name = "Felix Breidenstein";
+ };
+ fadenb = {
+ email = "tristan.helmich+nixos@gmail.com";
+ github = "fadenb";
+ name = "Tristan Helmich";
+ };
+ falsifian = {
+ email = "james.cook@utoronto.ca";
+ github = "falsifian";
+ name = "James Cook";
+ };
+ fare = {
+ email = "fahree@gmail.com";
+ github = "fare";
+ name = "Francois-Rene Rideau";
+ };
+ fdns = {
+ email = "fdns02@gmail.com";
+ github = "fdns";
+ name = "Felipe Espinoza";
+ };
+ fgaz = {
+ email = "francygazz@gmail.com";
+ github = "fgaz";
+ name = "Francesco Gazzetta";
+ };
+ flokli = {
+ email = "flokli@flokli.de";
+ github = "flokli";
+ name = "Florian Klink";
+ };
+ florianjacob = {
+ email = "projects+nixos@florianjacob.de";
+ github = "florianjacob";
+ name = "Florian Jacob";
+ };
+ flosse = {
+ email = "mail@markus-kohlhase.de";
+ github = "flosse";
+ name = "Markus Kohlhase";
+ };
+ fluffynukeit = {
+ email = "dan@fluffynukeit.com";
+ github = "fluffynukeit";
+ name = "Daniel Austin";
+ };
+ fmthoma = {
+ email = "f.m.thoma@googlemail.com";
+ github = "fmthoma";
+ name = "Franz Thoma";
+ };
+ forkk = {
+ email = "forkk@forkk.net";
+ github = "forkk";
+ name = "Andrew Okin";
+ };
+ fornever = {
+ email = "friedrich@fornever.me";
+ github = "fornever";
+ name = "Friedrich von Never";
+ };
+ fpletz = {
+ email = "fpletz@fnordicwalking.de";
+ github = "fpletz";
+ name = "Franz Pletz";
+ };
+ fps = {
+ email = "mista.tapas@gmx.net";
+ github = "fps";
+ name = "Florian Paul Schmidt";
+ };
+ fridh = {
+ email = "fridh@fridh.nl";
+ github = "fridh";
+ name = "Frederik Rietdijk";
+ };
+ frlan = {
+ email = "frank@frank.uvena.de";
+ github = "frlan";
+ name = "Frank Lanitz";
+ };
+ fro_ozen = {
+ email = "fro_ozen@gmx.de";
+ github = "froozen";
+ name = "fro_ozen";
+ };
+ ftrvxmtrx = {
+ email = "ftrvxmtrx@gmail.com";
+ github = "ftrvxmtrx";
+ name = "Siarhei Zirukin";
+ };
+ funfunctor = {
+ email = "eocallaghan@alterapraxis.com";
+ name = "Edward O'Callaghan";
+ };
+ fuuzetsu = {
+ email = "fuuzetsu@fuuzetsu.co.uk";
+ github = "fuuzetsu";
+ name = "Mateusz Kowalczyk";
+ };
+ fuzzy-id = {
+ email = "hacking+nixos@babibo.de";
+ name = "Thomas Bach";
+ };
+ fxfactorial = {
+ email = "edgar.factorial@gmail.com";
+ github = "fxfactorial";
+ name = "Edgar Aroutiounian";
+ };
+ gabesoft = {
+ email = "gabesoft@gmail.com";
+ github = "gabesoft";
+ name = "Gabriel Adomnicai";
+ };
+ gal_bolle = {
+ email = "florent.becker@ens-lyon.org";
+ github = "FlorentBecker";
+ name = "Florent Becker";
+ };
+ garbas = {
+ email = "rok@garbas.si";
+ github = "garbas";
+ name = "Rok Garbas";
+ };
+ garrison = {
+ email = "jim@garrison.cc";
+ github = "garrison";
+ name = "Jim Garrison";
+ };
+ gavin = {
+ email = "gavin@praxeology.co.uk";
+ github = "gavinrogers";
+ name = "Gavin Rogers";
+ };
+ gebner = {
+ email = "gebner@gebner.org";
+ github = "gebner";
+ name = "Gabriel Ebner";
+ };
+ geistesk = {
+ email = "post@0x21.biz";
+ github = "geistesk";
+ name = "Alvar Penning";
+ };
+ genesis = {
+ email = "ronan@aimao.org";
+ github = "bignaux";
+ name = "Ronan Bignaux";
+ };
+ georgewhewell = {
+ email = "georgerw@gmail.com";
+ github = "georgewhewell";
+ name = "George Whewell";
+ };
+ gilligan = {
+ email = "tobias.pflug@gmail.com";
+ github = "gilligan";
+ name = "Tobias Pflug";
+ };
+ giogadi = {
+ email = "lgtorres42@gmail.com";
+ github = "giogadi";
+ name = "Luis G. Torres";
+ };
+ gleber = {
+ email = "gleber.p@gmail.com";
+ github = "gleber";
+ name = "Gleb Peregud";
+ };
+ glenns = {
+ email = "glenn.searby@gmail.com";
+ github = "glenns";
+ name = "Glenn Searby";
+ };
+ globin = {
+ email = "mail@glob.in";
+ github = "globin";
+ name = "Robin Gloster";
+ };
+ gnidorah = {
+ email = "yourbestfriend@opmbx.org";
+ github = "gnidorah";
+ name = "Alex Ivanov";
+ };
+ goibhniu = {
+ email = "cillian.deroiste@gmail.com";
+ github = "cillianderoiste";
+ name = "Cillian de Róiste";
+ };
+ goodrone = {
+ email = "goodrone@gmail.com";
+ github = "goodrone";
+ name = "Andrew Trachenko";
+ };
+ gpyh = {
+ email = "yacine.hmito@gmail.com";
+ github = "yacinehmito";
+ name = "Yacine Hmito";
+ };
+ grahamc = {
+ email = "graham@grahamc.com";
+ github = "grahamc";
+ name = "Graham Christensen";
+ };
+ grburst = {
+ email = "grburst@openmailbox.org";
+ github = "grburst";
+ name = "Julius Elias";
+ };
+ gridaphobe = {
+ email = "eric@seidel.io";
+ github = "gridaphobe";
+ name = "Eric Seidel";
+ };
+ guibert = {
+ email = "david.guibert@gmail.com";
+ github = "dguibert";
+ name = "David Guibert";
+ };
+ guibou = {
+ email = "guillaum.bouchard@gmail.com";
+ github = "guibou";
+ name = "Guillaume Bouchard";
+ };
+ guillaumekoenig = {
+ email = "guillaume.edward.koenig@gmail.com";
+ github = "guillaumekoenig";
+ name = "Guillaume Koenig";
+ };
+ guyonvarch = {
+ email = "joris@guyonvarch.me";
+ github = "guyonvarch";
+ name = "Joris Guyonvarch";
+ };
+ hakuch = {
+ email = "hakuch@gmail.com";
+ github = "hakuch";
+ name = "Jesse Haber-Kucharsky";
+ };
+ hamhut1066 = {
+ email = "github@hamhut1066.com";
+ github = "hamhut1066";
+ name = "Hamish Hutchings";
+ };
+ havvy = {
+ email = "ryan.havvy@gmail.com";
+ github = "havvy";
+ name = "Ryan Scheel";
+ };
+ hbunke = {
+ email = "bunke.hendrik@gmail.com";
+ github = "hbunke";
+ name = "Hendrik Bunke";
+ };
+ hce = {
+ email = "hc@hcesperer.org";
+ github = "hce";
+ name = "Hans-Christian Esperer";
+ };
+ hectorj = {
+ email = "hector.jusforgues+nixos@gmail.com";
+ github = "hectorj";
+ name = "Hector Jusforgues";
+ };
+ hedning = {
+ email = "torhedinbronner@gmail.com";
+ github = "hedning";
+ name = "Tor Hedin Brønner";
+ };
+ heel = {
+ email = "parizhskiy@gmail.com";
+ github = "heel";
+ name = "Sergii Paryzhskyi";
+ };
+ henrytill = {
+ email = "henrytill@gmail.com";
+ github = "henrytill";
+ name = "Henry Till";
+ };
+ hhm = {
+ email = "heehooman+nixpkgs@gmail.com";
+ github = "hhm0";
+ name = "hhm";
+ };
+ hinton = {
+ email = "t@larkery.com";
+ name = "Tom Hinton";
+ };
+ hodapp = {
+ email = "hodapp87@gmail.com";
+ github = "Hodapp87";
+ name = "Chris Hodapp";
+ };
+ hrdinka = {
+ email = "c.nix@hrdinka.at";
+ github = "hrdinka";
+ name = "Christoph Hrdinka";
+ };
+ hschaeidt = {
+ email = "he.schaeidt@gmail.com";
+ github = "hschaeidt";
+ name = "Hendrik Schaeidt";
+ };
+ htr = {
+ email = "hugo@linux.com";
+ github = "htr";
+ name = "Hugo Tavares Reis";
+ };
+ hyphon81 = {
+ email = "zero812n@gmail.com";
+ github = "hyphon81";
+ name = "Masato Yonekawa";
+ };
+ iand675 = {
+ email = "ian@iankduncan.com";
+ github = "iand675";
+ name = "Ian Duncan";
+ };
+ ianwookim = {
+ email = "ianwookim@gmail.com";
+ github = "wavewave";
+ name = "Ian-Woo Kim";
+ };
+ iblech = {
+ email = "iblech@speicherleck.de";
+ github = "iblech";
+ name = "Ingo Blechschmidt";
+ };
+ idontgetoutmuch = {
+ email = "dominic@steinitz.org";
+ github = "idontgetoutmuch";
+ name = "Dominic Steinitz";
+ };
+ igsha = {
+ email = "igor.sharonov@gmail.com";
+ github = "igsha";
+ name = "Igor Sharonov";
+ };
+ ikervagyok = {
+ email = "ikervagyok@gmail.com";
+ github = "ikervagyok";
+ name = "Balázs Lengyel";
+ };
+ ilya-kolpakov = {
+ email = "ilya.kolpakov@gmail.com";
+ github = "ilya-kolpakov";
+ name = "Ilya Kolpakov";
+ };
+ infinisil = {
+ email = "infinisil@icloud.com";
+ github = "infinisil";
+ name = "Silvan Mosberger";
+ };
+ ironpinguin = {
+ email = "michele@catalano.de";
+ github = "ironpinguin";
+ name = "Michele Catalano";
+ };
+ ivan-tkatchev = {
+ email = "tkatchev@gmail.com";
+ name = "Ivan Tkatchev";
+ };
+ ixmatus = {
+ email = "parnell@digitalmentat.com";
+ github = "ixmatus";
+ name = "Parnell Springmeyer";
+ };
+ ixxie = {
+ email = "matan@fluxcraft.net";
+ github = "ixxie";
+ name = "Matan Bendix Shenhav";
+ };
+ izorkin = {
+ email = "Izorkin@gmail.com";
+ github = "izorkin";
+ name = "Yurii Izorkin";
+ };
+ j-keck = {
+ email = "jhyphenkeck@gmail.com";
+ github = "j-keck";
+ name = "Jürgen Keck";
+ };
+ jagajaga = {
+ email = "ars.seroka@gmail.com";
+ github = "jagajaga";
+ name = "Arseniy Seroka";
+ };
+ jammerful = {
+ email = "jammerful@gmail.com";
+ github = "jammerful";
+ name = "jammerful";
+ };
+ jansol = {
+ email = "jan.solanti@paivola.fi";
+ github = "jansol";
+ name = "Jan Solanti";
+ };
+ javaguirre = {
+ email = "contacto@javaguirre.net";
+ github = "javaguirre";
+ name = "Javier Aguirre";
+ };
+ jb55 = {
+ email = "jb55@jb55.com";
+ github = "jb55";
+ name = "William Casarin";
+ };
+ jbedo = {
+ email = "cu@cua0.org";
+ github = "jbedo";
+ name = "Justin Bedő";
+ };
+ jcumming = {
+ email = "jack@mudshark.org";
+ name = "Jack Cummings";
+ };
+ jdagilliland = {
+ email = "jdagilliland@gmail.com";
+ github = "jdagilliland";
+ name = "Jason Gilliland";
+ };
+ jefdaj = {
+ email = "jefdaj@gmail.com";
+ github = "jefdaj";
+ name = "Jeffrey David Johnson";
+ };
+ jensbin = {
+ email = "jensbin@protonmail.com";
+ github = "jensbin";
+ name = "Jens Binkert";
+ };
+ jerith666 = {
+ email = "github@matt.mchenryfamily.org";
+ github = "jerith666";
+ name = "Matt McHenry";
+ };
+ jfb = {
+ email = "james@yamtime.com";
+ github = "tftio";
+ name = "James Felix Black";
+ };
+ jfrankenau = {
+ email = "johannes@frankenau.net";
+ github = "jfrankenau";
+ name = "Johannes Frankenau";
+ };
+ jgeerds = {
+ email = "jascha@geerds.org";
+ github = "jgeerds";
+ name = "Jascha Geerds";
+ };
+ jgertm = {
+ email = "jger.tm@gmail.com";
+ github = "jgertm";
+ name = "Tim Jaeger";
+ };
+ jgillich = {
+ email = "jakob@gillich.me";
+ github = "jgillich";
+ name = "Jakob Gillich";
+ };
+ jhhuh = {
+ email = "jhhuh.note@gmail.com";
+ github = "jhhuh";
+ name = "Ji-Haeng Huh";
+ };
+ jirkamarsik = {
+ email = "jiri.marsik89@gmail.com";
+ github = "jirkamarsik";
+ name = "Jirka Marsik";
+ };
+ jlesquembre = {
+ email = "jl@lafuente.me";
+ github = "jlesquembre";
+ name = "José Luis Lafuente";
+ };
+ jluttine = {
+ email = "jaakko.luttinen@iki.fi";
+ github = "jluttine";
+ name = "Jaakko Luttinen";
+ };
+ joachifm = {
+ email = "joachifm@fastmail.fm";
+ github = "joachifm";
+ name = "Joachim Fasting";
+ };
+ joamaki = {
+ email = "joamaki@gmail.com";
+ github = "joamaki";
+ name = "Jussi Maki";
+ };
+ joelmo = {
+ email = "joel.moberg@gmail.com";
+ github = "joelmo";
+ name = "Joel Moberg";
+ };
+ joelteon = {
+ email = "me@joelt.io";
+ name = "Joel Taylor";
+ };
+ johbo = {
+ email = "johannes@bornhold.name";
+ github = "johbo";
+ name = "Johannes Bornhold";
+ };
+ johnazoidberg = {
+ email = "git@danielschaefer.me";
+ github = "johnazoidberg";
+ name = "Daniel Schäfer";
+ };
+ johnchildren = {
+ email = "john.a.children@gmail.com";
+ github = "johnchildren";
+ name = "John Children";
+ };
+ johnmh = {
+ email = "johnmh@openblox.org";
+ github = "johnmh";
+ name = "John M. Harris, Jr.";
+ };
+ johnramsden = {
+ email = "johnramsden@riseup.net";
+ github = "johnramsden";
+ name = "John Ramsden";
+ };
+ joko = {
+ email = "ioannis.koutras@gmail.com";
+ github = "jokogr";
+ name = "Ioannis Koutras";
+ };
+ jonafato = {
+ email = "jon@jonafato.com";
+ github = "jonafato";
+ name = "Jon Banafato";
+ };
+ joncojonathan = {
+ email = "joncojonathan@gmail.com";
+ github = "joncojonathan";
+ name = "Jonathan Haddock";
+ };
+ jpdoyle = {
+ email = "joethedoyle@gmail.com";
+ github = "jpdoyle";
+ name = "Joe Doyle";
+ };
+ jpierre03 = {
+ email = "nix@prunetwork.fr";
+ github = "jpierre03";
+ name = "Jean-Pierre PRUNARET";
+ };
+ jpotier = {
+ email = "jpo.contributes.to.nixos@marvid.fr";
+ github = "jpotier";
+ name = "Martin Potier";
+ };
+ jraygauthier = {
+ email = "jraygauthier@gmail.com";
+ github = "jraygauthier";
+ name = "Raymond Gauthier";
+ };
+ jtojnar = {
+ email = "jtojnar@gmail.com";
+ github = "jtojnar";
+ name = "Jan Tojnar";
+ };
+ juliendehos = {
+ email = "dehos@lisic.univ-littoral.fr";
+ github = "juliendehos";
+ name = "Julien Dehos";
+ };
+ jwiegley = {
+ email = "johnw@newartisans.com";
+ github = "jwiegley";
+ name = "John Wiegley";
+ };
+ jwilberding = {
+ email = "jwilberding@afiniate.com";
+ name = "Jordan Wilberding";
+ };
+ jyp = {
+ email = "jeanphilippe.bernardy@gmail.com";
+ github = "jyp";
+ name = "Jean-Philippe Bernardy";
+ };
+ jzellner = {
+ email = "jeffz@eml.cc";
+ github = "sofuture";
+ name = "Jeff Zellner";
+ };
+ kaiha = {
+ email = "kai.harries@gmail.com";
+ github = "kaiha";
+ name = "Kai Harries";
+ };
+ kamilchm = {
+ email = "kamil.chm@gmail.com";
+ github = "kamilchm";
+ name = "Kamil Chmielewski";
+ };
+ kampfschlaefer = {
+ email = "arnold@arnoldarts.de";
+ github = "kampfschlaefer";
+ name = "Arnold Krille";
+ };
+ karolchmist = {
+ email = "info+nix@chmist.com";
+ name = "karolchmist";
+ };
+ kentjames = {
+ email = "jameschristopherkent@gmail.com";
+ github = "kentjames";
+ name = "James Kent";
+ };
+ kevincox = {
+ email = "kevincox@kevincox.ca";
+ github = "kevincox";
+ name = "Kevin Cox";
+ };
+ khumba = {
+ email = "bog@khumba.net";
+ github = "khumba";
+ name = "Bryan Gardiner";
+ };
+ kierdavis = {
+ email = "kierdavis@gmail.com";
+ github = "kierdavis";
+ name = "Kier Davis";
+ };
+ kiloreux = {
+ email = "kiloreux@gmail.com";
+ github = "kiloreux";
+ name = "Kiloreux Emperex";
+ };
+ kini = {
+ email = "keshav.kini@gmail.com";
+ github = "kini";
+ name = "Keshav Kini";
+ };
+ kkallio = {
+ email = "tierpluspluslists@gmail.com";
+ name = "Karn Kallio";
+ };
+ knedlsepp = {
+ email = "josef.kemetmueller@gmail.com";
+ github = "knedlsepp";
+ name = "Josef Kemetmüller";
+ };
+ konimex = {
+ email = "herdiansyah@netc.eu";
+ github = "konimex";
+ name = "Muhammad Herdiansyah";
+ };
+ koral = {
+ email = "koral@mailoo.org";
+ github = "k0ral";
+ name = "Koral";
+ };
+ kovirobi = {
+ email = "kovirobi@gmail.com";
+ github = "kovirobi";
+ name = "Kovacsics Robert";
+ };
+ kquick = {
+ email = "quick@sparq.org";
+ github = "kquick";
+ name = "Kevin Quick";
+ };
+ kragniz = {
+ email = "louis@kragniz.eu";
+ github = "kragniz";
+ name = "Louis Taylor";
+ };
+ kristoff3r = {
+ email = "k.soeholm@gmail.com";
+ github = "kristoff3r";
+ name = "Kristoffer Søholm";
+ };
+ ktosiek = {
+ email = "tomasz.kontusz@gmail.com";
+ github = "ktosiek";
+ name = "Tomasz Kontusz";
+ };
+ kuznero = {
+ email = "roman@kuznero.com";
+ github = "kuznero";
+ name = "Roman Kuznetsov";
+ };
+ lasandell = {
+ email = "lasandell@gmail.com";
+ github = "lasandell";
+ name = "Luke Sandell";
+ };
+ lassulus = {
+ email = "lassulus@gmail.com";
+ github = "Lassulus";
+ name = "Lassulus";
+ };
+ layus = {
+ email = "layus.on@gmail.com";
+ github = "layus";
+ name = "Guillaume Maudoux";
+ };
+ lblasc = {
+ email = "lblasc@znode.net";
+ github = "lblasc";
+ name = "Luka Blaskovic";
+ };
+ ldesgoui = {
+ email = "ldesgoui@gmail.com";
+ github = "ldesgoui";
+ name = "Lucas Desgouilles";
+ };
+ league = {
+ email = "league@contrapunctus.net";
+ github = "league";
+ name = "Christopher League";
+ };
+ lebastr = {
+ email = "lebastr@gmail.com";
+ github = "lebastr";
+ name = "Alexander Lebedev";
+ };
+ ledif = {
+ email = "refuse@gmail.com";
+ github = "ledif";
+ name = "Adam Fidel";
+ };
+ leemachin = {
+ email = "me@mrl.ee";
+ github = "leemachin";
+ name = "Lee Machin";
+ };
+ leenaars = {
+ email = "ml.software@leenaa.rs";
+ github = "leenaars";
+ name = "Michiel Leenaars";
+ };
+ leonardoce = {
+ email = "leonardo.cecchi@gmail.com";
+ github = "leonardoce";
+ name = "Leonardo Cecchi";
+ };
+ lejonet = {
+ email = "daniel@kuehn.se";
+ github = "lejonet";
+ name = "Daniel Kuehn";
+ };
+ lethalman = {
+ email = "lucabru@src.gnome.org";
+ github = "lethalman";
+ name = "Luca Bruno";
+ };
+ lewo = {
+ email = "lewo@abesis.fr";
+ github = "nlewo";
+ name = "Antoine Eiche";
+ };
+ lheckemann = {
+ email = "git@sphalerite.org";
+ github = "lheckemann";
+ name = "Linus Heckemann";
+ };
+ lhvwb = {
+ email = "nathaniel.baxter@gmail.com";
+ github = "nathanielbaxter";
+ name = "Nathaniel Baxter";
+ };
+ lihop = {
+ email = "nixos@leroy.geek.nz";
+ github = "lihop";
+ name = "Leroy Hopson";
+ };
+ limeytexan = {
+ email = "limeytexan@gmail.com";
+ github = "limeytexan";
+ name = "Michael Brantley";
+ };
+ linquize = {
+ email = "linquize@yahoo.com.hk";
+ github = "linquize";
+ name = "Linquize";
+ };
+ linus = {
+ email = "linusarver@gmail.com";
+ github = "listx";
+ name = "Linus Arver";
+ };
+ lluchs = {
+ email = "lukas.werling@gmail.com";
+ github = "lluchs";
+ name = "Lukas Werling";
+ };
+ lnl7 = {
+ email = "daiderd@gmail.com";
+ github = "lnl7";
+ name = "Daiderd Jordan";
+ };
+ lo1tuma = {
+ email = "schreck.mathias@gmail.com";
+ github = "lo1tuma";
+ name = "Mathias Schreck";
+ };
+ lopsided98 = {
+ email = "benwolsieffer@gmail.com";
+ github = "lopsided98";
+ name = "Ben Wolsieffer";
+ };
+ loskutov = {
+ email = "ignat.loskutov@gmail.com";
+ github = "loskutov";
+ name = "Ignat Loskutov";
+ };
+ lovek323 = {
+ email = "jason@oconal.id.au";
+ github = "lovek323";
+ name = "Jason O'Conal";
+ };
+ lowfatcomputing = {
+ email = "andreas.wagner@lowfatcomputing.org";
+ github = "lowfatcomputing";
+ name = "Andreas Wagner";
+ };
+ lschuermann = {
+ email = "leon.git@is.currently.online";
+ github = "lschuermann";
+ name = "Leon Schuermann";
+ };
+ lsix = {
+ email = "lsix@lancelotsix.com";
+ github = "lsix";
+ name = "Lancelot SIX";
+ };
+ ltavard = {
+ email = "laure.tavard@univ-grenoble-alpes.fr";
+ github = "ltavard";
+ name = "Laure Tavard";
+ };
+ lucas8 = {
+ email = "luc.linux@mailoo.org";
+ github = "lucas8";
+ name = "Luc Chabassier";
+ };
+ ludo = {
+ email = "ludo@gnu.org";
+ github = "civodul";
+ name = "Ludovic Courtès";
+ };
+ lufia = {
+ email = "lufia@lufia.org";
+ github = "lufia";
+ name = "Kyohei Kadota";
+ };
+ luispedro = {
+ email = "luis@luispedro.org";
+ github = "luispedro";
+ name = "Luis Pedro Coelho";
+ };
+ lukego = {
+ email = "luke@snabb.co";
+ github = "lukego";
+ name = "Luke Gorrie";
+ };
+ luz = {
+ email = "luz666@daum.net";
+ github = "Luz";
+ name = "Luz";
+ };
+ lw = {
+ email = "lw@fmap.me";
+ github = "lolwat97";
+ name = "Sergey Sofeychuk";
+ };
+ lyt = {
+ email = "wheatdoge@gmail.com";
+ name = "Tim Liou";
+ };
+ m3tti = {
+ email = "mathaeus.peter.sander@gmail.com";
+ name = "Mathaeus Sander";
+ };
+ ma27 = {
+ email = "maximilian@mbosch.me";
+ github = "ma27";
+ name = "Maximilian Bosch";
+ };
+ madjar = {
+ email = "georges.dubus@compiletoi.net";
+ github = "madjar";
+ name = "Georges Dubus";
+ };
+ magnetophon = {
+ email = "bart@magnetophon.nl";
+ github = "magnetophon";
+ name = "Bart Brouns";
+ };
+ mahe = {
+ email = "matthias.mh.herrmann@gmail.com";
+ github = "2chilled";
+ name = "Matthias Herrmann";
+ };
+ makefu = {
+ email = "makefu@syntax-fehler.de";
+ github = "makefu";
+ name = "Felix Richter";
+ };
+ malyn = {
+ email = "malyn@strangeGizmo.com";
+ github = "malyn";
+ name = "Michael Alyn Miller";
+ };
+ manveru = {
+ email = "m.fellinger@gmail.com";
+ github = "manveru";
+ name = "Michael Fellinger";
+ };
+ marcweber = {
+ email = "marco-oweber@gmx.de";
+ github = "marcweber";
+ name = "Marc Weber";
+ };
+ markWot = {
+ email = "markus@wotringer.de";
+ name = "Markus Wotringer";
+ };
+ markus1189 = {
+ email = "markus1189@gmail.com";
+ github = "markus1189";
+ name = "Markus Hauck";
+ };
+ markuskowa = {
+ email = "markus.kowalewski@gmail.com";
+ github = "markuskowa";
+ name = "Markus Kowalewski";
+ };
+ marsam = {
+ email = "marsam@users.noreply.github.com";
+ github = "marsam";
+ name = "Mario Rodas";
+ };
+ martijnvermaat = {
+ email = "martijn@vermaat.name";
+ github = "martijnvermaat";
+ name = "Martijn Vermaat";
+ };
+ martingms = {
+ email = "martin@mg.am";
+ github = "martingms";
+ name = "Martin Gammelsæter";
+ };
+ matejc = {
+ email = "cotman.matej@gmail.com";
+ github = "matejc";
+ name = "Matej Cotman";
+ };
+ mathnerd314 = {
+ email = "mathnerd314.gph+hs@gmail.com";
+ github = "mathnerd314";
+ name = "Mathnerd314";
+ };
+ matthewbauer = {
+ email = "mjbauer95@gmail.com";
+ github = "matthewbauer";
+ name = "Matthew Bauer";
+ };
+ matthiasbeyer = {
+ email = "mail@beyermatthias.de";
+ github = "matthiasbeyer";
+ name = "Matthias Beyer";
+ };
+ maurer = {
+ email = "matthew.r.maurer+nix@gmail.com";
+ github = "maurer";
+ name = "Matthew Maurer";
+ };
+ mbakke = {
+ email = "mbakke@fastmail.com";
+ github = "mbakke";
+ name = "Marius Bakke";
+ };
+ mbbx6spp = {
+ email = "me@susanpotter.net";
+ github = "mbbx6spp";
+ name = "Susan Potter";
+ };
+ mbe = {
+ email = "brandonedens@gmail.com";
+ github = "brandonedens";
+ name = "Brandon Edens";
+ };
+ mbode = {
+ email = "maxbode@gmail.com";
+ github = "mbode";
+ name = "Maximilian Bode";
+ };
+ mboes = {
+ email = "mboes@tweag.net";
+ github = "mboes";
+ name = "Mathieu Boespflug";
+ };
+ mbrgm = {
+ email = "marius@yeai.de";
+ github = "mbrgm";
+ name = "Marius Bergmann";
+ };
+ mcmtroffaes = {
+ email = "matthias.troffaes@gmail.com";
+ github = "mcmtroffaes";
+ name = "Matthias C. M. Troffaes";
+ };
+ mdaiter = {
+ email = "mdaiter8121@gmail.com";
+ github = "mdaiter";
+ name = "Matthew S. Daiter";
+ };
+ meditans = {
+ email = "meditans@gmail.com";
+ github = "meditans";
+ name = "Carlo Nucera";
+ };
+ mehandes = {
+ email = "niewskici@gmail.com";
+ github = "mehandes";
+ name = "Matt Deming";
+ };
+ meisternu = {
+ email = "meister@krutt.org";
+ github = "meisternu";
+ name = "Matt Miemiec";
+ };
+ metabar = {
+ email = "softs@metabarcoding.org";
+ name = "Celine Mercier";
+ };
+ mgdelacroix = {
+ email = "mgdelacroix@gmail.com";
+ github = "mgdelacroix";
+ name = "Miguel de la Cruz";
+ };
+ mgttlinger = {
+ email = "megoettlinger@gmail.com";
+ github = "mgttlinger";
+ name = "Merlin Göttlinger";
+ };
+ mguentner = {
+ email = "code@klandest.in";
+ github = "mguentner";
+ name = "Maximilian Güntner";
+ };
+ mic92 = {
+ email = "joerg@thalheim.io";
+ github = "mic92";
+ name = "Jörg Thalheim";
+ };
+ michaelpj = {
+ email = "michaelpj@gmail.com";
+ github = "michaelpj";
+ name = "Michael Peyton Jones";
+ };
+ michalrus = {
+ email = "m@michalrus.com";
+ github = "michalrus";
+ name = "Michal Rus";
+ };
+ michelk = {
+ email = "michel@kuhlmanns.info";
+ github = "michelk";
+ name = "Michel Kuhlmann";
+ };
+ mickours = {
+ email = "mickours@gmail.com<";
+ github = "mickours";
+ name = "Michael Mercier";
+ };
+ midchildan = {
+ email = "midchildan+nix@gmail.com";
+ github = "midchildan";
+ name = "midchildan";
+ };
+ mikefaille = {
+ email = "michael@faille.io";
+ github = "mikefaille";
+ name = "Michaël Faille";
+ };
+ mikoim = {
+ email = "ek@esh.ink";
+ github = "mikoim";
+ name = "Eshin Kunishima";
+ };
+ miltador = {
+ email = "miltador@yandex.ua";
+ name = "Vasiliy Solovey";
+ };
+ mimadrid = {
+ email = "mimadrid@ucm.es";
+ github = "mimadrid";
+ name = "Miguel Madrid";
+ };
+ mirdhyn = {
+ email = "mirdhyn@gmail.com";
+ github = "mirdhyn";
+ name = "Merlin Gaillard";
+ };
+ mirrexagon = {
+ email = "mirrexagon@mirrexagon.com";
+ github = "mirrexagon";
+ name = "Andrew Abbott";
+ };
+ mjanczyk = {
+ email = "m@dragonvr.pl";
+ github = "mjanczyk";
+ name = "Marcin Janczyk";
+ };
+ mjp = {
+ email = "mike@mythik.co.uk";
+ github = "MikePlayle";
+ name = "Mike Playle";
+ };
+ mkg = {
+ email = "mkg@vt.edu";
+ github = "mkgvt";
+ name = "Mark K Gardner";
+ };
+ mlieberman85 = {
+ email = "mlieberman85@gmail.com";
+ github = "mlieberman85";
+ name = "Michael Lieberman";
+ };
+ mmahut = {
+ email = "marek.mahut@gmail.com";
+ github = "mmahut";
+ name = "Marek Mahut";
+ };
+ moaxcp = {
+ email = "moaxcp@gmail.com";
+ github = "moaxcp";
+ name = "John Mercier";
+ };
+ modulistic = {
+ email = "modulistic@gmail.com";
+ github = "modulistic";
+ name = "Pablo Costa";
+ };
+ mog = {
+ email = "mog-lists@rldn.net";
+ github = "mogorman";
+ name = "Matthew O'Gorman";
+ };
+ montag451 = {
+ email = "montag451@laposte.net";
+ github = "montag451";
+ name = "montag451";
+ };
+ moosingin3space = {
+ email = "moosingin3space@gmail.com";
+ github = "moosingin3space";
+ name = "Nathan Moos";
+ };
+ moredread = {
+ email = "code@apb.name";
+ github = "moredread";
+ name = "André-Patrick Bubel";
+ };
+ moretea = {
+ email = "maarten@moretea.nl";
+ github = "moretea";
+ name = "Maarten Hoogendoorn";
+ };
+ mounium = {
+ email = "muoniurn@gmail.com";
+ github = "mounium";
+ name = "Katona László";
+ };
+ mpcsh = {
+ email = "m@mpc.sh";
+ github = "mpcsh";
+ name = "Mark Cohen";
+ };
+ mpickering = {
+ email = "matthewtpickering@gmail.com";
+ github = "mpickering";
+ name = "Matthew Pickering";
+ };
+ mpscholten = {
+ email = "marc@mpscholten.de";
+ github = "mpscholten";
+ name = "Marc Scholten";
+ };
+ mpsyco = {
+ email = "fr.st-amour@gmail.com";
+ github = "fstamour";
+ name = "Francis St-Amour";
+ };
+ mrVanDalo = {
+ email = "contact@ingolf-wagner.de";
+ github = "mrVanDalo";
+ name = "Ingolf Wanger";
+ };
+ msackman = {
+ email = "matthew@wellquite.org";
+ name = "Matthew Sackman";
+ };
+ mschristiansen = {
+ email = "mikkel@rheosystems.com";
+ github = "mschristiansen";
+ name = "Mikkel Christiansen";
+ };
+ mstarzyk = {
+ email = "mstarzyk@gmail.com";
+ github = "mstarzyk";
+ name = "Maciek Starzyk";
+ };
+ msteen = {
+ email = "emailmatthijs@gmail.com";
+ github = "msteen";
+ name = "Matthijs Steen";
+ };
+ mt-caret = {
+ email = "mtakeda.enigsol@gmail.com";
+ github = "mt-caret";
+ name = "Masayuki Takeda";
+ };
+ mtreskin = {
+ email = "zerthurd@gmail.com";
+ github = "Zert";
+ name = "Max Treskin";
+ };
+ mudri = {
+ email = "lamudri@gmail.com";
+ github = "laMudri";
+ name = "James Wood";
+ };
+ muflax = {
+ email = "mail@muflax.com";
+ github = "muflax";
+ name = "Stefan Dorn";
+ };
+ myrl = {
+ email = "myrl.0xf@gmail.com";
+ github = "myrl";
+ name = "Myrl Hex";
+ };
+ nadrieril = {
+ email = "nadrieril@gmail.com";
+ github = "nadrieril";
+ name = "Nadrieril Feneanar";
+ };
+ namore = {
+ email = "namor@hemio.de";
+ github = "namore";
+ name = "Roman Naumann";
+ };
+ nand0p = {
+ email = "nando@hex7.com";
+ github = "nand0p";
+ name = "Fernando Jose Pando";
+ };
+ nathan-gs = {
+ email = "nathan@nathan.gs";
+ github = "nathan-gs";
+ name = "Nathan Bijnens";
+ };
+ nckx = {
+ email = "github@tobias.gr";
+ github = "nckx";
+ name = "Tobias Geerinckx-Rice";
+ };
+ ndowens = {
+ email = "ndowens04@gmail.com";
+ github = "ndowens";
+ name = "Nathan Owens";
+ };
+ neeasade = {
+ email = "nathanisom27@gmail.com";
+ github = "neeasade";
+ name = "Nathan Isom";
+ };
+ nequissimus = {
+ email = "tim@nequissimus.com";
+ github = "nequissimus";
+ name = "Tim Steinbach";
+ };
+ nfjinjing = {
+ email = "nfjinjing@gmail.com";
+ github = "nfjinjing";
+ name = "Jinjing Wang";
+ };
+ nh2 = {
+ email = "mail@nh2.me";
+ github = "nh2";
+ name = "Niklas Hambüchen";
+ };
+ nhooyr = {
+ email = "anmol@aubble.com";
+ github = "nhooyr";
+ name = "Anmol Sethi";
+ };
+ nickhu = {
+ email = "me@nickhu.co.uk";
+ github = "nickhu";
+ name = "Nick Hu";
+ };
+ nicknovitski = {
+ email = "nixpkgs@nicknovitski.com";
+ github = "nicknovitski";
+ name = "Nick Novitski";
+ };
+ nico202 = {
+ email = "anothersms@gmail.com";
+ github = "nico202";
+ name = "Nicolò Balzarotti";
+ };
+ ninjatrappeur = {
+ email = "felix@alternativebit.fr";
+ github = "ninjatrappeur";
+ name = "Félix Baylac-Jacqué";
+ };
+ nipav = {
+ email = "niko.pavlinek@gmail.com";
+ github = "nipav";
+ name = "Niko Pavlinek";
+ };
+ nixy = {
+ email = "nixy@nixy.moe";
+ github = "nixy";
+ name = "Andrew R. M.";
+ };
+ nmattia = {
+ email = "nicolas@nmattia.com";
+ github = "nmattia";
+ name = "Nicolas Mattia";
+ };
+ nocoolnametom = {
+ email = "nocoolnametom@gmail.com";
+ github = "nocoolnametom";
+ name = "Tom Doggett";
+ };
+ notthemessiah = {
+ email = "brian.cohen.88@gmail.com";
+ github = "notthemessiah";
+ name = "Brian Cohen";
+ };
+ np = {
+ email = "np.nix@nicolaspouillard.fr";
+ github = "np";
+ name = "Nicolas Pouillard";
+ };
+ nslqqq = {
+ email = "nslqqq@gmail.com";
+ name = "Nikita Mikhailov";
+ };
+ nthorne = {
+ email = "notrupertthorne@gmail.com";
+ github = "nthorne";
+ name = "Niklas Thörne";
+ };
+ nyarly = {
+ email = "nyarly@gmail.com";
+ github = "nyarly";
+ name = "Judson Lester";
+ };
+ obadz = {
+ email = "obadz-nixos@obadz.com";
+ github = "obadz";
+ name = "obadz";
+ };
+ ocharles = {
+ email = "ollie@ocharles.org.uk";
+ github = "ocharles";
+ name = "Oliver Charles";
+ };
+ odi = {
+ email = "oliver.dunkl@gmail.com";
+ github = "odi";
+ name = "Oliver Dunkl";
+ };
+ offline = {
+ email = "jakahudoklin@gmail.com";
+ github = "offlinehacker";
+ name = "Jaka Hudoklin";
+ };
+ oida = {
+ email = "oida@posteo.de";
+ github = "oida";
+ name = "oida";
+ };
+ okasu = {
+ email = "oka.sux@gmail.com";
+ name = "Okasu";
+ };
+ olcai = {
+ email = "dev@timan.info";
+ github = "olcai";
+ name = "Erik Timan";
+ };
+ olejorgenb = {
+ email = "olejorgenb@yahoo.no";
+ github = "olejorgenb";
+ name = "Ole Jørgen Brønner";
+ };
+ olynch = {
+ email = "owen@olynch.me";
+ github = "olynch";
+ name = "Owen Lynch";
+ };
+ orbekk = {
+ email = "kjetil.orbekk@gmail.com";
+ github = "orbekk";
+ name = "KJ Ørbekk";
+ };
+ orbitz = {
+ email = "mmatalka@gmail.com";
+ github = "orbitz";
+ name = "Malcolm Matalka";
+ };
+ orivej = {
+ email = "orivej@gmx.fr";
+ github = "orivej";
+ name = "Orivej Desh";
+ };
+ osener = {
+ email = "ozan@ozansener.com";
+ github = "osener";
+ name = "Ozan Sener";
+ };
+ otwieracz = {
+ email = "slawek@otwiera.cz";
+ github = "otwieracz";
+ name = "Slawomir Gonet";
+ };
+ oxij = {
+ email = "oxij@oxij.org";
+ github = "oxij";
+ name = "Jan Malakhovski";
+ };
+ pSub = {
+ email = "mail@pascal-wittmann.de";
+ github = "pSub";
+ name = "Pascal Wittmann";
+ };
+ paholg = {
+ email = "paho@paholg.com";
+ github = "paholg";
+ name = "Paho Lurie-Gregg";
+ };
+ pakhfn = {
+ email = "pakhfn@gmail.com";
+ github = "pakhfn";
+ name = "Fedor Pakhomov";
+ };
+ panaeon = {
+ email = "vitalii.voloshyn@gmail.com";
+ github = "panaeon";
+ name = "Vitalii Voloshyn";
+ };
+ paperdigits = {
+ email = "mica@silentumbrella.com";
+ github = "paperdigits";
+ name = "Mica Semrick";
+ };
+ paraseba = {
+ email = "paraseba@gmail.com";
+ github = "paraseba";
+ name = "Sebastian Galkin";
+ };
+ pashev = {
+ email = "pashev.igor@gmail.com";
+ github = "ip1981";
+ name = "Igor Pashev";
+ };
+ patternspandemic = {
+ email = "patternspandemic@live.com";
+ github = "patternspandemic";
+ name = "Brad Christensen";
+ };
+ pawelpacana = {
+ email = "pawel.pacana@gmail.com";
+ github = "pawelpacana";
+ name = "Paweł Pacana";
+ };
+ pbogdan = {
+ email = "ppbogdan@gmail.com";
+ github = "pbogdan";
+ name = "Piotr Bogdan";
+ };
+ pcarrier = {
+ email = "pc@rrier.ca";
+ github = "pcarrier";
+ name = "Pierre Carrier";
+ };
+ periklis = {
+ email = "theopompos@gmail.com";
+ github = "periklis";
+ name = "Periklis Tsirakidis";
+ };
+ pesterhazy = {
+ email = "pesterhazy@gmail.com";
+ github = "pesterhazy";
+ name = "Paulus Esterhazy";
+ };
+ peterhoeg = {
+ email = "peter@hoeg.com";
+ github = "peterhoeg";
+ name = "Peter Hoeg";
+ };
+ peterromfeldhk = {
+ email = "peter.romfeld.hk@gmail.com";
+ github = "peterromfeldhk";
+ name = "Peter Romfeld";
+ };
+ peti = {
+ email = "simons@cryp.to";
+ github = "peti";
+ name = "Peter Simons";
+ };
+ philandstuff = {
+ email = "philip.g.potter@gmail.com";
+ github = "philandstuff";
+ name = "Philip Potter";
+ };
+ phile314 = {
+ email = "nix@314.ch";
+ github = "phile314";
+ name = "Philipp Hausmann";
+ };
+ phreedom = {
+ email = "phreedom@yandex.ru";
+ github = "phreedom";
+ name = "Evgeny Egorochkin";
+ };
+ phunehehe = {
+ email = "phunehehe@gmail.com";
+ github = "phunehehe";
+ name = "Hoang Xuan Phu";
+ };
+ pierrechevalier83 = {
+ email = "pierrechevalier83@gmail.com";
+ github = "pierrechevalier83";
+ name = "Pierre Chevalier";
+ };
+ pierrer = {
+ email = "pierrer@pi3r.be";
+ github = "pierrer";
+ name = "Pierre Radermecker";
+ };
+ pierron = {
+ email = "nixos@nbp.name";
+ github = "nbp";
+ name = "Nicolas B. Pierron";
+ };
+ piotr = {
+ email = "ppietrasa@gmail.com";
+ name = "Piotr Pietraszkiewicz";
+ };
+ pjbarnoy = {
+ email = "pjbarnoy@gmail.com";
+ github = "pjbarnoy";
+ name = "Perry Barnoy";
+ };
+ pjones = {
+ email = "pjones@devalot.com";
+ github = "pjones";
+ name = "Peter Jones";
+ };
+ pkmx = {
+ email = "pkmx.tw@gmail.com";
+ github = "pkmx";
+ name = "Chih-Mao Chen";
+ };
+ plcplc = {
+ email = "plcplc@gmail.com";
+ github = "plcplc";
+ name = "Philip Lykke Carlsen";
+ };
+ plumps = {
+ email = "maks.bronsky@web.de";
+ github = "plumps";
+ name = "Maksim Bronsky";
+ };
+ pmahoney = {
+ email = "pat@polycrystal.org";
+ github = "pmahoney";
+ name = "Patrick Mahoney";
+ };
+ pmeunier = {
+ email = "pierre-etienne.meunier@inria.fr";
+ github = "P-E-Meunier";
+ name = "Pierre-Étienne Meunier";
+ };
+ pmiddend = {
+ email = "pmidden@secure.mailbox.org";
+ github = "pmiddend";
+ name = "Philipp Middendorf";
+ };
+ pneumaticat = {
+ email = "kevin@potatofrom.space";
+ github = "pneumaticat";
+ name = "Kevin Liu";
+ };
+ polyrod = {
+ email = "dc1mdp@gmail.com";
+ github = "polyrod";
+ name = "Maurizio Di Pietro";
+ };
+ pradeepchhetri = {
+ email = "pradeep.chhetri89@gmail.com";
+ github = "pradeepchhetri";
+ name = "Pradeep Chhetri";
+ };
+ prikhi = {
+ email = "pavan.rikhi@gmail.com";
+ github = "prikhi";
+ name = "Pavan Rikhi";
+ };
+ primeos = {
+ email = "dev.primeos@gmail.com";
+ github = "primeos";
+ name = "Michael Weiss";
+ };
+ proglodyte = {
+ email = "proglodyte23@gmail.com";
+ github = "proglodyte";
+ name = "Proglodyte";
+ };
+ pshendry = {
+ email = "paul@pshendry.com";
+ github = "pshendry";
+ name = "Paul Hendry";
+ };
+ psibi = {
+ email = "sibi@psibi.in";
+ github = "psibi";
+ name = "Sibi";
+ };
+ pstn = {
+ email = "philipp@xndr.de";
+ name = "Philipp Steinpaß";
+ };
+ puffnfresh = {
+ email = "brian@brianmckenna.org";
+ github = "puffnfresh";
+ name = "Brian McKenna";
+ };
+ pxc = {
+ email = "patrick.callahan@latitudeengineering.com";
+ name = "Patrick Callahan";
+ };
+ qknight = {
+ email = "js@lastlog.de";
+ github = "qknight";
+ name = "Joachim Schiele";
+ };
+ ragge = {
+ email = "r.dahlen@gmail.com";
+ github = "ragnard";
+ name = "Ragnar Dahlen";
+ };
+ ralith = {
+ email = "ben.e.saunders@gmail.com";
+ github = "ralith";
+ name = "Benjamin Saunders";
+ };
+ ramkromberg = {
+ email = "ramkromberg@mail.com";
+ github = "ramkromberg";
+ name = "Ram Kromberg";
+ };
+ rardiol = {
+ email = "ricardo.ardissone@gmail.com";
+ github = "rardiol";
+ name = "Ricardo Ardissone";
+ };
+ rasendubi = {
+ email = "rasen.dubi@gmail.com";
+ github = "rasendubi";
+ name = "Alexey Shmalko";
+ };
+ raskin = {
+ email = "7c6f434c@mail.ru";
+ github = "7c6f434c";
+ name = "Michael Raskin";
+ };
+ ravloony = {
+ email = "ravloony@gmail.com";
+ name = "Tom Macdonald";
+ };
+ razvan = {
+ email = "razvan.panda@gmail.com";
+ github = "razvan-panda";
+ name = "Răzvan Flavius Panda";
+ };
+ rbasso = {
+ email = "rbasso@sharpgeeks.net";
+ github = "rbasso";
+ name = "Rafael Basso";
+ };
+ rdnetto = {
+ email = "rdnetto@gmail.com";
+ github = "rdnetto";
+ name = "Reuben D'Netto";
+ };
+ redbaron = {
+ email = "ivanov.maxim@gmail.com";
+ github = "redbaron";
+ name = "Maxim Ivanov";
+ };
+ redvers = {
+ email = "red@infect.me";
+ github = "redvers";
+ name = "Redvers Davies";
+ };
+ refnil = {
+ email = "broemartino@gmail.com";
+ github = "refnil";
+ name = "Martin Lavoie";
+ };
+ regnat = {
+ email = "regnat@regnat.ovh";
+ github = "regnat";
+ name = "Théophane Hufschmitt";
+ };
+ relrod = {
+ email = "ricky@elrod.me";
+ github = "relrod";
+ name = "Ricky Elrod";
+ };
+ renzo = {
+ email = "renzocarbonara@gmail.com";
+ github = "k0001";
+ name = "Renzo Carbonara";
+ };
+ retrry = {
+ email = "retrry@gmail.com";
+ github = "retrry";
+ name = "Tadas Barzdžius";
+ };
+ rht = {
+ email = "rhtbot@protonmail.com";
+ github = "rht";
+ name = "rht";
+ };
+ richardipsum = {
+ email = "richardipsum@fastmail.co.uk";
+ github = "richardipsum";
+ name = "Richard Ipsum";
+ };
+ rick68 = {
+ email = "rick68@gmail.com";
+ github = "rick68";
+ name = "Wei-Ming Yang";
+ };
+ rickynils = {
+ email = "rickynils@gmail.com";
+ github = "rickynils";
+ name = "Rickard Nilsson";
+ };
+ ris = {
+ email = "code@humanleg.org.uk";
+ github = "risicle";
+ name = "Robert Scott";
+ };
+ rlupton20 = {
+ email = "richard.lupton@gmail.com";
+ github = "rlupton20";
+ name = "Richard Lupton";
+ };
+ rnhmjoj = {
+ email = "micheleguerinirocco@me.com";
+ github = "rnhmjoj";
+ name = "Michele Guerini Rocco";
+ };
+ rob = {
+ email = "rob.vermaas@gmail.com";
+ github = "rbvermaa";
+ name = "Rob Vermaas";
+ };
+ robberer = {
+ email = "robberer@freakmail.de";
+ github = "robberer";
+ name = "Longrin Wischnewski";
+ };
+ robbinch = {
+ email = "robbinch33@gmail.com";
+ github = "robbinch";
+ name = "Robbin C.";
+ };
+ roberth = {
+ email = "nixpkgs@roberthensing.nl";
+ github = "roberth";
+ name = "Robert Hensing";
+ };
+ robertodr = {
+ email = "roberto.diremigio@gmail.com";
+ github = "robertodr";
+ name = "Roberto Di Remigio";
+ };
+ robgssp = {
+ email = "robgssp@gmail.com";
+ github = "robgssp";
+ name = "Rob Glossop";
+ };
+ roblabla = {
+ email = "robinlambertz+dev@gmail.com";
+ github = "roblabla";
+ name = "Robin Lambertz";
+ };
+ roconnor = {
+ email = "roconnor@theorem.ca";
+ github = "roconnor";
+ name = "Russell O'Connor";
+ };
+ romildo = {
+ email = "malaquias@gmail.com";
+ github = "romildo";
+ name = "José Romildo Malaquias";
+ };
+ rongcuid = {
+ email = "rongcuid@outlook.com";
+ github = "rongcuid";
+ name = "Rongcui Dong";
+ };
+ rszibele = {
+ email = "richard@szibele.com";
+ github = "rszibele";
+ name = "Richard Szibele";
+ };
+ rtreffer = {
+ email = "treffer+nixos@measite.de";
+ github = "rtreffer";
+ name = "Rene Treffer";
+ };
+ rushmorem = {
+ email = "rushmore@webenchanter.com";
+ github = "rushmorem";
+ name = "Rushmore Mushambi";
+ };
+ rvl = {
+ email = "dev+nix@rodney.id.au";
+ github = "rvl";
+ name = "Rodney Lorrimar";
+ };
+ rvlander = {
+ email = "rvlander@gaetanandre.eu";
+ github = "rvlander";
+ name = "Gaëtan André";
+ };
+ rvolosatovs = {
+ email = "rvolosatovs@riseup.net";
+ github = "rvolosatovs";
+ name = "Roman Volosatovs";
+ };
+ ryanartecona = {
+ email = "ryanartecona@gmail.com";
+ github = "ryanartecona";
+ name = "Ryan Artecona";
+ };
+ ryansydnor = {
+ email = "ryan.t.sydnor@gmail.com";
+ github = "ryansydnor";
+ name = "Ryan Sydnor";
+ };
+ ryantm = {
+ email = "ryan@ryantm.com";
+ github = "ryantm";
+ name = "Ryan Mulligan";
+ };
+ ryantrinkle = {
+ email = "ryan.trinkle@gmail.com";
+ github = "ryantrinkle";
+ name = "Ryan Trinkle";
+ };
+ rybern = {
+ email = "ryan.bernstein@columbia.edu";
+ github = "rybern";
+ name = "Ryan Bernstein";
+ };
+ rycee = {
+ email = "robert@rycee.net";
+ github = "rycee";
+ name = "Robert Helgesson";
+ };
+ ryneeverett = {
+ email = "ryneeverett@gmail.com";
+ github = "ryneeverett";
+ name = "Ryne Everett";
+ };
+ rzetterberg = {
+ email = "richard.zetterberg@gmail.com";
+ github = "rzetterberg";
+ name = "Richard Zetterberg";
+ };
+ s1lvester = {
+ email = "s1lvester@bockhacker.me";
+ github = "s1lvester";
+ name = "Markus Silvester";
+ };
+ samdroid-apps = {
+ email = "sam@sam.today";
+ github = "samdroid-apps";
+ name = "Sam Parkinson";
+ };
+ samueldr = {
+ email = "samuel@dionne-riel.com";
+ github = "samueldr";
+ name = "Samuel Dionne-Riel";
+ };
+ samuelrivas = {
+ email = "samuelrivas@gmail.com";
+ github = "samuelrivas";
+ name = "Samuel Rivas";
+ };
+ sander = {
+ email = "s.vanderburg@tudelft.nl";
+ github = "svanderburg";
+ name = "Sander van der Burg";
+ };
+ sargon = {
+ email = "danielehlers@mindeye.net";
+ github = "sargon";
+ name = "Daniel Ehlers";
+ };
+ sauyon = {
+ email = "s@uyon.co";
+ github = "sauyon";
+ name = "Sauyon Lee";
+ };
+ schmitthenner = {
+ email = "development@schmitthenner.eu";
+ github = "fkz";
+ name = "Fabian Schmitthenner";
+ };
+ schneefux = {
+ email = "schneefux+nixos_pkg@schneefux.xyz";
+ github = "schneefux";
+ name = "schneefux";
+ };
+ schristo = {
+ email = "schristopher@konputa.com";
+ name = "Scott Christopher";
+ };
+ scode = {
+ email = "peter.schuller@infidyne.com";
+ github = "scode";
+ name = "Peter Schuller";
+ };
+ scolobb = {
+ email = "sivanov@colimite.fr";
+ github = "scolobb";
+ name = "Sergiu Ivanov";
+ };
+ sdll = {
+ email = "sasha.delly@gmail.com";
+ github = "sdll";
+ name = "Sasha Illarionov";
+ };
+ sellout = {
+ email = "greg@technomadic.org";
+ github = "sellout";
+ name = "Greg Pfeil";
+ };
+ sengaya = {
+ email = "tlo@sengaya.de";
+ github = "sengaya";
+ name = "Thilo Uttendorfer";
+ };
+ sepi = {
+ email = "raffael@mancini.lu";
+ github = "sepi";
+ name = "Raffael Mancini";
+ };
+ seppeljordan = {
+ email = "sebastian.jordan.mail@googlemail.com";
+ github = "seppeljordan";
+ name = "Sebastian Jordan";
+ };
+ sfrijters = {
+ email = "sfrijters@gmail.com";
+ github = "sfrijters";
+ name = "Stefan Frijters";
+ };
+ shanemikel = {
+ email = "shanemikel1@gmail.com";
+ github = "shanemikel";
+ name = "Shane Pearlman";
+ };
+ shawndellysse = {
+ email = "sdellysse@gmail.com";
+ github = "shawndellysse";
+ name = "Shawn Dellysse";
+ };
+ sheenobu = {
+ email = "sheena.artrip@gmail.com";
+ github = "sheenobu";
+ name = "Sheena Artrip";
+ };
+ sheganinans = {
+ email = "sheganinans@gmail.com";
+ github = "sheganinans";
+ name = "Aistis Raulinaitis";
+ };
+ shell = {
+ email = "cam.turn@gmail.com";
+ github = "VShell";
+ name = "Shell Turner";
+ };
+ shlevy = {
+ email = "shea@shealevy.com";
+ github = "shlevy";
+ name = "Shea Levy";
+ };
+ siddharthist = {
+ email = "langston.barrett@gmail.com";
+ github = "siddharthist";
+ name = "Langston Barrett";
+ };
+ sifmelcara = {
+ email = "ming@culpring.com";
+ github = "sifmelcara";
+ name = "Ming Chuan";
+ };
+ sigma = {
+ email = "yann.hodique@gmail.com";
+ github = "sigma";
+ name = "Yann Hodique";
+ };
+ simonvandel = {
+ email = "simon.vandel@gmail.com";
+ github = "simonvandel";
+ name = "Simon Vandel Sillesen";
+ };
+ sivteck = {
+ email = "sivaram1992@gmail.com";
+ github = "sivteck";
+ name = "Sivaram Balakrishnan";
+ };
+ sjagoe = {
+ email = "simon@simonjagoe.com";
+ github = "sjagoe";
+ name = "Simon Jagoe";
+ };
+ sjmackenzie = {
+ email = "setori88@gmail.com";
+ github = "sjmackenzie";
+ name = "Stewart Mackenzie";
+ };
+ sjourdois = {
+ email = "sjourdois@gmail.com";
+ name = "Stéphane ‘kwisatz’ Jourdois";
+ };
+ skeidel = {
+ email = "svenkeidel@gmail.com";
+ github = "svenkeidel";
+ name = "Sven Keidel";
+ };
+ skrzyp = {
+ email = "jot.skrzyp@gmail.com";
+ name = "Jakub Skrzypnik";
+ };
+ sleexyz = {
+ email = "freshdried@gmail.com";
+ github = "sleexyz";
+ name = "Sean Lee";
+ };
+ smironov = {
+ email = "grrwlf@gmail.com";
+ github = "grwlf";
+ name = "Sergey Mironov";
+ };
+ snyh = {
+ email = "snyh@snyh.org";
+ github = "snyh";
+ name = "Xia Bin";
+ };
+ solson = {
+ email = "scott@solson.me";
+ github = "solson";
+ name = "Scott Olson";
+ };
+ sorki = {
+ email = "srk@48.io";
+ github = "sorki";
+ name = "Richard Marko";
+ };
+ sorpaas = {
+ email = "hi@that.world";
+ github = "sorpaas";
+ name = "Wei Tang";
+ };
+ spacefrogg = {
+ email = "spacefrogg-nixos@meterriblecrew.net";
+ github = "spacefrogg";
+ name = "Michael Raitza";
+ };
+ spencerjanssen = {
+ email = "spencerjanssen@gmail.com";
+ github = "spencerjanssen";
+ name = "Spencer Janssen";
+ };
+ spinus = {
+ email = "tomasz.czyz@gmail.com";
+ github = "spinus";
+ name = "Tomasz Czyż";
+ };
+ sprock = {
+ email = "rmason@mun.ca";
+ github = "sprock";
+ name = "Roger Mason";
+ };
+ spwhitt = {
+ email = "sw@swhitt.me";
+ github = "spwhitt";
+ name = "Spencer Whitt";
+ };
+ srhb = {
+ email = "sbrofeldt@gmail.com";
+ github = "srhb";
+ name = "Sarah Brofeldt";
+ };
+ stephenmw = {
+ email = "stephen@q5comm.com";
+ github = "stephenmw";
+ name = "Stephen Weinberg";
+ };
+ sternenseemann = {
+ email = "post@lukasepple.de";
+ github = "sternenseemann";
+ name = "Lukas Epple";
+ };
+ stesie = {
+ email = "stesie@brokenpipe.de";
+ github = "stesie";
+ name = "Stefan Siegl";
+ };
+ steveej = {
+ email = "mail@stefanjunker.de";
+ github = "steveej";
+ name = "Stefan Junker";
+ };
+ stumoss = {
+ email = "samoss@gmail.com";
+ github = "stumoss";
+ name = "Stuart Moss";
+ };
+ suvash = {
+ email = "suvash+nixpkgs@gmail.com";
+ github = "suvash";
+ name = "Suvash Thapaliya";
+ };
+ svsdep = {
+ email = "svsdep@gmail.com";
+ github = "svsdep";
+ name = "Vasyl Solovei";
+ };
+ swarren83 = {
+ email = "shawn.w.warren@gmail.com";
+ github = "swarren83";
+ name = "Shawn Warren";
+ };
+ swflint = {
+ email = "swflint@flintfam.org";
+ github = "swflint";
+ name = "Samuel W. Flint";
+ };
+ swistak35 = {
+ email = "me@swistak35.com";
+ github = "swistak35";
+ name = "Rafał Łasocha";
+ };
+ symphorien = {
+ email = "symphorien_nixpkgs@xlumurb.eu";
+ github = "symphorien";
+ name = "Guillaume Girol";
+ };
+ szczyp = {
+ email = "qb@szczyp.com";
+ github = "szczyp";
+ name = "Szczyp";
+ };
+ sztupi = {
+ email = "attila.sztupak@gmail.com";
+ github = "sztupi";
+ name = "Attila Sztupak";
+ };
+ tadfisher = {
+ email = "tadfisher@gmail.com";
+ github = "tadfisher";
+ name = "Tad Fisher";
+ };
+ taeer = {
+ email = "taeer@necsi.edu";
+ github = "Radvendii";
+ name = "Taeer Bar-Yam";
+ };
+ tailhook = {
+ email = "paul@colomiets.name";
+ github = "tailhook";
+ name = "Paul Colomiets";
+ };
+ taketwo = {
+ email = "alexandrov88@gmail.com";
+ github = "taketwo";
+ name = "Sergey Alexandrov";
+ };
+ takikawa = {
+ email = "asumu@igalia.com";
+ github = "takikawa";
+ name = "Asumu Takikawa";
+ };
+ taktoa = {
+ email = "taktoa@gmail.com";
+ github = "taktoa";
+ name = "Remy Goldschmidt";
+ };
+ taku0 = {
+ email = "mxxouy6x3m_github@tatapa.org";
+ github = "taku0";
+ name = "Takuo Yonezawa";
+ };
+ tari = {
+ email = "peter@taricorp.net";
+ github = "tari";
+ name = "Peter Marheine";
+ };
+ tavyc = {
+ email = "octavian.cerna@gmail.com";
+ github = "tavyc";
+ name = "Octavian Cerna";
+ };
+ tazjin = {
+ email = "mail@tazj.in";
+ github = "tazjin";
+ name = "Vincent Ambo";
+ };
+ teh = {
+ email = "tehunger@gmail.com";
+ github = "teh";
+ name = "Tom Hunger";
+ };
+ telotortium = {
+ email = "rirelan@gmail.com";
+ github = "telotortium";
+ name = "Robert Irelan";
+ };
+ teozkr = {
+ email = "teo@nullable.se";
+ github = "teozkr";
+ name = "Teo Klestrup Röijezon";
+ };
+ teto = {
+ email = "mcoudron@hotmail.com";
+ github = "teto";
+ name = "Matthieu Coudron";
+ };
+ tex = {
+ email = "milan.svoboda@centrum.cz";
+ github = "tex";
+ name = "Milan Svoboda";
+ };
+ thall = {
+ email = "niclas.thall@gmail.com";
+ github = "thall";
+ name = "Niclas Thall";
+ };
+ thammers = {
+ email = "jawr@gmx.de";
+ github = "tobias-hammerschmidt";
+ name = "Tobias Hammerschmidt";
+ };
+ thanegill = {
+ email = "me@thanegill.com";
+ github = "thanegill";
+ name = "Thane Gill";
+ };
+ the-kenny = {
+ email = "moritz@tarn-vedra.de";
+ github = "the-kenny";
+ name = "Moritz Ulrich";
+ };
+ theuni = {
+ email = "ct@flyingcircus.io";
+ github = "ctheune";
+ name = "Christian Theune";
+ };
+ thoughtpolice = {
+ email = "aseipp@pobox.com";
+ github = "thoughtpolice";
+ name = "Austin Seipp";
+ };
+ thpham = {
+ email = "thomas.pham@ithings.ch";
+ github = "thpham";
+ name = "Thomas Pham";
+ };
+ tilpner = {
+ email = "till@hoeppner.ws";
+ github = "tilpner";
+ name = "Till Höppner";
+ };
+ timbertson = {
+ email = "tim@gfxmonk.net";
+ github = "timbertson";
+ name = "Tim Cuthbertson";
+ };
+ timokau = {
+ email = "timokau@zoho.com";
+ github = "timokau";
+ name = "Timo Kaufmann";
+ };
+ timor = {
+ email = "timor.dd@googlemail.com";
+ github = "timor";
+ name = "timor";
+ };
+ tiramiseb = {
+ email = "sebastien@maccagnoni.eu";
+ github = "tiramiseb";
+ name = "Sébastien Maccagnoni";
+ };
+ titanous = {
+ email = "jonathan@titanous.com";
+ github = "titanous";
+ name = "Jonathan Rudenberg";
+ };
+ tnias = {
+ email = "phil@grmr.de";
+ github = "tnias";
+ name = "Philipp Bartsch";
+ };
+ tohl = {
+ email = "tom@logand.com";
+ github = "tohl";
+ name = "Tomas Hlavaty";
+ };
+ tokudan = {
+ email = "git@danielfrank.net";
+ github = "tokudan";
+ name = "Daniel Frank";
+ };
+ tomberek = {
+ email = "tomberek@gmail.com";
+ github = "tomberek";
+ name = "Thomas Bereknyei";
+ };
+ tomsmeets = {
+ email = "tom@tsmeets.nl";
+ github = "tomsmeets";
+ name = "Tom Smeets";
+ };
+ travisbhartwell = {
+ email = "nafai@travishartwell.net";
+ github = "travisbhartwell";
+ name = "Travis B. Hartwell";
+ };
+ treemo = {
+ email = "matthieu.chevrier@treemo.fr";
+ github = "treemo";
+ name = "Matthieu Chevrier";
+ };
+ trevorj = {
+ email = "nix@trevor.joynson.io";
+ github = "akatrevorjay";
+ name = "Trevor Joynson";
+ };
+ trino = {
+ email = "muehlhans.hubert@ekodia.de";
+ github = "hmuehlhans";
+ name = "Hubert Mühlhans";
+ };
+ troydm = {
+ email = "d.geurkov@gmail.com";
+ github = "troydm";
+ name = "Dmitry Geurkov";
+ };
+ tstrobel = {
+ email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains";
+ name = "Thomas Strobel";
+ };
+ ttuegel = {
+ email = "ttuegel@mailbox.org";
+ github = "ttuegel";
+ name = "Thomas Tuegel";
+ };
+ tv = {
+ email = "tv@shackspace.de";
+ github = "4z3";
+ name = "Tomislav Viljetić";
+ };
+ tvestelind = {
+ email = "tomas.vestelind@fripost.org";
+ github = "tvestelind";
+ name = "Tomas Vestelind";
+ };
+ tvorog = {
+ email = "marszaripov@gmail.com";
+ github = "tvorog";
+ name = "Marsel Zaripov";
+ };
+ tweber = {
+ email = "tw+nixpkgs@360vier.de";
+ github = "thorstenweber83";
+ name = "Thorsten Weber";
+ };
+ twey = {
+ email = "twey@twey.co.uk";
+ github = "twey";
+ name = "James ‘Twey’ Kay";
+ };
+ unode = {
+ email = "alves.rjc@gmail.com";
+ github = "unode";
+ name = "Renato Alves";
+ };
+ uralbash = {
+ email = "root@uralbash.ru";
+ github = "uralbash";
+ name = "Svintsov Dmitry";
+ };
+ utdemir = {
+ email = "me@utdemir.com";
+ github = "utdemir";
+ name = "Utku Demir";
+ };
+ uvnikita = {
+ email = "uv.nikita@gmail.com";
+ github = "uvNikita";
+ name = "Nikita Uvarov";
+ };
+ uwap = {
+ email = "me@uwap.name";
+ github = "uwap";
+ name = "uwap";
+ };
+ va1entin = {
+ email = "github@valentinsblog.com";
+ github = "va1entin";
+ name = "Valentin Heidelberger";
+ };
+ vaibhavsagar = {
+ email = "vaibhavsagar@gmail.com";
+ github = "vaibhavsagar";
+ name = "Vaibhav Sagar";
+ };
+ valeriangalliat = {
+ email = "val@codejam.info";
+ github = "valeriangalliat";
+ name = "Valérian Galliat";
+ };
+ vandenoever = {
+ email = "jos@vandenoever.info";
+ github = "vandenoever";
+ name = "Jos van den Oever";
+ };
+ vanschelven = {
+ email = "klaas@vanschelven.com";
+ github = "vanschelven";
+ name = "Klaas van Schelven";
+ };
+ vanzef = {
+ email = "vanzef@gmail.com";
+ github = "vanzef";
+ name = "Ivan Solyankin";
+ };
+ varunpatro = {
+ email = "varun.kumar.patro@gmail.com";
+ github = "varunpatro";
+ name = "Varun Patro";
+ };
+ vbgl = {
+ email = "Vincent.Laporte@gmail.com";
+ github = "vbgl";
+ name = "Vincent Laporte";
+ };
+ vbmithr = {
+ email = "vb@luminar.eu.org";
+ github = "vbmithr";
+ name = "Vincent Bernardoff";
+ };
+ vcunat = {
+ email = "vcunat@gmail.com";
+ github = "vcunat";
+ name = "Vladimír Čunát";
+ };
+ vdemeester = {
+ email = "vincent@sbr.pm";
+ github = "vdemeester";
+ name = "Vincent Demeester";
+ };
+ velovix = {
+ email = "xaviosx@gmail.com";
+ github = "velovix";
+ name = "Tyler Compton";
+ };
+ veprbl = {
+ email = "veprbl@gmail.com";
+ github = "veprbl";
+ name = "Dmitry Kalinkin";
+ };
+ vidbina = {
+ email = "vid@bina.me";
+ github = "vidbina";
+ name = "David Asabina";
+ };
+ vifino = {
+ email = "vifino@tty.sh";
+ github = "vifino";
+ name = "Adrian Pistol";
+ };
+ vinymeuh = {
+ email = "vinymeuh@gmail.com";
+ github = "vinymeuh";
+ name = "VinyMeuh";
+ };
+ viric = {
+ email = "viric@viric.name";
+ github = "viric";
+ name = "Lluís Batlle i Rossell";
+ };
+ vizanto = {
+ email = "danny@prime.vc";
+ github = "vizanto";
+ name = "Danny Wilson";
+ };
+ vklquevs = {
+ email = "vklquevs@gmail.com";
+ github = "vklquevs";
+ name = "vklquevs";
+ };
+ vlstill = {
+ email = "xstill@fi.muni.cz";
+ github = "vlstill";
+ name = "Vladimír Štill";
+ };
+ vmandela = {
+ email = "venkat.mandela@gmail.com";
+ github = "vmandela";
+ name = "Venkateswara Rao Mandela";
+ };
+ vmchale = {
+ email = "tmchale@wisc.edu";
+ github = "vmchale";
+ name = "Vanessa McHale";
+ };
+ volhovm = {
+ email = "volhovm.cs@gmail.com";
+ github = "volhovm";
+ name = "Mikhail Volkhov";
+ };
+ volth = {
+ email = "jaroslavas@volth.com";
+ github = "volth";
+ name = "Jaroslavas Pocepko";
+ };
+ vozz = {
+ email = "oliver.huntuk@gmail.com";
+ name = "Oliver Hunt";
+ };
+ vrthra = {
+ email = "rahul@gopinath.org";
+ github = "vrthra";
+ name = "Rahul Gopinath";
+ };
+ vyp = {
+ email = "elisp.vim@gmail.com";
+ github = "vyp";
+ name = "vyp";
+ };
+ wedens = {
+ email = "kirill.wedens@gmail.com";
+ name = "wedens";
+ };
+ willibutz = {
+ email = "willibutz@posteo.de";
+ github = "willibutz";
+ name = "Willi Butz";
+ };
+ willtim = {
+ email = "tim.williams.public@gmail.com";
+ name = "Tim Philip Williams";
+ };
+ winden = {
+ email = "windenntw@gmail.com";
+ name = "Antonio Vargas Gonzalez";
+ };
+ wizeman = {
+ email = "rcorreia@wizy.org";
+ github = "wizeman";
+ name = "Ricardo M. Correia";
+ };
+ wjlroe = {
+ email = "willroe@gmail.com";
+ github = "wjlroe";
+ name = "William Roe";
+ };
+ wkennington = {
+ email = "william@wkennington.com";
+ github = "wkennington";
+ name = "William A. Kennington III";
+ };
+ wmertens = {
+ email = "Wout.Mertens@gmail.com";
+ github = "wmertens";
+ name = "Wout Mertens";
+ };
+ woffs = {
+ email = "github@woffs.de";
+ github = "woffs";
+ name = "Frank Doepper";
+ };
+ womfoo = {
+ email = "kranium@gikos.net";
+ github = "womfoo";
+ name = "Kranium Gikos Mendoza";
+ };
+ wscott = {
+ email = "wsc9tt@gmail.com";
+ github = "wscott";
+ name = "Wayne Scott";
+ };
+ wyvie = {
+ email = "elijahrum@gmail.com";
+ github = "wyvie";
+ name = "Elijah Rum";
+ };
+ xaverdh = {
+ email = "hoe.dom@gmx.de";
+ github = "xaverdh";
+ name = "Dominik Xaver Hörl";
+ };
+ xeji = {
+ email = "xeji@cat3.de";
+ github = "xeji";
+ name = "xeji";
+ };
+ xnaveira = {
+ email = "xnaveira@gmail.com";
+ github = "xnaveira";
+ name = "Xavier Naveira";
+ };
+ xnwdd = {
+ email = "nwdd+nixos@no.team";
+ github = "xnwdd";
+ name = "Guillermo NWDD";
+ };
+ xurei = {
+ email = "olivier.bourdoux@gmail.com";
+ github = "xurei";
+ name = "Olivier Bourdoux";
+ };
+ xvapx = {
+ email = "marti.serra.coscollano@gmail.com";
+ github = "xvapx";
+ name = "Marti Serra";
+ };
+ xwvvvvwx = {
+ email = "davidterry@posteo.de";
+ github = "xwvvvvwx";
+ name = "David Terry";
+ };
+ xzfc = {
+ email = "xzfcpw@gmail.com";
+ github = "xzfc";
+ name = "Albert Safin";
+ };
+ y0no = {
+ email = "y0no@y0no.fr";
+ github = "y0no";
+ name = "Yoann Ono";
+ };
+ yarr = {
+ email = "savraz@gmail.com";
+ github = "Eternity-Yarr";
+ name = "Dmitry V.";
+ };
+ yegortimoshenko = {
+ email = "yegortimoshenko@gmail.com";
+ github = "yegortimoshenko";
+ name = "Yegor Timoshenko";
+ };
+ yesbox = {
+ email = "jesper.geertsen.jonsson@gmail.com";
+ github = "yesbox";
+ name = "Jesper Geertsen Jonsson";
+ };
+ ylwghst = {
+ email = "ylwghst@onionmail.info";
+ github = "ylwghst";
+ name = "Burim Augustin Berisa";
+ };
+ yochai = {
+ email = "yochai@titat.info";
+ github = "yochai";
+ name = "Yochai";
+ };
+ yorickvp = {
+ email = "yorickvanpelt@gmail.com";
+ github = "yorickvp";
+ name = "Yorick van Pelt";
+ };
+ yrashk = {
+ email = "yrashk@gmail.com";
+ github = "yrashk";
+ name = "Yurii Rashkovskii";
+ };
+ yuriaisaka = {
+ email = "yuri.aisaka+nix@gmail.com";
+ github = "yuriaisaka";
+ name = "Yuri Aisaka";
+ };
+ yurrriq = {
+ email = "eric@ericb.me";
+ github = "yurrriq";
+ name = "Eric Bailey";
+ };
+ z77z = {
+ email = "maggesi@math.unifi.it";
+ github = "maggesi";
+ name = "Marco Maggesi";
+ };
+ zagy = {
+ email = "cz@flyingcircus.io";
+ github = "zagy";
+ name = "Christian Zagrodnick";
+ };
+ zalakain = {
+ email = "contact@unaizalakain.info";
+ github = "umazalakain";
+ name = "Unai Zalakain";
+ };
+ zarelit = {
+ email = "david@zarel.net";
+ github = "zarelit";
+ name = "David Costa";
+ };
+ zauberpony = {
+ email = "elmar@athmer.org";
+ github = "zauberpony";
+ name = "Elmar Athmer";
+ };
+ zef = {
+ email = "zef@zef.me";
+ name = "Zef Hemel";
+ };
+ zimbatm = {
+ email = "zimbatm@zimbatm.com";
+ github = "zimbatm";
+ name = "zimbatm";
+ };
+ zohl = {
+ email = "zohl@fmap.me";
+ github = "zohl";
+ name = "Al Zohali";
+ };
+ zoomulator = {
+ email = "zoomulator@gmail.com";
+ github = "zoomulator";
+ name = "Kim Simmons";
+ };
+ zraexy = {
+ email = "zraexy@gmail.com";
+ github = "zraexy";
+ name = "David Mell";
+ };
+ zx2c4 = {
+ email = "Jason@zx2c4.com";
+ github = "zx2c4";
+ name = "Jason A. Donenfeld";
+ };
+ zzamboni = {
+ email = "diego@zzamboni.org";
+ github = "zzamboni";
+ name = "Diego Zamboni";
+ };
+}
diff --git a/maintainers/scripts/check-maintainer-github-handles.sh b/maintainers/scripts/check-maintainer-github-handles.sh
new file mode 100755
index 000000000000..879a2e452cb3
--- /dev/null
+++ b/maintainers/scripts/check-maintainer-github-handles.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p jq parallel
+
+# Example how to work with the `lib.maintainers` attrset.
+# Can be used to check whether all user handles are still valid.
+
+set -e
+
+# nixpkgs=''
+# if [ -n "$1" ]; then
+
+function checkCommits {
+ local user="$1"
+ local tmp=$(mktemp)
+ curl --silent -w "%{http_code}" \
+ "https://github.com/NixOS/nixpkgs/commits?author=$user" \
+ > "$tmp"
+ # the last line of tmp contains the http status
+ local status=$(tail -n1 "$tmp")
+ local ret=
+ case $status in
+ 200) if <"$tmp" grep -i "no commits found" > /dev/null; then
+ ret=1
+ else
+ ret=0
+ fi
+ ;;
+ # because of github’s hard request limits, this can take some time
+ 429) sleep 2
+ printf "."
+ checkCommits "$user"
+ ret=$?
+ ;;
+ *) printf "BAD STATUS: $(tail -n1 $tmp) for %s\n" "$user"; ret=1
+ ret=1
+ ;;
+ esac
+ rm "$tmp"
+ return $ret
+}
+export -f checkCommits
+
+function checkUser {
+ local user="$1"
+ local status=
+ status="$(curl --silent --head "https://github.com/${user}" | grep Status)"
+ # checks whether a user handle can be found on github
+ if [[ "$status" =~ 404 ]]; then
+ printf "%s\t\t\t\t%s\n" "$status" "$user"
+ # checks whether the user handle has any nixpkgs commits
+ elif checkCommits "$user"; then
+ printf "OK!\t\t\t\t%s\n" "$user"
+ else
+ printf "No Commits!\t\t\t%s\n" "$user"
+ fi
+}
+export -f checkUser
+
+# output the maintainers set as json
+# and filter out the github username of each maintainer (if it exists)
+# then check some at the same time
+nix-instantiate -A lib.maintainers --eval --strict --json \
+ | jq -r '.[]|.github|select(.)' \
+ | parallel -j5 checkUser
+
+# parallel -j100 checkUser ::: "eelco" "profpatsch" "Profpatsch" "a"
diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl
index 178dcfb38da4..f3fe7236760b 100755
--- a/maintainers/scripts/copy-tarballs.pl
+++ b/maintainers/scripts/copy-tarballs.pl
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
-#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable
+#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings
# This command uploads tarballs to tarballs.nixos.org, the
# content-addressed cache used by fetchurl as a fallback for when
@@ -59,6 +59,7 @@ my $s3 = Net::Amazon::S3->new(
{ aws_access_key_id => $aws_access_key_id,
aws_secret_access_key => $aws_secret_access_key,
retry => 1,
+ host => "s3-eu-west-1.amazonaws.com",
});
my $bucket = $s3->bucket("nixpkgs-tarballs") or die;
diff --git a/maintainers/scripts/debian-patches.sh b/maintainers/scripts/debian-patches.sh
index 78678473a49f..b4923fb537e9 100755
--- a/maintainers/scripts/debian-patches.sh
+++ b/maintainers/scripts/debian-patches.sh
@@ -4,11 +4,13 @@
# Usage $0 debian-patches.txt debian-patches.nix
# An example input and output files can be found in applications/graphics/xara/
-DEB_URL=http://patch-tracker.debian.org/patch/series/dl
+DEB_URL=https://sources.debian.org/data/main
declare -a deb_patches
mapfile -t deb_patches < $1
-prefix="${DEB_URL}/${deb_patches[0]}"
+# First letter
+deb_prefix="${deb_patches[0]:0:1}"
+prefix="${DEB_URL}/${deb_prefix}/${deb_patches[0]}/debian/patches"
if [[ -n "$2" ]]; then
exec 1> $2
diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh
index a2b8080e2a43..1357f87aaa5d 100755
--- a/maintainers/scripts/fetch-kde-qt.sh
+++ b/maintainers/scripts/fetch-kde-qt.sh
@@ -21,7 +21,7 @@ find . -type f | while read src; do
# Sanitize file name
filename=$(basename "$src" | tr '@' '_')
nameVersion="${filename%.tar.*}"
- name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
+ name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,')
version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
echo "$name,$version,$src,$filename" >>$csv
done
diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh
deleted file mode 100755
index d44bda53f8d6..000000000000
--- a/maintainers/scripts/gnome.sh
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/env bash
-
-set -o pipefail
-
-GNOME_FTP=ftp.gnome.org/pub/GNOME/sources
-
-# projects that don't follow the GNOME major versioning, or that we don't want to
-# programmatically update
-NO_GNOME_MAJOR="ghex gtkhtml gdm gucharmap"
-
-usage() {
- echo "Usage: $0 || [major.minor]" >&2
- exit 0
-}
-
-if [ "$#" -lt 1 ]; then
- usage
-fi
-
-GNOME_TOP=pkgs/desktops/gnome-3
-
-action=$1
-
-# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have
-# any conversations with sysadmin. Somehow lftp works.
-if [ "$FTP_CLIENT" = "lftp" ]; then
- ls_ftp() {
- lftp -c "open $1; cls"
- }
-else
- ls_ftp() {
- curl -s -l "$1"/
- }
-fi
-
-find_project() {
- exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d "$@"
-}
-
-show_project() {
- local project=$1
- local majorVersion=$2
- local version=
-
- if [ -z "$majorVersion" ]; then
- echo "Looking for available versions..." >&2
- local available_baseversions=$(ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n)
- if [ "$?" -ne 0 ]; then
- echo "Project $project not found" >&2
- return 1
- fi
-
- echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2
- echo -en "Choose one of them: " >&2
- read majorVersion
- fi
-
- if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then
- # not a major version
- version=$majorVersion
- majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2)
- fi
-
- local FTPDIR=${GNOME_FTP}/${project}/${majorVersion}
-
- #version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//`
- # gnome's LATEST-IS is broken. Do not trust it.
-
- if [ -z "$version" ]; then
- local files=$(ls_ftp "${FTPDIR}")
- declare -A versions
-
- for f in $files; do
- case $f in
- (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*):
- ;;
- ($project-*.*.9*.tar.*):
- tmp=${f#$project-}
- tmp=${tmp%.tar*}
- echo "Ignored unstable version ${tmp}" >&2
- ;;
- ($project-*.tar.*):
- tmp=${f#$project-}
- tmp=${tmp%.tar*}
- versions[${tmp}]=1
- ;;
- (*):
- echo "UNKNOWN FILE $f" >&2
- ;;
- esac
- done
- echo "Found versions ${!versions[@]}" >&2
- version=$(echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1)
- if [ -z "$version" ]; then
- echo "No version available for major $majorVersion" >&2
- return 1
- fi
-
- echo "Latest version is: ${version}" >&2
- fi
-
- local name=${project}-${version}
- echo "Fetching .sha256 file" >&2
- local sha256out=$(curl -s -f http://"${FTPDIR}"/"${name}".sha256sum)
-
- if [ "$?" -ne "0" ]; then
- echo "Version not found" >&2
- return 1
- fi
-
- extensions=( "xz" "bz2" "gz" )
- echo "Choosing archive extension (known are ${extensions[@]})..." >&2
- for ext in ${extensions[@]}; do
- if echo -e "$sha256out" | grep -q "\\.tar\\.${ext}$"; then
- ext_pref=$ext
- sha256=$(echo -e "$sha256out" | grep "\\.tar\\.${ext}$" | cut -f1 -d\ )
- break
- fi
- done
- echo "Chosen ${ext_pref}, hash is ${sha256}" >&2
-
- echo "# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
- name = \"${project}-${version}\";
-
- src = fetchurl {
- url = mirror://gnome/sources/${project}/${majorVersion}/${project}-${version}.tar.${ext_pref};
- sha256 = \"${sha256}\";
- };
-}"
-
- return 0
-}
-
-update_project() {
- local project=$1
- local majorVersion=$2
-
- # find project in nixpkgs tree
- projectPath=$(find_project -name "$project" -print)
- if [ -z "$projectPath" ]; then
- echo "Project $project not found under $GNOME_TOP"
- exit 1
- fi
-
- src=$(show_project "$project" "$majorVersion")
-
- if [ "$?" -eq "0" ]; then
- echo "Updating $projectPath/src.nix" >&2
- echo -e "$src" > "$projectPath"/src.nix
- fi
-
- return 0
-}
-
-if [ "$action" = "update-all" ]; then
- majorVersion=$2
- if [ -z "$majorVersion" ]; then
- echo "No major version specified" >&2
- usage
- fi
-
- # find projects
- projects=$(find_project -exec basename '{}' \;)
- for project in $projects; do
- if echo "$NO_GNOME_MAJOR"|grep -q $project; then
- echo "Skipping $project"
- else
- echo "= Updating $project to $majorVersion" >&2
- update_project "$project" "$majorVersion"
- echo >&2
- fi
- done
-else
- project=$2
- majorVersion=$3
-
- if [ -z "$project" ]; then
- echo "No project specified, exiting" >&2
- usage
- fi
-
- if [ "$action" = show ]; then
- show_project "$project" "$majorVersion"
- elif [ "$action" = update ]; then
- update_project "$project" "$majorVersion"
- else
- echo "Unknown action $action" >&2
- usage
- fi
-fi
diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index ddc3c7c4a967..d0bd1913ba8a 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -13,7 +13,7 @@ from pyquery import PyQuery as pq
maintainers_json = subprocess.check_output([
- 'nix-instantiate', '-E', 'import ./lib/maintainers.nix {}', '--eval', '--json'
+ 'nix-instantiate', '-E', 'import ./maintainers/maintainer-list.nix {}', '--eval', '--json'
])
maintainers = json.loads(maintainers_json)
MAINTAINERS = {v: k for k, v in maintainers.iteritems()}
diff --git a/maintainers/scripts/rebuild-amount.sh b/maintainers/scripts/rebuild-amount.sh
index 098a8c88cb7e..1a54cada8af6 100755
--- a/maintainers/scripts/rebuild-amount.sh
+++ b/maintainers/scripts/rebuild-amount.sh
@@ -1,9 +1,16 @@
#!/usr/bin/env bash
set -e
+# --print: avoid dependency on environment
+optPrint=
+if [ "$1" == "--print" ]; then
+ optPrint=true
+ shift
+fi
+
if [ "$#" != 1 ] && [ "$#" != 2 ]; then
cat <<-EOF
- Usage: $0 commit-spec [commit-spec]
+ Usage: $0 [--print] commit-spec [commit-spec]
You need to be in a git-controlled nixpkgs tree.
The current state of the tree will be used if the second commit is missing.
EOF
@@ -113,3 +120,8 @@ newPkgs "${tree[1]}" "${tree[2]}" '--argstr system "x86_64-linux"' > "$newlist"
sed -n 's/\([^. ]*\.\)*\([^. ]*\) .*$/\2/p' < "$newlist" \
| sort | uniq -c
+if [ -n "$optPrint" ]; then
+ echo
+ cat "$newlist"
+fi
+
diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index 3ddc8c23a79b..4536662c8420 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests toolz ])'
+#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git
"""
Update a Python package expression by passing in the `.nix` file, or the directory containing it.
@@ -18,7 +18,12 @@ import os
import re
import requests
import toolz
-from concurrent.futures import ThreadPoolExecutor as pool
+from concurrent.futures import ThreadPoolExecutor as Pool
+from packaging.version import Version as _Version
+from packaging.version import InvalidVersion
+from packaging.specifiers import SpecifierSet
+import collections
+import subprocess
INDEX = "https://pypi.io/pypi"
"""url of PyPI"""
@@ -26,10 +31,30 @@ INDEX = "https://pypi.io/pypi"
EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl']
"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
+PRERELEASES = False
+
import logging
logging.basicConfig(level=logging.INFO)
+class Version(_Version, collections.abc.Sequence):
+
+ def __init__(self, version):
+ super().__init__(version)
+ # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21`
+ # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882
+ self.raw_version = version
+
+ def __getitem__(self, i):
+ return self._version.release[i]
+
+ def __len__(self):
+ return len(self._version.release)
+
+ def __iter__(self):
+ yield from self._version.release
+
+
def _get_values(attribute, text):
"""Match attribute in text and return all matches.
@@ -82,13 +107,59 @@ def _fetch_page(url):
else:
raise ValueError("request for {} failed".format(url))
-def _get_latest_version_pypi(package, extension):
+
+SEMVER = {
+ 'major' : 0,
+ 'minor' : 1,
+ 'patch' : 2,
+}
+
+
+def _determine_latest_version(current_version, target, versions):
+ """Determine latest version, given `target`.
+ """
+ current_version = Version(current_version)
+
+ def _parse_versions(versions):
+ for v in versions:
+ try:
+ yield Version(v)
+ except InvalidVersion:
+ pass
+
+ versions = _parse_versions(versions)
+
+ index = SEMVER[target]
+
+ ceiling = list(current_version[0:index])
+ if len(ceiling) == 0:
+ ceiling = None
+ else:
+ ceiling[-1]+=1
+ ceiling = Version(".".join(map(str, ceiling)))
+
+ # We do not want prereleases
+ versions = SpecifierSet(prereleases=PRERELEASES).filter(versions)
+
+ if ceiling is not None:
+ versions = SpecifierSet(f"<{ceiling}").filter(versions)
+
+ return (max(sorted(versions))).raw_version
+
+
+def _get_latest_version_pypi(package, extension, current_version, target):
"""Get latest version and hash from PyPI."""
url = "{}/{}/json".format(INDEX, package)
json = _fetch_page(url)
- version = json['info']['version']
- for release in json['releases'][version]:
+ versions = json['releases'].keys()
+ version = _determine_latest_version(current_version, target, versions)
+
+ try:
+ releases = json['releases'][version]
+ except KeyError as e:
+ raise KeyError('Could not find version {} for {}'.format(version, package)) from e
+ for release in releases:
if release['filename'].endswith(extension):
# TODO: In case of wheel we need to do further checks!
sha256 = release['digests']['sha256']
@@ -98,7 +169,7 @@ def _get_latest_version_pypi(package, extension):
return version, sha256
-def _get_latest_version_github(package, extension):
+def _get_latest_version_github(package, extension, current_version, target):
raise ValueError("updating from GitHub is not yet supported.")
@@ -141,9 +212,9 @@ def _determine_extension(text, fetcher):
"""
if fetcher == 'fetchPypi':
try:
- format = _get_unique_value('format', text)
+ src_format = _get_unique_value('format', text)
except ValueError as e:
- format = None # format was not given
+ src_format = None # format was not given
try:
extension = _get_unique_value('extension', text)
@@ -151,9 +222,11 @@ def _determine_extension(text, fetcher):
extension = None # extension was not given
if extension is None:
- if format is None:
- format = 'setuptools'
- extension = FORMATS[format]
+ if src_format is None:
+ src_format = 'setuptools'
+ elif src_format == 'flit':
+ raise ValueError("Don't know how to update a Flit package.")
+ extension = FORMATS[src_format]
elif fetcher == 'fetchurl':
url = _get_unique_value('url', text)
@@ -167,9 +240,7 @@ def _determine_extension(text, fetcher):
return extension
-def _update_package(path):
-
-
+def _update_package(path, target):
# Read the expression
with open(path, 'r') as f:
@@ -186,11 +257,13 @@ def _update_package(path):
extension = _determine_extension(text, fetcher)
- new_version, new_sha256 = _get_latest_version_pypi(pname, extension)
+ new_version, new_sha256 = FETCHERS[fetcher](pname, extension, version, target)
if new_version == version:
logging.info("Path {}: no update available for {}.".format(path, pname))
return False
+ elif new_version <= version:
+ raise ValueError("downgrade for {}.".format(pname))
if not new_sha256:
raise ValueError("no file available for {}.".format(pname))
@@ -202,10 +275,19 @@ def _update_package(path):
logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version))
- return True
+ result = {
+ 'path' : path,
+ 'target': target,
+ 'pname': pname,
+ 'old_version' : version,
+ 'new_version' : new_version,
+ #'fetcher' : fetcher,
+ }
+
+ return result
-def _update(path):
+def _update(path, target):
# We need to read and modify a Nix expression.
if os.path.isdir(path):
@@ -222,24 +304,58 @@ def _update(path):
return False
try:
- return _update_package(path)
+ return _update_package(path, target)
except ValueError as e:
logging.warning("Path {}: {}".format(path, e))
return False
+
+def _commit(path, pname, old_version, new_version, **kwargs):
+ """Commit result.
+ """
+
+ msg = f'python: {pname}: {old_version} -> {new_version}'
+
+ try:
+ subprocess.check_call(['git', 'add', path])
+ subprocess.check_call(['git', 'commit', '-m', msg])
+ except subprocess.CalledProcessError as e:
+ subprocess.check_call(['git', 'checkout', path])
+ raise subprocess.CalledProcessError(f'Could not commit {path}') from e
+
+ return True
+
+
def main():
parser = argparse.ArgumentParser()
parser.add_argument('package', type=str, nargs='+')
+ parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major')
+ parser.add_argument('--commit', action='store_true', help='Create a commit for each package update')
args = parser.parse_args()
+ target = args.target
- packages = map(os.path.abspath, args.package)
+ packages = list(map(os.path.abspath, args.package))
+
+ logging.info("Updating packages...")
+
+ # Use threads to update packages concurrently
+ with Pool() as p:
+ results = list(p.map(lambda pkg: _update(pkg, target), packages))
+
+ logging.info("Finished updating packages.")
+
+ # Commits are created sequentially.
+ if args.commit:
+ logging.info("Committing updates...")
+ list(map(lambda x: _commit(**x), filter(bool, results)))
+ logging.info("Finished committing updates")
+
+ count = sum(map(bool, results))
+ logging.info("{} package(s) updated".format(count))
- with pool() as p:
- count = list(p.map(_update, packages))
- logging.info("{} package(s) updated".format(sum(count)))
if __name__ == '__main__':
- main()
\ No newline at end of file
+ main()
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index 2035950da3e3..8d1e47c6bc95 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -1,37 +1,51 @@
{ package ? null
, maintainer ? null
+, path ? null
}:
# TODO: add assert statements
let
+ /* Remove duplicate elements from the list based on some extracted value. O(n^2) complexity.
+ */
+ nubOn = f: list:
+ if list == [] then
+ []
+ else
+ let
+ x = pkgs.lib.head list;
+ xs = pkgs.lib.filter (p: f x != f p) (pkgs.lib.drop 1 list);
+ in
+ [x] ++ nubOn f xs;
pkgs = import ./../../default.nix { };
packagesWith = cond: return: set:
- pkgs.lib.flatten
- (pkgs.lib.mapAttrsToList
- (name: pkg:
- let
- result = builtins.tryEval (
- if pkgs.lib.isDerivation pkg && cond name pkg
- then [(return name pkg)]
- else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false
- then packagesWith cond return pkg
+ nubOn (pkg: pkg.updateScript)
+ (pkgs.lib.flatten
+ (pkgs.lib.mapAttrsToList
+ (name: pkg:
+ let
+ result = builtins.tryEval (
+ if pkgs.lib.isDerivation pkg && cond name pkg
+ then [(return name pkg)]
+ else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false
+ then packagesWith cond return pkg
+ else []
+ );
+ in
+ if result.success then result.value
else []
- );
- in
- if result.success then result.value
- else []
+ )
+ set
)
- set
);
packagesWithUpdateScriptAndMaintainer = maintainer':
let
maintainer =
if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then
- builtins.throw "Maintainer with name `${maintainer'} does not exist in `lib/maintainers.nix`."
+ builtins.throw "Maintainer with name `${maintainer'} does not exist in `maintainers/maintainer-list.nix`."
else
builtins.getAttr maintainer' pkgs.lib.maintainers;
in
@@ -47,6 +61,14 @@ let
(name: pkg: pkg)
pkgs;
+ packagesWithUpdateScript = path:
+ let
+ attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." path) null pkgs;
+ in
+ packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg)
+ (name: pkg: pkg)
+ attrSet;
+
packageByName = name:
let
package = pkgs.lib.attrByPath (pkgs.lib.splitString "." name) null pkgs;
@@ -54,7 +76,7 @@ let
if package == null then
builtins.throw "Package with an attribute name `${name}` does not exists."
else if ! builtins.hasAttr "updateScript" package then
- builtins.throw "Package with an attribute name `${name}` does have an `passthru.updateScript` defined."
+ builtins.throw "Package with an attribute name `${name}` does not have a `passthru.updateScript` attribute defined."
else
package;
@@ -63,6 +85,8 @@ let
[ (packageByName package) ]
else if maintainer != null then
packagesWithUpdateScriptAndMaintainer maintainer
+ else if path != null then
+ packagesWithUpdateScript path
else
builtins.throw "No arguments provided.\n\n${helpText}";
@@ -76,7 +100,11 @@ let
% nix-shell maintainers/scripts/update.nix --argstr package garbas
- to run update script for specific package.
+ to run update script for specific package, or
+
+ % nix-shell maintainers/scripts/update.nix --argstr path gnome3
+
+ to run update script for all package under an attribute path.
'';
runUpdateScript = package: ''
diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh
index 27e7741799f0..aa7d4ec967da 100755
--- a/maintainers/scripts/vanity.sh
+++ b/maintainers/scripts/vanity.sh
@@ -10,7 +10,7 @@ git_data="$(echo "$raw_git_log" | grep 'Author:' |
# Name - nick - email correspondence from log and from maintainer list
# Also there are a few manual entries
-maintainers="$(cat "$(dirname "$0")/../../lib/maintainers.nix" |
+maintainers="$(cat "$(dirname "$0")/../maintainer-list.nix" |
grep '=' | sed -re 's/\\"/''/g;
s/[ ]*([^ =]*)[ ]*=[ ]*" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')"
git_lines="$( ( echo "$git_data";
diff --git a/nixos/default.nix b/nixos/default.nix
index 0e45a1cd75e2..45da78e9261c 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -9,8 +9,6 @@ let
modules = [ configuration ];
};
- inherit (eval) pkgs;
-
# This is for `nixos-rebuild build-vm'.
vmConfig = (import ./lib/eval-config.nix {
inherit system;
@@ -30,7 +28,7 @@ let
in
{
- inherit (eval) config options;
+ inherit (eval) pkgs config options;
system = eval.config.system.build.toplevel;
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
index 87406c28c2f7..75cccef95b38 100644
--- a/nixos/doc/manual/configuration/firewall.xml
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -23,10 +23,23 @@ networking.firewall.allowedTCPPorts = [ 80 443 ];
Note that TCP port 22 (ssh) is opened automatically if the SSH daemon
-is enabled (). UDP
+is enabled (). UDP
ports can be opened through
-. Also of
-interest is
+.
+
+To open ranges of TCP ports:
+
+
+networking.firewall.allowedTCPPortRanges = [
+ { from = 4000; to = 4007; }
+ { from = 8000; to = 8010; }
+];
+
+
+Similarly, UDP port ranges can be opened through
+.
+
+Also of interest is
networking.firewall.allowPing = true;
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index 053501b1736d..68238b547d60 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -12,7 +12,7 @@ interfaces. However, you can configure an interface manually as
follows:
-networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ];
+networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
Typically you’ll also want to set a default gateway and set of name
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
index 6d9e0a164e9e..74a21e18ec3f 100644
--- a/nixos/doc/manual/configuration/ipv6-config.xml
+++ b/nixos/doc/manual/configuration/ipv6-config.xml
@@ -26,7 +26,7 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;
DHCPv6. You can configure an interface manually:
-networking.interfaces.eth0.ip6 = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ];
+networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ];
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
index 2bd9cca5622f..c6656edff6c8 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -12,7 +12,7 @@ management. In the declarative style, users are specified in
states that a user account named alice shall exist:
-users.extraUsers.alice =
+users.users.alice =
{ isNormalUser = true;
home = "/home/alice";
description = "Alice Foobar";
@@ -34,7 +34,7 @@ to set a password, which is retained across invocations of
If you set users.mutableUsers to false, then the contents of /etc/passwd
and /etc/group will be congruent to your NixOS configuration. For instance,
-if you remove a user from users.extraUsers and run nixos-rebuild, the user
+if you remove a user from users.users and run nixos-rebuild, the user
account will cease to exist. Also, imperative commands for managing users
and groups, such as useradd, are no longer available. Passwords may still be
assigned by setting the user's hashedPassword option. A
@@ -54,7 +54,7 @@ to the user specification.
group named students shall exist:
-users.extraGroups.students.gid = 1000;
+users.groups.students.gid = 1000;
As with users, the group ID (gid) is optional and will be assigned
@@ -68,8 +68,8 @@ account named alice:
# useradd -m alice
-To make all nix tools available to this new user use `su - USER` which
-opens a login shell (==shell that loads the profile) for given user.
+To make all nix tools available to this new user use `su - USER` which
+opens a login shell (==shell that loads the profile) for given user.
This will create the ~/.nix-defexpr symlink. So run:
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index fc6082ce3afd..9c2c59006f15 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -115,13 +115,14 @@ hardware.opengl.driSupport32Bit = true;
Support for Synaptics touchpads (found in many laptops such as
the Dell Latitude series) can be enabled as follows:
-services.xserver.synaptics.enable = true;
+services.xserver.libinput.enable = true;
The driver has many options (see ). For
-instance, the following enables two-finger scrolling:
+instance, the following disables tap-to-click behavior:
-services.xserver.synaptics.twoFingerScroll = true;
+services.xserver.libinput.tapping = false;
+Note: the use of services.xserver.synaptics is deprecated since NixOS 17.09.
@@ -129,7 +130,7 @@ services.xserver.synaptics.twoFingerScroll = true;
GTK/Qt themes
GTK themes can be installed either to user profile or system-wide (via
-system.environmentPackages). To make Qt 5 applications look similar
+environment.systemPackages). To make Qt 5 applications look similar
to GTK2 ones, you can install qt5.qtbase.gtk package into your
system environment. It should work for all Qt 5 library versions.
diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index 21c7a85e19cc..18804d2c08be 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -35,18 +35,7 @@ services.compton = {
To install them manually (system wide), put them into your
environment.systemPackages.
-
-
- NixOS’s default display manager is SLiM.
- (DM is the program that provides a graphical login prompt
- and manages the X server.)
- You can, for example, select KDE’s
- sddm instead:
-
-services.xserver.displayManager.sddm.enable = true;
-
-
-
+
Thunar Volume Support
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 9413d71a34cf..c51c30065a33 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -6,22 +6,52 @@ let
lib = pkgs.lib;
# Remove invisible and internal options.
- optionsList = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options);
+ optionsListVisible = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options);
# Replace functions by the string
substFunction = x:
if builtins.isAttrs x then lib.mapAttrs (name: substFunction) x
else if builtins.isList x then map substFunction x
- else if builtins.isFunction x then ""
+ else if lib.isFunction x then ""
else x;
- # Clean up declaration sites to not refer to the NixOS source tree.
- optionsList' = lib.flip map optionsList (opt: opt // {
+ # Generate DocBook documentation for a list of packages. This is
+ # what `relatedPackages` option of `mkOption` from
+ # ../../../lib/options.nix influences.
+ #
+ # Each element of `relatedPackages` can be either
+ # - a string: that will be interpreted as an attribute name from `pkgs`,
+ # - a list: that will be interpreted as an attribute path from `pkgs`,
+ # - an attrset: that can specify `name`, `path`, `package`, `comment`
+ # (either of `name`, `path` is required, the rest are optional).
+ genRelatedPackages = packages:
+ let
+ unpack = p: if lib.isString p then { name = p; }
+ else if lib.isList p then { path = p; }
+ else p;
+ describe = args:
+ let
+ name = args.name or (lib.concatStringsSep "." args.path);
+ path = args.path or [ args.name ];
+ package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs);
+ in ""
+ + "pkgs.${name} (${package.meta.name})"
+ + lib.optionalString (!package.meta.available) " [UNAVAILABLE]"
+ + ": ${package.meta.description or "???"}."
+ + lib.optionalString (args ? comment) "\n${args.comment}"
+ # Lots of `longDescription's break DocBook, so we just wrap them into
+ + lib.optionalString (package.meta ? longDescription) "\n${package.meta.longDescription}"
+ + "";
+ in "${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}";
+
+ optionsListDesc = lib.flip map optionsListVisible (opt: opt // {
+ # Clean up declaration sites to not refer to the NixOS source tree.
declarations = map stripAnyPrefixes opt.declarations;
}
// lib.optionalAttrs (opt ? example) { example = substFunction opt.example; }
// lib.optionalAttrs (opt ? default) { default = substFunction opt.default; }
- // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; });
+ // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; }
+ // lib.optionalAttrs (opt ? relatedPackages) { relatedPackages = genRelatedPackages opt.relatedPackages; });
# We need to strip references to /nix/store/* from options,
# including any `extraSources` if some modules came from elsewhere,
@@ -32,8 +62,21 @@ let
prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources);
stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip;
+ # Custom "less" that pushes up all the things ending in ".enable*"
+ # and ".package*"
+ optionLess = a: b:
+ let
+ ise = lib.hasPrefix "enable";
+ isp = lib.hasPrefix "package";
+ cmp = lib.splitByAndCompare ise lib.compare
+ (lib.splitByAndCompare isp lib.compare lib.compare);
+ in lib.compareLists cmp a.loc b.loc < 0;
+
+ # Customly sort option list for the man page.
+ optionsList = lib.sort optionLess optionsListDesc;
+
# Convert the list of options into an XML file.
- optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList');
+ optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList);
optionsDocBook = runCommand "options-db.xml" {} ''
optionsXML=${optionsXML}
@@ -44,7 +87,7 @@ let
echo "for hints about the offending path)."
exit 1
fi
- ${libxslt.bin}/bin/xsltproc \
+ ${buildPackages.libxslt.bin}/bin/xsltproc \
--stringparam revision '${revision}' \
-o $out ${./options-to-docbook.xsl} $optionsXML
'';
@@ -96,7 +139,7 @@ let
manual-combined = runCommand "nixos-manual-combined"
{ inherit sources;
- buildInputs = [ libxml2 libxslt ];
+ nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
meta.description = "The NixOS manual as plain docbook XML";
}
''
@@ -106,13 +149,43 @@ let
xmllint --xinclude --noxincludenode \
--output ./man-pages-combined.xml ./man-pages.xml
- xmllint --debug --noout --nonet \
- --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
- manual-combined.xml
- xmllint --debug --noout --nonet \
- --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
- man-pages-combined.xml
+ # outputs the context of an xmllint error output
+ # LEN lines around the failing line are printed
+ function context {
+ # length of context
+ local LEN=6
+ # lines to print before error line
+ local BEFORE=4
+ # xmllint output lines are:
+ # file.xml:1234: there was an error on line 1234
+ while IFS=':' read -r file line rest; do
+ echo
+ if [[ -n "$rest" ]]; then
+ echo "$file:$line:$rest"
+ local FROM=$(($line>$BEFORE ? $line - $BEFORE : 1))
+ # number lines & filter context
+ nl --body-numbering=a "$file" | sed -n "$FROM,+$LEN p"
+ else
+ if [[ -n "$line" ]]; then
+ echo "$file:$line"
+ else
+ echo "$file"
+ fi
+ fi
+ done
+ }
+
+ function lintrng {
+ xmllint --debug --noout --nonet \
+ --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
+ "$1" \
+ 2>&1 | context 1>&2
+ # ^ redirect assumes xmllint doesn’t print to stdout
+ }
+
+ lintrng manual-combined.xml
+ lintrng man-pages-combined.xml
mkdir $out
cp manual-combined.xml $out/
@@ -121,7 +194,7 @@ let
olinkDB = runCommand "manual-olinkdb"
{ inherit sources;
- buildInputs = [ libxml2 libxslt ];
+ nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
}
''
xsltproc \
@@ -161,7 +234,7 @@ in rec {
mkdir -p $dst
cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON
- (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList'))))
+ (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList))))
} $dst/options.json
mkdir -p $out/nix-support
@@ -171,7 +244,7 @@ in rec {
# Generate the NixOS manual.
manual = runCommand "nixos-manual"
{ inherit sources;
- buildInputs = [ libxml2 libxslt ];
+ nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
meta.description = "The NixOS manual in HTML format";
allowedReferences = ["out"];
}
@@ -199,7 +272,7 @@ in rec {
manualEpub = runCommand "nixos-manual-epub"
{ inherit sources;
- buildInputs = [ libxml2 libxslt zip ];
+ buildInputs = [ libxml2.bin libxslt.bin zip ];
}
''
# Generate the epub manual.
@@ -229,7 +302,7 @@ in rec {
# Generate the NixOS manpages.
manpages = runCommand "nixos-manpages"
{ inherit sources;
- buildInputs = [ libxml2 libxslt ];
+ nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
allowedReferences = ["out"];
}
''
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index be793152f9ef..ed718c89eb77 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -22,6 +22,15 @@ options = {
};
+The attribute names within the name
+attribute path must be camel cased in general but should, as an
+exception, match the
+
+package attribute name when referencing a Nixpkgs package. For
+example, the option services.nix-serve.bindAddress
+references the nix-serve Nixpkgs package.
+
The function mkOption accepts the following arguments.
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 83dcf0232d9d..13fa8d1e114c 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -110,6 +110,12 @@
A string. Multiple definitions are concatenated with a
collon ":".
+
+ types.strMatching
+ A string matching a specific regular expression. Multiple
+ definitions cannot be merged. The regular expression is processed using
+ builtins.match.
+
@@ -276,8 +282,8 @@ options.mod = mkOption {
option set ().
-Declaration of a list
- nof submodules
+Declaration of a list
+ of submodules
options.mod = mkOption {
description = "submodule example";
diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml
index 20c8d51815ad..16bc8125d9ff 100644
--- a/nixos/doc/manual/development/testing-installer.xml
+++ b/nixos/doc/manual/development/testing-installer.xml
@@ -11,15 +11,17 @@ tedious, so here is a quick way to see if the installer works
properly:
-$ nix-build -A config.system.build.nixos-install
# mount -t tmpfs none /mnt
+# nixos-generate-config --root /mnt
+$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install
# ./result/bin/nixos-install
To start a login shell in the new NixOS installation in
/mnt:
-# ./result/bin/nixos-install --chroot
+$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter
+# ./result/bin/nixos-enter
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index b9da712b86f0..a8f6aa00858e 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -262,8 +262,47 @@ startAll;
waitForWindow(qr/Terminal/).
+
+ copyFileFromHost
+ Copies a file from host to machine, e.g.,
+ copyFileFromHost("myfile", "/etc/my/important/file").
+ The first argument is the file on the host. The file needs to be
+ accessible while building the nix derivation. The second argument is
+ the location of the file on the machine.
+
+
+
+
+ systemctl
+
+ Runs systemctl commands with optional support for
+ systemctl --user
+
+
+ $machine->systemctl("list-jobs --no-pager"); // runs `systemctl list-jobs --no-pager`
+ $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager`
+
+
+
+
+
-
\ No newline at end of file
+
+ To test user units declared by systemd.user.services the optional $user
+ argument can be used:
+
+
+ $machine->start;
+ $machine->waitForX;
+ $machine->waitForUnit("xautolock.service", "x-session-user");
+
+
+ This applies to systemctl, getUnitInfo,
+ waitForUnit, startJob
+ and stopJob.
+
+
+
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml
index 75df307a1b7c..4db9020b9606 100644
--- a/nixos/doc/manual/installation/changing-config.xml
+++ b/nixos/doc/manual/installation/changing-config.xml
@@ -70,9 +70,21 @@ $ ./result/bin/run-*-vm
The VM does not have any data from your host system, so your existing
-user accounts and home directories will not be available. You can
-forward ports on the host to the guest. For instance, the following
-will forward host port 2222 to guest port 22 (SSH):
+user accounts and home directories will not be available unless you
+have set mutableUsers = false. Another way is to
+temporarily add the following to your configuration:
+
+
+users.extraUsers.your-user.initialPassword = "test"
+
+
+Important: delete the $hostname.qcow2 file if you
+have started the virtual machine at least once without the right
+users, otherwise the changes will not get picked up.
+
+You can forward ports on the host to the guest. For
+instance, the following will forward host port 2222 to guest port 22
+(SSH):
$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
new file mode 100644
index 000000000000..ecd020a067a9
--- /dev/null
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -0,0 +1,309 @@
+
+
+
+ Installing from another Linux distribution
+
+
+ Because Nix (the package manager) & Nixpkgs (the Nix packages
+ collection) can both be installed on any (most?) Linux distributions,
+ they can be used to install NixOS in various creative ways. You can,
+ for instance:
+
+
+
+ Install NixOS on another partition, from your existing
+ Linux distribution (without the use of a USB or optical
+ device!)
+
+ Install NixOS on the same partition (in place!), from
+ your existing non-NixOS Linux distribution using
+ NIXOS_LUSTRATE.
+
+ Install NixOS on your hard drive from the Live CD of
+ any Linux distribution.
+
+
+ The first steps to all these are the same:
+
+
+
+ Install the Nix package manager:
+
+ Short version:
+
+
+$ bash <(curl https://nixos.org/nix/install)
+$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell
+
+ More details in the
+ Nix manual
+
+
+
+ Switch to the NixOS channel:
+
+ If you've just installed Nix on a non-NixOS distribution, you
+ will be on the nixpkgs channel by
+ default.
+
+
+$ nix-channel --list
+nixpkgs https://nixos.org/channels/nixpkgs-unstable
+
+ As that channel gets released without running the NixOS
+ tests, it will be safer to use the nixos-*
+ channels instead:
+
+
+$ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs
+
+ You may want to throw in a nix-channel
+ --update for good measure.
+
+
+
+ Install the NixOS installation tools:
+
+ You'll need nixos-generate-config and
+ nixos-install and we'll throw in some man
+ pages and nixos-enter just in case you want
+ to chroot into your NixOS partition. They are installed by
+ default on NixOS, but you don't have NixOS yet..
+
+ $ nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]"
+
+
+
+ The following 5 steps are only for installing NixOS to
+ another partition. For installing NixOS in place using
+ NIXOS_LUSTRATE, skip ahead.
+
+ Prepare your target partition:
+
+ At this point it is time to prepare your target partition.
+ Please refer to the partitioning, file-system creation, and
+ mounting steps of
+
+ If you're about to install NixOS in place using
+ NIXOS_LUSTRATE there is nothing to do for
+ this step.
+
+
+
+ Generate your NixOS configuration:
+
+ $ sudo `which nixos-generate-config` --root /mnt
+
+ You'll probably want to edit the configuration files. Refer
+ to the nixos-generate-config step in for more information.
+
+ Consider setting up the NixOS bootloader to give you the
+ ability to boot on your existing Linux partition. For instance,
+ if you're using GRUB and your existing distribution is running
+ Ubuntu, you may want to add something like this to your
+ configuration.nix:
+
+
+boot.loader.grub.extraEntries = ''
+ menuentry "Ubuntu" {
+ search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e
+ configfile "($ubuntu)/boot/grub/grub.cfg"
+ }
+'';
+
+ (You can find the appropriate UUID for your partition in
+ /dev/disk/by-uuid)
+
+
+
+ Create the nixbld group and user on your
+ original distribution:
+
+
+$ sudo groupadd -g 30000 nixbld
+$ sudo useradd -u 30000 -g nixbld -G nixbld nixbld
+
+
+
+ Download/build/install NixOS:
+
+ Once you complete this step, you might no longer be
+ able to boot on existing systems without the help of a
+ rescue USB drive or similar.
+
+ $ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt
+
+ Again, please refer to the nixos-install
+ step in for more
+ information.
+
+ That should be it for installation to another partition!
+
+
+
+ Optionally, you may want to clean up your non-NixOS distribution:
+
+
+$ sudo userdel nixbld
+$ sudo groupdel nixbld
+
+ If you do not wish to keep the Nix package mananager
+ installed either, run something like sudo rm -rv
+ ~/.nix-* /nix and remove the line that the Nix
+ installer added to your ~/.profile.
+
+
+
+ The following steps are only for installing NixOS in
+ place using
+ NIXOS_LUSTRATE:
+
+ Generate your NixOS configuration:
+
+ $ sudo `which nixos-generate-config` --root /
+
+ Note that this will place the generated configuration files
+ in /etc/nixos. You'll probably want to edit
+ the configuration files. Refer to the
+ nixos-generate-config step in for more information.
+
+ You'll likely want to set a root password for your first boot
+ using the configuration files because you won't have a chance
+ to enter a password until after you reboot. You can initalize
+ the root password to an empty one with this line: (and of course
+ don't forget to set one once you've rebooted or to lock the
+ account with sudo passwd -l root if you use
+ sudo)
+
+ users.extraUsers.root.initialHashedPassword = "";
+
+
+
+ Build the NixOS closure and install it in the
+ system profile:
+
+ $ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system
+
+
+
+ Change ownership of the /nix tree to root
+ (since your Nix install was probably single user):
+
+ $ sudo chown -R 0.0 /nix
+
+
+
+ Set up the /etc/NIXOS and
+ /etc/NIXOS_LUSTRATE files:
+
+ /etc/NIXOS officializes that this is now a
+ NixOS partition (the bootup scripts require its presence).
+
+ /etc/NIXOS_LUSTRATE tells the NixOS bootup
+ scripts to move everything that's in the
+ root partition to /old-root. This will move
+ your existing distribution out of the way in the very early
+ stages of the NixOS bootup. There are exceptions (we do need to
+ keep NixOS there after all), so the NixOS lustrate process will
+ not touch:
+
+
+ The /nix
+ directory
+
+ The /boot
+ directory
+
+ Any file or directory listed in
+ /etc/NIXOS_LUSTRATE (one per
+ line)
+
+
+ Support for NIXOS_LUSTRATE was added
+ in NixOS 16.09. The act of "lustrating" refers to the
+ wiping of the existing distribution. Creating
+ /etc/NIXOS_LUSTRATE can also be used on
+ NixOS to remove all mutable files from your root partition
+ (anything that's not in /nix or
+ /boot gets "lustrated" on the next
+ boot.
+ lustrate /ˈlʌstreɪt/ verb.
+ purify by expiatory sacrifice, ceremonial washing, or
+ some other ritual action.
+
+ Let's create the files:
+
+
+$ sudo touch /etc/NIXOS
+$ sudo touch /etc/NIXOS_LUSTRATE
+
+ Let's also make sure the NixOS configuration files are kept
+ once we reboot on NixOS:
+
+
+$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE
+
+
+
+ Finally, move the /boot directory of your
+ current distribution out of the way (the lustrate process will
+ take care of the rest once you reboot, but this one must be
+ moved out now because NixOS needs to install its own boot
+ files:
+
+ Once you complete this step, your current
+ distribution will no longer be bootable! If you didn't get
+ all the NixOS configuration right, especially those
+ settings pertaining to boot loading and root partition,
+ NixOS may not be bootable either. Have a USB rescue device
+ ready in case this happens.
+
+
+$ sudo mv -v /boot /boot.bak &&
+ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
+
+ Cross your fingers, reboot, hopefully you should get a NixOS
+ prompt!
+
+
+ If for some reason you want to revert to the old
+ distribution, you'll need to boot on a USB rescue disk and do
+ something along these lines:
+
+
+# mkdir root
+# mount /dev/sdaX root
+# mkdir root/nixos-root
+# mv -v root/* root/nixos-root/
+# mv -v root/nixos-root/old-root/* root/
+# mv -v root/boot.bak root/boot # We had renamed this by hand earlier
+# umount root
+# reboot
+
+ This may work as is or you might also need to reinstall the
+ boot loader
+
+ And of course, if you're happy with NixOS and no longer need
+ the old distribution:
+
+ sudo rm -rf /old-root
+
+
+
+ It's also worth noting that this whole process can be
+ automated. This is especially useful for Cloud VMs, where
+ provider do not provide NixOS. For instance, nixos-infect
+ uses the lustrate process to convert Digital Ocean droplets to
+ NixOS from other distributions automatically.
+
+
+
diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml
deleted file mode 100644
index 0d3eaa8bb1fb..000000000000
--- a/nixos/doc/manual/installation/installing-uefi.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-UEFI Installation
-
-NixOS can also be installed on UEFI systems. The procedure
-is by and large the same as a BIOS installation, with the following
-changes:
-
-
-
- You should boot the live CD in UEFI mode (consult your
- specific hardware's documentation for instructions). You may find
- the rEFInd
- boot manager useful.
-
-
- Instead of fdisk, you should use
- gdisk to partition your disks. You will need to
- have a separate partition for /boot with
- partition code EF00, and it should be formatted as a
- vfat filesystem.
-
-
- Instead of ,
- you must set to
- true. nixos-generate-config
- should do this automatically for new configurations when booted in
- UEFI mode.
-
-
- After having mounted your installation partition to
- /mnt, you must mount the boot partition
- to /mnt/boot.
-
-
- You may want to look at the options starting with
- and
- as well.
-
-
-
-
-
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index 31d51816e39b..122a4745f194 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -11,10 +11,24 @@ a USB stick. You can use the dd utility to write the image:
dd if=path-to-image
of=/dev/sdb. Be careful about specifying the
correct drive; you can use the lsblk command to get a list of
-block devices. If you're on macOS you can run diskutil list
-to see the list of devices; the device you'll use for the USB must be ejected
-before writing the image.
+block devices.
+On macOS:
+
+$ diskutil list
+[..]
+/dev/diskN (external, physical):
+ #: TYPE NAME SIZE IDENTIFIER
+[..]
+$ diskutil unmountDisk diskN
+Unmount of all volumes on diskN was successful
+$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN
+
+Using the 'raw' rdiskN device instead of diskN
+completes in minutes instead of hours. After dd completes, a GUI
+dialog "The disk you inserted was not readable by this computer" will pop up, which
+can be ignored.
+
The dd utility will write the image verbatim to the drive,
making it the recommended option for both UEFI and non-UEFI installations. For
non-UEFI installations, you can alternatively use
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
index ee9680ced397..7fcd22a112cf 100644
--- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml
+++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
@@ -4,18 +4,18 @@
version="5.0"
xml:id="sec-instaling-virtualbox-guest">
-Installing in a Virtualbox guest
+Installing in a VirtualBox guest
- Installing NixOS into a Virtualbox guest is convenient for users who want to
+ Installing NixOS into a VirtualBox guest is convenient for users who want to
try NixOS without installing it on bare metal. If you want to use a pre-made
- Virtualbox appliance, it is available at the downloads page.
- If you want to set up a Virtualbox guest manually, follow these instructions:
+ If you want to set up a VirtualBox guest manually, follow these instructions:
- Add a New Machine in Virtualbox with OS Type "Linux / Other
+ Add a New Machine in VirtualBox with OS Type "Linux / Other
Linux"
Base Memory Size: 768 MB or higher.
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index b0674307a563..e20b6574b725 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -6,9 +6,18 @@
Installing NixOS
+NixOS can be installed on BIOS or UEFI systems. The procedure
+for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow.
+
- Boot from the CD.
+ Boot from the CD.
+
+ UEFI systems
+ You should boot the live CD in UEFI mode
+ (consult your specific hardware's documentation for instructions).
+ You may find the rEFInd boot
+ manager useful.
The CD contains a basic NixOS installation. (It
also contains Memtest86+, useful if you want to test new hardware).
@@ -36,7 +45,10 @@
using ifconfig.
To manually configure the network on the graphical installer,
first disable network-manager with
- systemctl stop network-manager.
+ systemctl stop network-manager.
+ To manually configure the wifi on the minimal installer, run
+ wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' 'key').
+
If you would like to continue the installation from a different
machine you need to activate the SSH daemon via systemctl start sshd.
@@ -50,7 +62,31 @@
For partitioning:
- fdisk.
+ fdisk.
+
+# fdisk /dev/sda # (or whatever device you want to install on)
+-- for UEFI systems only
+> n # (create a new partition for /boot)
+> 3 # (make it a partition number 3)
+> # (press enter to accept the default)
+> +512M # (the size of the UEFI boot partition)
+> t # (change the partition type ...)
+> 3 # (... of the boot partition ...)
+> 1 # (... to 'UEFI System')
+-- for BIOS or UEFI systems
+> n # (create a new partition for /swap)
+> 2 # (make it a partition number 2)
+> # (press enter to accept the default)
+> +8G # (the size of the swap partition, set to whatever you like)
+> n # (create a new partition for /)
+> 1 # (make it a partition number 1)
+> # (press enter to accept the default)
+> # (press enter to accept the default and use the rest of the remaining space)
+> a # (make the partition bootable)
+> x # (enter expert mode)
+> f # (fix up the partition ordering)
+> r # (exit expert mode)
+> w # (write the partition table to disk and exit)
For initialising Ext4 partitions:
mkfs.ext4. It is recommended that you assign a
@@ -67,7 +103,25 @@
For creating swap partitions:
mkswap. Again it’s recommended to assign a
label to the swap partition: .
+ label. For example:
+
+
+# mkswap -L swap /dev/sda2
+
+
+
+
+
+ UEFI systems
+ For creating boot partitions:
+ mkfs.fat. Again it’s recommended to assign a
+ label to the boot partition: . For example:
+
+
+# mkfs.fat -F 32 -L boot /dev/sda3
+
+
For creating LVM volumes, the LVM commands, e.g.,
@@ -95,11 +149,27 @@
+
+
+ UEFI systems
+ Mount the boot file system on /mnt/boot, e.g.
+
+
+# mount /dev/disk/by-label/boot /mnt/boot
+
+
+
+
If your machine has a limited amount of memory, you
may want to activate swap devices now (swapon
device). The installer (or
rather, the build actions that it may spawn) may need quite a bit of
- RAM, depending on your configuration.
+ RAM, depending on your configuration.
+
+
+# swapon /dev/sda2
+
+
@@ -135,10 +205,25 @@
install Emacs by running nix-env -i
emacs.
- You must set the option
+
+
+ BIOS systems
+ You must set the option
to specify on which disk
the GRUB boot loader is to be installed. Without it, NixOS cannot
- boot.
+ boot.
+
+ UEFI systems
+ You must set the option
+ to true.
+ nixos-generate-config should do this automatically for new
+ configurations when booted in
+ UEFI mode.
+ You may want to look at the options starting with
+ and
+ as well.
+
+
If there are other operating systems running on the machine before
installing NixOS, the
@@ -190,11 +275,20 @@ Enter new UNIX password: ***
Retype new UNIX password: ***
+
+
+ To prevent the password prompt, set users.mutableUsers = false; in
+ configuration.nix, which allows unattended installation
+ necessary in automation.
+
+
+
- If everything went well:
+
+ If everything went well:
# reboot
@@ -247,10 +341,34 @@ drive (here /dev/sda). Commands for Installing NixOS on <filename>/dev/sda</filename>
# fdisk /dev/sda # (or whatever device you want to install on)
+-- for UEFI systems only
+> n # (create a new partition for /boot)
+> 3 # (make it a partition number 3)
+> # (press enter to accept the default)
+> +512M # (the size of the UEFI boot partition)
+> t # (change the partition type ...)
+> 3 # (... of the boot partition ...)
+> 1 # (... to 'UEFI System')
+-- for BIOS or UEFI systems
+> n # (create a new partition for /swap)
+> 2 # (make it a partition number 2)
+> # (press enter to accept the default)
+> +8G # (the size of the swap partition)
+> n # (create a new partition for /)
+> 1 # (make it a partition number 1)
+> # (press enter to accept the default)
+> # (press enter to accept the default and use the rest of the remaining space)
+> a # (make the partition bootable)
+> x # (enter expert mode)
+> f # (fix up the partition ordering)
+> r # (exit expert mode)
+> w # (write the partition table to disk and exit)
# mkfs.ext4 -L nixos /dev/sda1
# mkswap -L swap /dev/sda2
# swapon /dev/sda2
+# mkfs.fat -F 32 -L boot /dev/sda3 # (for UEFI systems only)
# mount /dev/disk/by-label/nixos /mnt
+# mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only)
# nixos-generate-config --root /mnt
# nano /mnt/etc/nixos/configuration.nix
# nixos-install
@@ -267,7 +385,8 @@ drive (here /dev/sda). (for BIOS systems only)
+ boot.loader.systemd-boot.enable = true; # (for UEFI systems only)
# Note: setting fileSystems is generally not
# necessary, since nixos-generate-config figures them out
@@ -279,9 +398,9 @@ drive (here /dev/sda).
-
+
diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml
index 20a4838be880..9b2b474c60ce 100644
--- a/nixos/doc/manual/installation/obtaining.xml
+++ b/nixos/doc/manual/installation/obtaining.xml
@@ -12,11 +12,10 @@ download page. There are a number of installation options. If
you happen to have an optical drive and a spare CD, burning the
image to CD and booting from that is probably the easiest option.
Most people will need to prepare a USB stick to boot from.
-Unetbootin is recommended and the process is described in brief below.
-Note that systems which use UEFI require some additional manual steps.
-If you run into difficulty a number of alternative methods are presented
-in the NixOS
+ describes the preferred method
+to prepare a USB stick.
+A number of alternative methods are presented in the NixOS
Wiki.
As an alternative to installing NixOS yourself, you can get a
diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml
new file mode 100644
index 000000000000..a2fbe07961db
--- /dev/null
+++ b/nixos/doc/manual/man-nixos-enter.xml
@@ -0,0 +1,119 @@
+
+
+
+ nixos-enter
+ 8
+ NixOS
+
+
+
+
+ nixos-enter
+ run a command in a NixOS chroot environment
+
+
+
+
+ nixos-enter
+
+
+ root
+
+
+
+ system
+
+
+
+ shell-command
+
+
+
+
+
+
+ arguments
+
+
+
+
+
+Description
+
+This command runs a command in a NixOS chroot environment, that
+is, in a filesystem hierarchy previously prepared using
+nixos-install.
+
+
+
+Options
+
+This command accepts the following options:
+
+
+
+
+
+
+ The path to the NixOS system you want to enter. It defaults to /mnt.
+
+
+
+
+
+
+ The NixOS system configuration to use. It defaults to
+ /nix/var/nix/profiles/system. You can enter
+ a previous NixOS configuration by specifying a path such as
+ /nix/var/nix/profiles/system-106-link.
+
+
+
+
+
+
+
+ The bash command to execute.
+
+
+
+
+
+
+ Interpret the remaining arguments as the program
+ name and arguments to be invoked. The program is not executed in a
+ shell.
+
+
+
+
+
+
+
+
+Examples
+
+Start an interactive shell in the NixOS installation in
+/mnt:
+
+
+# nixos-enter /mnt
+
+
+Run a shell command:
+
+
+# nixos-enter -c 'ls -l /; cat /proc/mounts'
+
+
+Run a non-shell command:
+
+
+# nixos-enter -- cat /proc/mounts
+
+
+
+
+
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 15c603256ca7..c9887146989b 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -26,8 +26,8 @@
root
-
- closure
+
+ path
@@ -118,7 +118,7 @@ it.
-
+
If this option is provided, nixos-install will install the specified closure
rather than attempt to build one from /mnt/etc/nixos/configuration.nix.
diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml
index e945e0e62639..80a8458fbfec 100644
--- a/nixos/doc/manual/man-pages.xml
+++ b/nixos/doc/manual/man-pages.xml
@@ -15,7 +15,7 @@
- 2007-2015
+ 2007-2018
Eelco Dolstra
@@ -25,6 +25,7 @@
+
diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 5387546b5982..7b45b233ab2a 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -70,6 +70,15 @@
+
+
+ Related packages:
+
+
+
+
+
Declared by:
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 5ed56bde6659..b7f9fab44f3b 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -9,6 +9,7 @@
This section lists the release notes for each stable version of NixOS
and current unstable revision.
+
diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml
index 36f67ed88b0b..137caf14cba2 100644
--- a/nixos/doc/manual/release-notes/rl-1404.xml
+++ b/nixos/doc/manual/release-notes/rl-1404.xml
@@ -13,7 +13,7 @@ the following highlights:
Installation on UEFI systems is now supported. See
- for
+ for
details.
Systemd has been updated to version 212, which has
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index b0e29182127e..60c17c60413e 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -20,8 +20,53 @@ has the following highlights:
+ Nix now defaults to 2.0; see its
+ release notes.
+
+
+
+ Linux kernel defaults to the 4.14 branch (it was 4.9).
+
+
+
+
+
+ GCC defaults to 7.x (it was 6.x).
+
+
+
+
+
+ MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes
+ have been made to the infrastructure involved:
+
+
+
+ libmysql has been deprecated, please use mysql.connector-c
+ instead, a compatibility passthru has been added to the MySQL packages.
+
+
+
+
+ The mysql57 package has a new static output containing
+ the static libraries including libmysqld.a
+
+
+
+
+
+
+
+
+ The GNOME version is now 3.26.
+
+
+
+
+ PHP now defaults to PHP 7.2
+
@@ -54,6 +99,11 @@ has the following highlights:
following incompatible changes:
+
+
+ sound.enable now defaults to false.
+
+
Dollar signs in options under are
@@ -72,6 +122,28 @@ following incompatible changes:
.
+
+
+ Package attributes starting with a digit have been prefixed with an
+ underscore sign. This is to avoid quoting in the configuration and
+ other issues with command-line tools like nix-env.
+ The change affects the following packages:
+
+
+ 2048-in-terminal → _2048-in-terminal
+
+
+ 90secondportraits → _90secondportraits
+
+
+ 2bwm → _2bwm
+
+
+ 389-ds-base → _389-ds-base
+
+
+
+
@@ -95,6 +167,198 @@ following incompatible changes:
here.
+
+
+ The openssh package
+ now includes Kerberos support by default;
+ the openssh_with_kerberos package
+ is now a deprecated alias.
+ If you do not want Kerberos support,
+ you can do openssh.override { withKerboros = false; }.
+ Note, this also applies to the openssh_hpn package.
+
+
+
+
+ cc-wrapper has been split in two; there is now also a bintools-wrapper.
+ The most commonly used files in nix-support are now split between the two wrappers.
+ Some commonly used ones, like nix-support/dynamic-linker, are duplicated for backwards compatability, even though they rightly belong only in bintools-wrapper.
+ Other more obscure ones are just moved.
+
+
+
+
+ The propagation logic has been changed.
+ The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual.
+
+ The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what.
+ In practice, that means that many propagatedNativeBuildInputs should instead be propagatedBuildInputs.
+ Thankfully, that was and is the least used type of dependency.
+ Also, it means that some propagatedBuildInputs should instead be depsTargetTargetPropagated.
+ Other types dependencies should be unaffected.
+
+
+
+
+ lib.addPassthru drv passthru is removed. Use lib.extendDerivation true passthru drv instead.
+
+
+
+
+ The memcached service no longer accept dynamic socket
+ paths via . Unix sockets can be
+ still enabled by and
+ will be accessible at /run/memcached/memcached.sock.
+
+
+
+
+ The hardware.amdHybridGraphics.disable option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports.
+
+
+
+
+ The merging of config options for services.postfix.config
+ was buggy. Previously, if other options in the Postfix module like
+ services.postfix.useSrs were set and the user set config
+ options that were also set by such options, the resulting config wouldn't
+ include all options that were needed. They are now merged correctly. If
+ config options need to be overridden, lib.mkForce or
+ lib.mkOverride can be used.
+
+
+
+
+ The following changes apply if the stateVersion is changed to 18.03 or higher.
+ For stateVersion = "17.09" or lower the old behavior is preserved.
+
+
+
+
+ matrix-synapse uses postgresql by default instead of sqlite.
+ Migration instructions can be found here .
+
+
+
+
+
+
+ The jid package has been removed, due to maintenance
+ overhead of a go package having non-versioned dependencies.
+
+
+
+
+ When using (enabled by default in GNOME),
+ it now handles all input devices, not just touchpads. As a result, you might need to
+ re-evaluate any custom Xorg configuration. In particular,
+ Option "XkbRules" "base" may result in broken keyboard layout.
+
+
+
+
+ The attic package was removed. A maintained fork called
+ Borg should be used instead.
+ Migration instructions can be found
+ here.
+
+
+
+
+ The Piwik analytics software was renamed to Matomo:
+
+
+ The package pkgs.piwik was renamed to pkgs.matomo.
+
+
+ The service services.piwik was renamed to services.matomo.
+
+
+
+ The data directory /var/lib/piwik was renamed to /var/lib/matomo.
+ All files will be moved automatically on first startup, but you might need to adjust your backup scripts.
+
+
+
+
+ The default for the nginx configuration changed from
+ piwik.${config.networking.hostName} to
+ matomo.${config.networking.hostName}.${config.networking.domain}
+ if is set,
+ matomo.${config.networking.hostName} if it is not set.
+ If you change your , remember you'll need to update the
+ trustedHosts[] array in /var/lib/matomo/config/config.ini.php
+ as well.
+
+
+
+
+ The piwik user was renamed to matomo.
+ The service will adjust ownership automatically for files in the data directory.
+ If you use unix socket authentication, remember to give the new matomo user
+ access to the database and to change the username to matomo
+ in the [database] section of /var/lib/matomo/config/config.ini.php.
+
+
+
+
+ If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean,
+ but this is neither enforced nor required.
+
+
+
+
+
+
+
+ nodejs-4_x is end-of-life.
+ nodejs-4_x, nodejs-slim-4_x and nodePackages_4_x are removed.
+
+
+
+
+ The pump.io NixOS module was removed.
+ It is now maintained as an
+ external module.
+
+
+
+
+ The Prosody XMPP server has received a major update. The following modules were renamed:
+
+
+
+ is now
+
+
+
+
+ is now
+
+
+
+
+
+
+ Many new modules are now core modules, most notably
+ and .
+
+
+
+ The better-performing libevent backend is now enabled by default.
+
+
+
+ withCommunityModules now passes through the modules to .
+ Use withOnlyInstalledCommunityModules for modules that should not be enabled directly, e.g lib_ldap.
+
+
+
+
+ All prometheus exporter modules are now defined as submodules.
+ The exporters are configured using services.prometheus.exporters.
+
+
@@ -125,10 +389,115 @@ following incompatible changes:
- The option is now none by default.
- An assertion failure is thrown if WM's and DM's default are none.
- To explicitly run a plain X session without and DM or WM, the newly introduced option
- must be set to true.
+ In the module the
+ following options have been removed:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ To assign static addresses to an interface the options
+ and
+ should be used instead.
+ The options and have been
+ renamed to
+ respectively.
+ The new options and
+ have been added to set up static routing.
+
+
+
+
+ The option is now
+ none by default. An assertion failure is thrown if WM's
+ and DM's default are none.
+ To explicitly run a plain X session without and DM or WM, the newly
+ introduced option must be set to true.
+
+
+
+
+ The option is now 127.0.0.1 by default.
+ Previously the default behaviour was to listen on all interfaces.
+
+
+
+
+ services.btrfs.autoScrub has been added, to
+ periodically check btrfs filesystems for data corruption.
+ If there's a correct copy available, it will automatically repair
+ corrupted blocks.
+
+
+
+
+ displayManager.lightdm.greeters.gtk.clock-format.
+ has been added, the clock format string (as expected by
+ strftime, e.g. %H:%M) to use with the lightdm
+ gtk greeter panel.
+
+
+ If set to null the default clock format is used.
+
+
+
+
+ displayManager.lightdm.greeters.gtk.indicators
+ has been added, a list of allowed indicator modules to use with
+ the lightdm gtk greeter panel.
+
+
+ Built-in indicators include ~a11y,
+ ~language, ~session,
+ ~power, ~clock,
+ ~host, ~spacer. Unity
+ indicators can be represented by short name
+ (e.g. sound, power),
+ service file name, or absolute path.
+
+
+ If set to null the default indicators are
+ used.
+
+
+ In order to have the previous default configuration add
+
+ services.xserver.displayManager.lightdm.greeters.gtk.indicators = [
+ "~host" "~spacer"
+ "~clock" "~spacer"
+ "~session"
+ "~language"
+ "~a11y"
+ "~power"
+ ];
+
+ to your configuration.nix.
+
+
+
+
+ The NixOS test driver supports user services declared by systemd.user.services.
+ The methods waitForUnit, getUnitInfo, startJob
+ and stopJob provide an optional $user argument for that purpose.
+
+
+
+
+ Enabling bash completion on NixOS, programs.bash.enableCompletion, will now also enable
+ completion for the Nix command line tools by installing the
+ nix-bash-completions package.
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
new file mode 100644
index 000000000000..959bd86759b1
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -0,0 +1,82 @@
+
+
+Release 18.09 (“Jellyfish”, 2018/09/??)
+
+
+
+Highlights
+
+In addition to numerous new and upgraded packages, this release
+has the following highlights:
+
+
+
+
+ TODO
+
+
+
+
+
+
+
+
+New Services
+
+The following new services were added since the last release:
+
+
+
+
+
+
+
+
+
+
+Backward Incompatibilities
+
+When upgrading from a previous release, please be aware of the
+following incompatible changes:
+
+
+
+
+
+
+
+
+
+
+
+Other Notable Changes
+
+
+
+
+
+
+
+
+
+
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 1a17a080ba45..e14105f5f011 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -3,7 +3,7 @@
let pkgs = import ../.. { inherit system config; }; in
with pkgs.lib;
-with import ../lib/qemu-flags.nix;
+with import ../lib/qemu-flags.nix { inherit pkgs; };
rec {
@@ -51,7 +51,7 @@ rec {
let
interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255);
interfaces = flip map interfacesNumbered ({ fst, snd }:
- nameValuePair "eth${toString snd}" { ip4 =
+ nameValuePair "eth${toString snd}" { ipv4.addresses =
[ { address = "192.168.${toString fst}.${toString m.snd}";
prefixLength = 24;
} ];
@@ -64,7 +64,7 @@ rec {
networking.interfaces = listToAttrs interfaces;
networking.primaryIPAddress =
- optionalString (interfaces != []) (head (head interfaces).value.ip4).address;
+ optionalString (interfaces != []) (head (head interfaces).value.ipv4.addresses).address;
# Put the IP addresses of all VMs in this machine's
# /etc/hosts file. If a machine has multiple
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index bf25e0cab259..ebfb09db7b7e 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -13,10 +13,16 @@
# grafted in the file system at path `target'.
, contents ? []
-, # Whether the disk should be partitioned (with a single partition
- # containing the root filesystem) or contain the root filesystem
- # directly.
- partitioned ? true
+, # Type of partition table to use; either "legacy", "efi", or "none".
+ # For "efi" images, the GPT partition table is used and a mandatory ESP
+ # partition of reasonable size is created in addition to the root partition.
+ # If `installBootLoader` is true, GRUB will be installed in EFI mode.
+ # For "legacy", the msdos partition table is used and a single large root
+ # partition is created. If `installBootLoader` is true, GRUB will be
+ # installed in legacy mode.
+ # For "none", no partition table is created. Enabling `installBootLoader`
+ # most likely fails as GRUB will probably refuse to install.
+ partitionTableType ? "legacy"
# Whether to invoke switch-to-configuration boot during image creation
, installBootLoader ? true
@@ -37,11 +43,15 @@
format ? "raw"
}:
+assert partitionTableType == "legacy" || partitionTableType == "efi" || partitionTableType == "none";
+# We use -E offset=X below, which is only supported by e2fsprogs
+assert partitionTableType != "none" -> fsType == "ext4";
+
with lib;
let format' = format; in let
- format = if (format' == "qcow2-compressed") then "qcow2" else format';
+ format = if format' == "qcow2-compressed" then "qcow2" else format';
compress = optionalString (format' == "qcow2-compressed") "-c";
@@ -51,9 +61,31 @@ let format' = format; in let
raw = "img";
}.${format};
+ rootPartition = { # switch-case
+ legacy = "1";
+ efi = "2";
+ }.${partitionTableType};
+
+ partitionDiskScript = { # switch-case
+ legacy = ''
+ parted --script $diskImage -- \
+ mklabel msdos \
+ mkpart primary ext4 1MiB -1
+ '';
+ efi = ''
+ parted --script $diskImage -- \
+ mklabel gpt \
+ mkpart ESP fat32 8MiB 256MiB \
+ set 1 boot on \
+ mkpart primary ext4 256MiB -1
+ '';
+ none = "";
+ }.${partitionTableType};
+
nixpkgs = cleanSource pkgs.path;
- channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} ''
+ # FIXME: merge with channel.nix / make-channel.nix.
+ channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" {} ''
mkdir -p $out
cp -prd ${nixpkgs} $out/nixos
chmod -R u+w $out/nixos
@@ -61,16 +93,19 @@ let format' = format; in let
ln -s . $out/nixos/nixpkgs
fi
rm -rf $out/nixos/.git
- echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix
+ echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix
'';
- metaClosure = pkgs.writeText "meta" ''
- ${config.system.build.toplevel}
- ${config.nix.package.out}
- ${channelSources}
- '';
-
- prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot config.system.build.nixos-prepare-root ] ++ stdenv.initialPath;
+ binPath = with pkgs; makeBinPath (
+ [ rsync
+ utillinux
+ parted
+ e2fsprogs
+ lkl
+ config.system.build.nixos-install
+ config.system.build.nixos-enter
+ nix
+ ] ++ stdenv.initialPath);
# I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
# image building logic. The comment right below this now appears in 4 different places in nixpkgs :)
@@ -78,21 +113,34 @@ let format' = format; in let
sources = map (x: x.source) contents;
targets = map (x: x.target) contents;
+ closureInfo = pkgs.closureInfo { rootPaths = [ config.system.build.toplevel channelSources ]; };
+
prepareImage = ''
- export PATH=${makeSearchPathOutput "bin" "bin" prepareImageInputs}
+ export PATH=${binPath}
+
+ # Yes, mkfs.ext4 takes different units in different contexts. Fun.
+ sectorsToKilobytes() {
+ echo $(( ( "$1" * 512 ) / 1024 ))
+ }
+
+ sectorsToBytes() {
+ echo $(( "$1" * 512 ))
+ }
mkdir $out
diskImage=nixos.raw
truncate -s ${toString diskSize}M $diskImage
- ${if partitioned then ''
- parted --script $diskImage -- mklabel msdos mkpart primary ext4 1M -1s
- offset=$((2048*512))
- '' else ''
- offset=0
- ''}
+ ${partitionDiskScript}
- mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
+ ${if partitionTableType != "none" then ''
+ # Get start & length of the root partition in sectors to $START and $SECTORS.
+ eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs)
+
+ mkfs.${fsType} -F -L nixos $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K
+ '' else ''
+ mkfs.${fsType} -F -L nixos $diskImage
+ ''}
root="$PWD/root"
mkdir -p $root
@@ -126,17 +174,23 @@ let format' = format; in let
fi
done
- # TODO: Nix really likes to chown things it creates to its current user...
- fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure
+ export HOME=$TMPDIR
+
+ # Provide a Nix database so that nixos-install can copy closures.
+ export NIX_STATE_DIR=$TMPDIR/state
+ nix-store --load-db < ${closureInfo}/registration
+
+ echo "running nixos-install..."
+ nixos-install --root $root --no-bootloader --no-root-passwd \
+ --system ${config.system.build.toplevel} --channel ${channelSources} --substituters ""
echo "copying staging root to image..."
- cptofs ${optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
+ cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* /
'';
in pkgs.vmTools.runInLinuxVM (
pkgs.runCommand name
{ preVM = prepareImage;
- buildInputs = with pkgs; [ utillinux e2fsprogs ];
- exportReferencesGraph = [ "closure" metaClosure ];
+ buildInputs = with pkgs; [ utillinux e2fsprogs dosfstools ];
postVM = ''
${if format == "raw" then ''
mv $diskImage $out/${filename}
@@ -149,13 +203,9 @@ in pkgs.vmTools.runInLinuxVM (
memSize = 1024;
}
''
- ${if partitioned then ''
- . /sys/class/block/vda1/uevent
- mknod /dev/vda1 b $MAJOR $MINOR
- rootDisk=/dev/vda1
- '' else ''
- rootDisk=/dev/vda
- ''}
+ export PATH=${binPath}:$PATH
+
+ rootDisk=${if partitionTableType != "none" then "/dev/vda${rootPartition}" else "/dev/vda"}
# Some tools assume these exist
ln -s vda /dev/xvda
@@ -165,21 +215,22 @@ in pkgs.vmTools.runInLinuxVM (
mkdir $mountPoint
mount $rootDisk $mountPoint
+ # Create the ESP and mount it. Unlike e2fsprogs, mkfs.vfat doesn't support an
+ # '-E offset=X' option, so we can't do this outside the VM.
+ ${optionalString (partitionTableType == "efi") ''
+ mkdir -p /mnt/boot
+ mkfs.vfat -n ESP /dev/vda1
+ mount /dev/vda1 /mnt/boot
+ ''}
+
# Install a configuration.nix
mkdir -p /mnt/etc/nixos
${optionalString (configFile != null) ''
cp ${configFile} /mnt/etc/nixos/configuration.nix
''}
- mount --rbind /dev $mountPoint/dev
- mount --rbind /proc $mountPoint/proc
- mount --rbind /sys $mountPoint/sys
-
# Set up core system link, GRUB, etc.
- NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration boot
-
- # TODO: figure out if I should activate, but for now I won't
- # chroot $mountPoint /nix/var/nix/profiles/system/activate
+ NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot
# The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images
rm -f $mountPoint/etc/machine-id
diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index f06649e1991a..21c69ed560a3 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -10,7 +10,7 @@
pkgs.stdenv.mkDerivation {
name = "ext4-fs.img";
- buildInputs = with pkgs; [e2fsprogs libfaketime perl];
+ nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl];
# For obtaining the closure of `storePaths'.
exportReferencesGraph =
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix
index 75be70dbcb2b..c6bafd48f9db 100644
--- a/nixos/lib/make-iso9660-image.nix
+++ b/nixos/lib/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, pathsFromGraph, xorriso, syslinux
+{ stdenv, perl, closureInfo, xorriso, syslinux
, # The file name of the resulting ISO image.
isoName ? "cd.iso"
@@ -48,9 +48,9 @@ assert usbBootable -> isohybridMbrImage != "";
stdenv.mkDerivation {
name = isoName;
builder = ./make-iso9660-image.sh;
- buildInputs = [perl xorriso syslinux];
+ buildInputs = [ xorriso syslinux ];
- inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable isohybridMbrImage usbBootable;
+ inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable;
# !!! should use XML.
sources = map (x: x.source) contents;
@@ -61,6 +61,5 @@ stdenv.mkDerivation {
symlinks = map (x: x.symlink) storeContents;
# For obtaining the closure of `storeContents'.
- exportReferencesGraph =
- map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
+ closureInfo = closureInfo { rootPaths = map (x: x.object) storeContents; };
}
diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh
index c623436f6c5b..45cdef1ef4df 100644
--- a/nixos/lib/make-iso9660-image.sh
+++ b/nixos/lib/make-iso9660-image.sh
@@ -72,16 +72,15 @@ done
# Add the closures of the top-level store objects.
-storePaths=$(perl $pathsFromGraph closure-*)
-for i in $storePaths; do
+for i in $(< $closureInfo/store-paths); do
addPath "${i:1}" "$i"
done
# Also include a manifest of the closures in a format suitable for
# nix-store --load-db.
-if [ -n "$object" ]; then
- printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
+if [[ ${#objects[*]} != 0 ]]; then
+ cp $closureInfo/registration nix-path-registration
addPath "nix-path-registration" "nix-path-registration"
fi
diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index 4100af27becb..7ab84e47f53b 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -1,4 +1,4 @@
-{ stdenv, squashfsTools, perl, pathsFromGraph
+{ stdenv, squashfsTools, closureInfo
, # The root directory of the squashfs filesystem is filled with the
# closures of the Nix store paths listed here.
@@ -8,23 +8,18 @@
stdenv.mkDerivation {
name = "squashfs.img";
- buildInputs = [perl squashfsTools];
-
- # For obtaining the closure of `storeContents'.
- exportReferencesGraph =
- map (x: [("closure-" + baseNameOf x) x]) storeContents;
+ nativeBuildInputs = [ squashfsTools ];
buildCommand =
''
- # Add the closures of the top-level store objects.
- storePaths=$(perl ${pathsFromGraph} closure-*)
+ closureInfo=${closureInfo { rootPaths = storeContents; }}
# Also include a manifest of the closures in a format suitable
# for nix-store --load-db.
- printRegistration=1 perl ${pathsFromGraph} closure-* > nix-path-registration
+ cp $closureInfo/registration nix-path-registration
# Generate the squashfs image.
- mksquashfs nix-path-registration $storePaths $out \
+ mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \
-keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100%
'';
}
diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix
index de355b08918c..fcdcbf1b0077 100644
--- a/nixos/lib/qemu-flags.nix
+++ b/nixos/lib/qemu-flags.nix
@@ -1,4 +1,5 @@
# QEMU flags shared between various Nix expressions.
+{ pkgs }:
{
@@ -7,4 +8,14 @@
"-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}"
];
+ qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"
+ else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0"
+ else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";
+
+ qemuBinary = qemuPkg: {
+ "i686-linux" = "${qemuPkg}/bin/qemu-kvm";
+ "x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
+ "armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
+ "aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
+ }.${pkgs.stdenv.system} or (throw "Unknown QEMU binary for '${pkgs.stdenv.system}'");
}
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index a7ed5d1faa38..78598b3efb4b 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -146,6 +146,7 @@ sub start {
($self->{allowReboot} ? "" : "-no-reboot ") .
"-monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
"-device virtio-serial -device virtconsole,chardev=shell " .
+ "-device virtio-rng-pci " .
($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || "");
chdir $self->{stateDir} or die;
exec $self->{startCommand};
@@ -361,8 +362,8 @@ sub mustFail {
sub getUnitInfo {
- my ($self, $unit) = @_;
- my ($status, $lines) = $self->execute("systemctl --no-pager show '$unit'");
+ my ($self, $unit, $user) = @_;
+ my ($status, $lines) = $self->systemctl("--no-pager show \"$unit\"", $user);
return undef if $status != 0;
my $info = {};
foreach my $line (split '\n', $lines) {
@@ -372,6 +373,16 @@ sub getUnitInfo {
return $info;
}
+sub systemctl {
+ my ($self, $q, $user) = @_;
+ if ($user) {
+ $q =~ s/'/\\'/g;
+ return $self->execute("su -l $user -c \$'XDG_RUNTIME_DIR=/run/user/`id -u` systemctl --user $q'");
+ }
+
+ return $self->execute("systemctl $q");
+}
+
# Fail if the given systemd unit is not in the "active" state.
sub requireActiveUnit {
my ($self, $unit) = @_;
@@ -386,16 +397,16 @@ sub requireActiveUnit {
# Wait for a systemd unit to reach the "active" state.
sub waitForUnit {
- my ($self, $unit) = @_;
+ my ($self, $unit, $user) = @_;
$self->nest("waiting for unit ‘$unit’", sub {
retry sub {
- my $info = $self->getUnitInfo($unit);
+ my $info = $self->getUnitInfo($unit, $user);
my $state = $info->{ActiveState};
die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed";
if ($state eq "inactive") {
# If there are no pending jobs, then assume this unit
# will never reach active state.
- my ($status, $jobs) = $self->execute("systemctl list-jobs --full 2>&1");
+ my ($status, $jobs) = $self->systemctl("list-jobs --full 2>&1", $user);
if ($jobs =~ /No jobs/) { # FIXME: fragile
# Handle the case where the unit may have started
# between the previous getUnitInfo() and
@@ -429,14 +440,14 @@ sub waitForFile {
}
sub startJob {
- my ($self, $jobName) = @_;
- $self->execute("systemctl start $jobName");
+ my ($self, $jobName, $user) = @_;
+ $self->systemctl("start $jobName", $user);
# FIXME: check result
}
sub stopJob {
- my ($self, $jobName) = @_;
- $self->execute("systemctl stop $jobName");
+ my ($self, $jobName, $user) = @_;
+ $self->systemctl("stop $jobName", $user);
}
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 9339ba78ff0c..d990a5f8b6ac 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -3,7 +3,11 @@
with import ./build-vms.nix { inherit system minimal config; };
with pkgs;
-rec {
+let
+ jquery-ui = callPackage ./testing/jquery-ui.nix { };
+ jquery = callPackage ./testing/jquery.nix { };
+
+in rec {
inherit pkgs;
@@ -29,7 +33,7 @@ rec {
cp ${./test-driver/Logger.pm} $libDir/Logger.pm
wrapProgram $out/bin/nixos-test-driver \
- --prefix PATH : "${lib.makeBinPath [ qemu vde2 netpbm coreutils ]}" \
+ --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \
--prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
'';
};
@@ -78,14 +82,26 @@ rec {
} @ t:
let
- testDriverName = "nixos-test-driver-${name}";
+ # A standard store path to the vm monitor is built like this:
+ # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor
+ # The max filename length of a unix domain socket is 108 bytes.
+ # This means $name can at most be 50 bytes long.
+ maxTestNameLen = 50;
+ testNameLen = builtins.stringLength name;
+
+ testDriverName = with builtins;
+ if testNameLen > maxTestNameLen then
+ abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +
+ "it's currently ${toString testNameLen} characters long.")
+ else
+ "nixos-test-driver-${name}";
nodes = buildVirtualNetwork (
t.nodes or (if t ? machine then { machine = t.machine; } else { }));
testScript' =
# Call the test script with the computed nodes.
- if builtins.isFunction testScript
+ if lib.isFunction testScript
then testScript { inherit nodes; }
else testScript;
@@ -113,8 +129,7 @@ rec {
--add-flags "''${vms[*]}" \
${lib.optionalString enableOCR
"--prefix PATH : '${ocrProg}/bin:${imagemagick}/bin'"} \
- --run "testScript=\"\$(cat $out/test-script)\"" \
- --set testScript '$testScript' \
+ --run "export testScript=\"\$(cat $out/test-script)\"" \
--set VLANS '${toString vlans}'
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
wrapProgram $out/bin/nixos-run-vms \
@@ -132,8 +147,8 @@ rec {
test = passMeta (runTests driver);
report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
- in (if makeCoverageReport then report else test) // {
- inherit nodes driver test;
+ in (if makeCoverageReport then report else test) // {
+ inherit nodes driver test;
};
runInMachine =
diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/nixos/lib/testing/jquery-ui.nix
similarity index 100%
rename from pkgs/development/libraries/javascript/jquery-ui/default.nix
rename to nixos/lib/testing/jquery-ui.nix
diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/nixos/lib/testing/jquery.nix
similarity index 100%
rename from pkgs/development/libraries/javascript/jquery/default.nix
rename to nixos/lib/testing/jquery.nix
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 2e67edf8ee3d..972c04453aef 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -46,7 +46,7 @@ in {
inherit lib config;
inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
- partitioned = config.ec2.hvm;
+ partitionTableType = if config.ec2.hvm then "legacy" else "none";
diskSize = cfg.sizeMB;
configFile = pkgs.writeText "configuration.nix"
''
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index dfc0f8d11465..347e6b9c6e0d 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -18,7 +18,7 @@ rm -f ec2-amis.nix
types="hvm"
stores="ebs"
-regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
+regions="eu-west-1 eu-west-2 eu-west-3 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
for type in $types; do
link=$stateDir/$type
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 46b22fc12854..6bf8c653e113 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -10,7 +10,7 @@ with lib;
i18n = {
glibcLocales = mkOption {
type = types.path;
- default = pkgs.glibcLocales.override {
+ default = pkgs.buildPackages.glibcLocales.override {
allLocales = any (x: x == "all") config.i18n.supportedLocales;
locales = config.i18n.supportedLocales;
};
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 619f36cd5150..4101ef82f3e1 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -290,8 +290,8 @@ in
ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd
''}
- # Make sure resolv.conf is up to date if not managed by systemd
- ${optionalString (!config.services.resolved.enable) ''
+ # Make sure resolv.conf is up to date if not managed manually or by systemd
+ ${optionalString (!config.environment.etc?"resolv.conf") ''
${pkgs.openresolv}/bin/resolvconf -u
''}
'';
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index ae3e17ac27b6..b9d5b2b903e7 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -28,14 +28,15 @@ with lib;
nixpkgs.config.packageOverrides = pkgs: {
dbus = pkgs.dbus.override { x11Support = false; };
- networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; };
- networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; };
- networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; };
- networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; };
- networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
- networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
- networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
- pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; };
+ networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { withGnome = false; };
+ networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; };
+ networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; };
+ networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; };
+ networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; };
+ networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };
+ networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };
+ pinentry = pkgs.pinentry_ncurses;
+ gobjectIntrospection = pkgs.gobjectIntrospection.override { x11Support = false; };
};
};
}
diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index a4a4d6e1a6af..4c37e8a6208c 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -69,9 +69,6 @@ in
config = mkIf cfg.enable {
- # Leftover for old setups, should be set by nixos-generate-config now
- powerManagement.cpuFreqGovernor = mkDefault "ondemand";
-
systemd.targets.post-resume = {
description = "Post-Resume Actions";
requires = [ "post-resume.service" ];
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 8b9c3570476a..a9c5fc75660d 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -45,7 +45,7 @@ let
uid = ids.uids.pulseaudio;
gid = ids.gids.pulseaudio;
- stateDir = "/var/run/pulse";
+ stateDir = "/run/pulse";
# Create pulse/client.conf even if PulseAudio is disabled so
# that we can disable the autospawn feature in programs that
@@ -101,7 +101,8 @@ in {
each user that tries to use the sound system. The server runs
with user privileges. This is the recommended and most secure
way to use PulseAudio. If true, one system-wide PulseAudio
- server is launched on boot, running as the user "pulse".
+ server is launched on boot, running as the user "pulse", and
+ only users in the "audio" group will have access to the server.
Please read the PulseAudio documentation for more details.
'';
};
@@ -219,6 +220,12 @@ in {
{ target = "pulse/daemon.conf";
source = writeText "daemon.conf" (lib.generators.toKeyValue {} cfg.daemon.config); }
+
+ { target = "openal/alsoft.conf";
+ source = writeText "alsoft.conf" "drivers=pulse"; }
+
+ { target = "libao.conf";
+ source = writeText "libao.conf" "default_driver=pulse"; }
];
# Allow PulseAudio to get realtime priority using rtkit.
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 65f2e5d7af99..398660967c52 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -36,7 +36,7 @@ in
default = {};
description = ''
A set of environment variables used in the global environment.
- These variables will be set on shell initialisation.
+ These variables will be set on shell initialisation (e.g. in /etc/profile).
The value of each variable can be either a string or a list of
strings. The latter is concatenated, interspersed with colon
characters.
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index a4715175cc95..11e969b760e0 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -529,6 +529,9 @@ in {
system.activationScripts.users = stringAfter [ "stdio" ]
''
+ install -m 0700 -d /root
+ install -m 0755 -d /home
+
${pkgs.perl}/bin/perl -w \
-I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \
-I${pkgs.perlPackages.JSON}/lib/perl5/site_perl \
@@ -582,13 +585,15 @@ in {
{
environment = {
etc = mapAttrs' (name: { packages, ... }: {
- name = "per-user-pkgs/${name}";
- value.source = pkgs.symlinkJoin {
- name = "per-user-pkgs.${name}";
+ name = "profiles/per-user/${name}";
+ value.source = pkgs.buildEnv {
+ name = "user-environment";
paths = packages;
+ inherit (config.environment) pathsToLink extraOutputsToInstall;
+ inherit (config.system.path) ignoreCollisions postBuild;
};
}) (filterAttrs (_: { packages, ... }: packages != []) cfg.users);
- profiles = ["/etc/per-user-pkgs/$LOGNAME"];
+ profiles = ["/etc/profiles/per-user/$USER"];
};
}
];
diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
index ad41ad4f3d7c..ae1b0a6c8e11 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixos/modules/config/zram.nix
@@ -93,7 +93,7 @@ in
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
- ExecStop = "${pkgs.stdenv.shell} -c 'echo 1 > /sys/class/block/${dev}/reset'";
+ ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/class/block/${dev}/reset'";
};
script = ''
set -u
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index afaa65f6ce35..b61acf1815d9 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -37,8 +37,9 @@ in {
hardware.firmware = with pkgs; [
firmwareLinuxNonfree
intel2200BGFirmware
- rtl8723bs-firmware
rtl8192su-firmware
+ ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
+ rtl8723bs-firmware
];
})
(mkIf cfg.enableAllFirmware {
diff --git a/nixos/modules/hardware/digitalbitbox.nix b/nixos/modules/hardware/digitalbitbox.nix
new file mode 100644
index 000000000000..0888cfbef2a8
--- /dev/null
+++ b/nixos/modules/hardware/digitalbitbox.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.hardware.digitalbitbox;
+in
+
+{
+ options.hardware.digitalbitbox = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enables udev rules for Digital Bitbox devices.
+ '';
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.digitalbitbox;
+ defaultText = "pkgs.digitalbitbox";
+ description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults.";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.udev.packages = [ cfg.package ];
+ };
+}
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index c2c36f02a143..d9646704e6f6 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -34,10 +34,17 @@ in
{
options = {
hardware.opengl.enable = mkOption {
- description = "Whether this configuration requires OpenGL.";
+ description = ''
+ Whether to enable OpenGL drivers. This is needed to enable
+ OpenGL support in X11 systems, as well as for Wayland compositors
+ like sway, way-cooler and Weston. It is enabled by default
+ by the corresponding modules, so you do not usually have to
+ set it yourself, only if there is no module for your wayland
+ compositor of choice. See services.xserver.enable,
+ programs.sway.enable, and programs.way-cooler.enable.
+ '';
type = types.bool;
default = false;
- internal = true;
};
hardware.opengl.driSupport = mkOption {
diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 5cc96d8bd074..50af022b93c8 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -15,13 +15,19 @@ let
opengl = config.hardware.opengl;
+ kernel = pkgs.linux_4_9.override {
+ extraConfig = ''
+ KALLSYMS_ALL y
+ '';
+ };
+
in
{
config = mkIf enabled {
- nixpkgs.config.xorg.abiCompat = "1.18";
+ nixpkgs.config.xorg.abiCompat = "1.19";
services.xserver.drivers = singleton
{ name = "amdgpu"; modules = [ package ]; libPath = [ package ]; };
@@ -31,6 +37,9 @@ in
boot.extraModulePackages = [ package ];
+ boot.kernelPackages =
+ pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor kernel);
+
boot.blacklistedKernelModules = [ "radeon" ];
hardware.firmware = [ package ];
@@ -38,10 +47,15 @@ in
system.activationScripts.setup-amdgpu-pro = ''
mkdir -p /run/lib
ln -sfn ${package}/lib ${package.libCompatDir}
+ ln -sfn ${package} /run/amdgpu-pro
'' + optionalString opengl.driSupport32Bit ''
ln -sfn ${package32}/lib ${package32.libCompatDir}
'';
+ system.requiredKernelConfig = with config.lib.kernelConfig; [
+ (isYes "KALLSYMS_ALL")
+ ];
+
environment.etc = {
"amd/amdrc".source = package + "/etc/amd/amdrc";
"amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb";
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 50c085dd7ee2..eafc9869315a 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -75,10 +75,10 @@ in
# Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
services.udev.extraRules =
''
- KERNEL=="nvidia", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidiactl c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'"
- KERNEL=="nvidia_modeset", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-modeset c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'"
- KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia%n c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'"
- KERNEL=="nvidia_uvm", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
+ KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'"
+ KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'"
+ KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%n c $(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'"
+ KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
'';
boot.blacklistedKernelModules = [ "nouveau" "nvidiafb" ];
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index ddb00f174d1a..4a1983167957 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -12,7 +12,7 @@ let
# CD. These are installed into the "nixos" channel of the root
# user, as expected by nixos-rebuild/nixos-install. FIXME: merge
# with make-channel.nix.
- channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}"
+ channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}"
{ }
''
mkdir -p $out
@@ -21,7 +21,7 @@ let
if [ ! -e $out/nixos/nixpkgs ]; then
ln -s . $out/nixos/nixpkgs
fi
- echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix
+ echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix
'';
in
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 2569860a098f..756c8751d00e 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -16,7 +16,7 @@ with lib;
];
# ISO naming.
- isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosLabel}-${pkgs.stdenv.system}.iso";
+ isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.system}.iso";
isoImage.volumeID = substring 0 11 "NIXOS_ISO";
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 5725938465f5..4c4e69d60d9c 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
@@ -69,7 +69,7 @@ with lib;
in ''
mkdir -p /root/Desktop
ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
- cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
+ cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
chmod a+rx /root/Desktop/gnome-terminal.desktop
cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
chmod a+rx /root/Desktop/gparted.desktop
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index a039f7fdcb6e..e7cbf415a223 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -39,31 +39,31 @@ let
DEFAULT boot
LABEL boot
- MENU LABEL NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel}
- LINUX /boot/bzImage
+ MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}
+ LINUX /boot/${config.system.boot.loader.kernelFile}
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
- INITRD /boot/initrd
+ INITRD /boot/${config.system.boot.loader.initrdFile}
# A variant to boot with 'nomodeset'
LABEL boot-nomodeset
- MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (nomodeset)
- LINUX /boot/bzImage
+ MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (nomodeset)
+ LINUX /boot/${config.system.boot.loader.kernelFile}
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset
- INITRD /boot/initrd
+ INITRD /boot/${config.system.boot.loader.initrdFile}
# A variant to boot with 'copytoram'
LABEL boot-copytoram
- MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (copytoram)
- LINUX /boot/bzImage
+ MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (copytoram)
+ LINUX /boot/${config.system.boot.loader.kernelFile}
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram
- INITRD /boot/initrd
+ INITRD /boot/${config.system.boot.loader.initrdFile}
# A variant to boot with verbose logging to the console
LABEL boot-nomodeset
- MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (debug)
- LINUX /boot/bzImage
+ MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (debug)
+ LINUX /boot/${config.system.boot.loader.kernelFile}
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7
- INITRD /boot/initrd
+ INITRD /boot/${config.system.boot.loader.initrdFile}
'';
isolinuxMemtest86Entry = ''
@@ -82,35 +82,35 @@ let
mkdir -p $out/loader/entries
cat << EOF > $out/loader/entries/nixos-iso.conf
- title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
- linux /boot/bzImage
- initrd /boot/initrd
+ title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}
+ linux /boot/${config.system.boot.loader.kernelFile}
+ initrd /boot/${config.system.boot.loader.initrdFile}
options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
EOF
# A variant to boot with 'nomodeset'
cat << EOF > $out/loader/entries/nixos-iso-nomodeset.conf
- title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
+ title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}
version nomodeset
- linux /boot/bzImage
- initrd /boot/initrd
+ linux /boot/${config.system.boot.loader.kernelFile}
+ initrd /boot/${config.system.boot.loader.initrdFile}
options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset
EOF
# A variant to boot with 'copytoram'
cat << EOF > $out/loader/entries/nixos-iso-copytoram.conf
- title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
+ title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}
version copytoram
- linux /boot/bzImage
- initrd /boot/initrd
+ linux /boot/${config.system.boot.loader.kernelFile}
+ initrd /boot/${config.system.boot.loader.initrdFile}
options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram
EOF
# A variant to boot with verbose logging to the console
cat << EOF > $out/loader/entries/nixos-iso-debug.conf
- title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (debug)
- linux /boot/bzImage
- initrd /boot/initrd
+ title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (debug)
+ linux /boot/${config.system.boot.loader.kernelFile}
+ initrd /boot/${config.system.boot.loader.initrdFile}
options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7
EOF
@@ -127,8 +127,8 @@ let
mkdir ./contents && cd ./contents
cp -rp "${efiDir}"/* .
mkdir ./boot
- cp -p "${config.boot.kernelPackages.kernel}/bzImage" \
- "${config.system.build.initialRamdisk}/initrd" ./boot/
+ cp -p "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}" \
+ "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" ./boot/
touch --date=@0 ./*
usage_size=$(du -sb --apparent-size . | tr -cd '[:digit:]')
@@ -331,8 +331,7 @@ in
config.system.build.toplevel.drvPath;
# Create the squashfs image that contains the Nix store.
- system.build.squashfsStore = import ../../../lib/make-squashfs.nix {
- inherit (pkgs) stdenv squashfsTools perl pathsFromGraph;
+ system.build.squashfsStore = pkgs.callPackage ../../../lib/make-squashfs.nix {
storeContents = config.isoImage.storeContents;
};
@@ -346,11 +345,11 @@ in
};
target = "/isolinux/isolinux.cfg";
}
- { source = config.boot.kernelPackages.kernel + "/bzImage";
- target = "/boot/bzImage";
+ { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
+ target = "/boot/" + config.system.boot.loader.kernelFile;
}
- { source = config.system.build.initialRamdisk + "/initrd";
- target = "/boot/initrd";
+ { source = config.system.build.initialRamdisk + "/" + config.system.boot.loader.initrdFile;
+ target = "/boot/" + config.system.boot.loader.initrdFile;
}
{ source = config.system.build.squashfsStore;
target = "/nix-store.squashfs";
@@ -361,7 +360,7 @@ in
{ source = config.isoImage.splashImage;
target = "/isolinux/background.png";
}
- { source = pkgs.writeText "version" config.system.nixosVersion;
+ { source = pkgs.writeText "version" config.system.nixos.label;
target = "/version.txt";
}
] ++ optionals config.isoImage.makeEfiBootable [
@@ -383,11 +382,8 @@ in
boot.loader.timeout = 10;
# Create the ISO image.
- system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({
- inherit (pkgs) stdenv perl pathsFromGraph xorriso syslinux;
-
+ system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({
inherit (config.isoImage) isoName compressImage volumeID contents;
-
bootable = true;
bootImage = "/isolinux/isolinux.bin";
} // optionalAttrs config.isoImage.makeUsbBootable {
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index efb9ba39bcd4..3306846b7fa7 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -27,6 +27,7 @@ in
boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true;
+ boot.consoleLogLevel = lib.mkDefault 7;
boot.kernelPackages = pkgs.linuxPackages_latest;
# The serial ports listed here are:
@@ -42,8 +43,17 @@ in
populateBootCommands = let
configTxt = pkgs.writeText "config.txt" ''
kernel=u-boot-rpi3.bin
+
+ # Boot in 64-bit mode.
arm_control=0x200
+
+ # U-Boot used to need this to work, regardless of whether UART is actually used or not.
+ # TODO: check when/if this can be removed.
enable_uart=1
+
+ # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
+ # when attempting to show low-voltage or overtemperature warnings.
+ avoid_warnings=1
'';
in ''
(cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 880a6bf2e1e8..08903ba397a1 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -27,6 +27,7 @@ in
boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true;
+ boot.consoleLogLevel = lib.mkDefault 7;
boot.kernelPackages = pkgs.linuxPackages_latest;
# The serial ports listed here are:
# - ttyS0: for Tegra (Jetson TK1)
@@ -42,11 +43,18 @@ in
sdImage = {
populateBootCommands = let
configTxt = pkgs.writeText "config.txt" ''
+ # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
+ # when attempting to show low-voltage or overtemperature warnings.
+ avoid_warnings=1
+
[pi2]
kernel=u-boot-rpi2.bin
[pi3]
kernel=u-boot-rpi3.bin
+
+ # U-Boot used to need this to work, regardless of whether UART is actually used or not.
+ # TODO: check when/if this can be removed.
enable_uart=1
'';
in ''
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index eb676eae05e8..2833b75b84d8 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -27,6 +27,7 @@ in
boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true;
+ boot.consoleLogLevel = lib.mkDefault 7;
boot.kernelPackages = pkgs.linuxPackages_rpi;
# FIXME: this probably should be in installation-device.nix
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index ba84cd51098f..6d4ba96dba0c 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -54,7 +54,7 @@ in
environment.systemPackages =
[ pkgs.w3m # needed for the manual anyway
pkgs.testdisk # useful for repairing boot problems
- pkgs.mssys # for writing Microsoft boot sectors / MBRs
+ pkgs.ms-sys # for writing Microsoft boot sectors / MBRs
pkgs.parted
pkgs.ddrescue
pkgs.ccrypt
diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix
index 1962a1959ead..e72d4a5b4910 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball.nix
@@ -8,7 +8,7 @@ with lib;
let
- versionFile = pkgs.writeText "nixos-version" config.system.nixosVersion;
+ versionFile = pkgs.writeText "nixos-label" config.system.nixos.label;
in
@@ -58,8 +58,8 @@ in
# Individual files to be included on the CD, outside of the Nix
# store on the CD.
tarball.contents =
- [ { source = config.system.build.initialRamdisk + "/initrd";
- target = "/boot/initrd";
+ [ { source = config.system.build.initialRamdisk + "/" + config.system.boot.loader.initrdFile;
+ target = "/boot/" + config.system.boot.loader.initrdFile;
}
{ source = versionFile;
target = "/nixos-version.txt";
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index 0f6046339b37..a4eda3c52dce 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -18,17 +18,17 @@ with lib;
};
- config = {
-
- boot.loader.grub.version = 2;
-
+ config = rec {
# Don't build the GRUB menu builder script, since we don't need it
# here and it causes a cyclic dependency.
boot.loader.grub.enable = false;
# !!! Hack - attributes expected by other modules.
- system.boot.loader.kernelFile = "bzImage";
- environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
+ environment.systemPackages = [ pkgs.grub2_efi ]
+ ++ (if pkgs.stdenv.system == "aarch64-linux"
+ then []
+ else [ pkgs.grub2 pkgs.syslinux ]);
+ system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget;
fileSystems."/" =
{ fsType = "tmpfs";
@@ -67,7 +67,7 @@ with lib;
# Create the squashfs image that contains the Nix store.
system.build.squashfsStore = import ../../../lib/make-squashfs.nix {
- inherit (pkgs) stdenv squashfsTools perl pathsFromGraph;
+ inherit (pkgs) stdenv squashfsTools closureInfo;
storeContents = config.netboot.storeContents;
};
@@ -84,7 +84,12 @@ with lib;
];
};
- system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" "#!ipxe\nkernel bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}\ninitrd initrd\nboot";
+ system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
+ #!ipxe
+ kernel ${pkgs.stdenv.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
+ initrd initrd
+ boot
+ '';
boot.loader.timeout = 10;
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 321fb9a2030a..4774cf39c030 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,6 @@
{
- x86_64-linux = "/nix/store/b4s1gxiis1ryvybnjhdjvgc5sr1nq0ys-nix-1.11.15";
- i686-linux = "/nix/store/kgb5hs7qw13bvb6icramv1ry9dard3h9-nix-1.11.15";
- x86_64-darwin = "/nix/store/dgwz3dxdzs2wwd7pg7cdhvl8rv0qpnbj-nix-1.11.15";
+ x86_64-linux = "/nix/store/6p2gambjac7xdkd2a7w1dsxdk1q5cq4d-nix-2.0";
+ i686-linux = "/nix/store/zznnaijjk3nwx0cmpczxsvngmqzhl7r4-nix-2.0";
+ aarch64-linux = "/nix/store/ci96w9kxfkmlc7x2vwqiz4da0r6abxnq-nix-2.0";
+ x86_64-darwin = "/nix/store/xmi4fylvx4qc79ji9v5q3zfy9vfdy4sv-nix-2.0";
}
diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh
new file mode 100644
index 000000000000..679391189612
--- /dev/null
+++ b/nixos/modules/installer/tools/nixos-enter.sh
@@ -0,0 +1,60 @@
+#! @shell@
+
+set -e
+
+# Re-exec ourselves in a private mount namespace so that our bind
+# mounts get cleaned up automatically.
+if [ -z "$NIXOS_ENTER_REEXEC" ]; then
+ export NIXOS_ENTER_REEXEC=1
+ if [ "$(id -u)" != 0 ]; then
+ extraFlags="-r"
+ fi
+ exec unshare --fork --mount --uts --mount-proc --pid $extraFlags -- "$0" "$@"
+else
+ mount --make-rprivate /
+fi
+
+mountPoint=/mnt
+system=/nix/var/nix/profiles/system
+command=($system/sw/bin/bash "--login")
+
+while [ "$#" -gt 0 ]; do
+ i="$1"; shift 1
+ case "$i" in
+ --root)
+ mountPoint="$1"; shift 1
+ ;;
+ --system)
+ system="$1"; shift 1
+ ;;
+ --help)
+ exec man nixos-enter
+ exit 1
+ ;;
+ --command|-c)
+ command=($system/sw/bin/bash "-c" "$1")
+ shift 1
+ ;;
+ --)
+ command=("$@")
+ break
+ ;;
+ *)
+ echo "$0: unknown option \`$i'"
+ exit 1
+ ;;
+ esac
+done
+
+if [[ ! -e $mountPoint/etc/NIXOS ]]; then
+ echo "$0: '$mountPoint' is not a NixOS installation" >&2
+ exit 126
+fi
+
+mkdir -m 0755 -p "$mountPoint/dev"
+mount --rbind /dev "$mountPoint/dev"
+
+# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
+LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 || true
+
+exec chroot "$mountPoint" "${command[@]}"
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 7c737e84de0a..0e0744a52e42 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -603,6 +603,10 @@ $bootLoaderConfig
# Enable CUPS to print documents.
# services.printing.enable = true;
+ # Enable sound.
+ # sound.enable = true;
+ # hardware.pulseaudio.enable = true;
+
# Enable the X11 windowing system.
# services.xserver.enable = true;
# services.xserver.layout = "us";
@@ -625,7 +629,7 @@ $bootLoaderConfig
# compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you
# should.
- system.stateVersion = "${\(qw(@nixosRelease@))}"; # Did you read the comment?
+ system.stateVersion = "${\(qw(@release@))}"; # Did you read the comment?
}
EOF
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index f994d5b4bde1..22c1e0fe9a34 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -1,35 +1,23 @@
#! @shell@
-# - make Nix store etc.
-# - copy closure of Nix to target device
-# - register validity
-# - with a chroot to the target device:
-# * nix-env -p /nix/var/nix/profiles/system -i
-# * install the boot loader
+set -e
+shopt -s nullglob
+
+export PATH=@path@:$PATH
# Ensure a consistent umask.
umask 0022
-# Re-exec ourselves in a private mount namespace so that our bind
-# mounts get cleaned up automatically.
-if [ "$(id -u)" = 0 ]; then
- if [ -z "$NIXOS_INSTALL_REEXEC" ]; then
- export NIXOS_INSTALL_REEXEC=1
- exec unshare --mount --uts -- "$0" "$@"
- else
- mount --make-rprivate /
- fi
-fi
-
# Parse the command line for the -I flag
extraBuildFlags=()
-chrootCommand=(/run/current-system/sw/bin/bash)
-buildUsersGroup="nixbld"
+
+mountPoint=/mnt
+channelPath=
while [ "$#" -gt 0 ]; do
i="$1"; shift 1
case "$i" in
- --max-jobs|-j|--cores|-I)
+ --max-jobs|-j|--cores|-I|--substituters)
j="$1"; shift 1
extraBuildFlags+=("$i" "$j")
;;
@@ -41,9 +29,11 @@ while [ "$#" -gt 0 ]; do
--root)
mountPoint="$1"; shift 1
;;
- --closure)
- closure="$1"; shift 1
- buildUsersGroup=""
+ --system|--closure)
+ system="$1"; shift 1
+ ;;
+ --channel)
+ channelPath="$1"; shift 1
;;
--no-channel-copy)
noChannelCopy=1
@@ -57,17 +47,13 @@ while [ "$#" -gt 0 ]; do
--show-trace)
extraBuildFlags+=("$i")
;;
- --chroot)
- runChroot=1
- if [[ "$@" != "" ]]; then
- chrootCommand=("$@")
- fi
- break
- ;;
--help)
exec man nixos-install
exit 1
;;
+ --debug)
+ set -x
+ ;;
*)
echo "$0: unknown option \`$i'"
exit 1
@@ -75,132 +61,83 @@ while [ "$#" -gt 0 ]; do
esac
done
-set -e
-shopt -s nullglob
-
-if test -z "$mountPoint"; then
- mountPoint=/mnt
-fi
-
if ! test -e "$mountPoint"; then
echo "mount point $mountPoint doesn't exist"
exit 1
fi
# Get the path of the NixOS configuration file.
-if test -z "$NIXOS_CONFIG"; then
- NIXOS_CONFIG=/etc/nixos/configuration.nix
+if [[ -z $NIXOS_CONFIG ]]; then
+ NIXOS_CONFIG=$mountPoint/etc/nixos/configuration.nix
fi
-if [ ! -e "$mountPoint/$NIXOS_CONFIG" ] && [ -z "$closure" ]; then
- echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist"
+if [[ ${NIXOS_CONFIG:0:1} != / ]]; then
+ echo "$0: \$NIXOS_CONFIG is not an absolute path"
exit 1
fi
-
-# Builds will use users that are members of this group
-extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup")
-
-# Inherit binary caches from the host
-# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not...
-binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')"
-extraBuildFlags+=(--option "binary-caches" "$binary_caches")
-
-# We only need nixpkgs in the path if we don't already have a system closure to install
-if [[ -z "$closure" ]]; then
- nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")"
- export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG"
-fi
-unset NIXOS_CONFIG
-
-# These get created in nixos-prepare-root as well, but we want to make sure they're here in case we're
-# running with --chroot. TODO: --chroot should just be split into a separate tool.
-mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys"
-
-# Set up some bind mounts we'll want regardless of chroot or not
-mount --rbind /dev "$mountPoint/dev"
-mount --rbind /proc "$mountPoint/proc"
-mount --rbind /sys "$mountPoint/sys"
-
-# If we asked for a chroot, that means we're not actually installing anything (yeah I was confused too)
-# and we just want to run a command in the context of a $mountPoint that we're assuming has already been
-# set up by a previous nixos-install invocation. In that case we set up some remaining bind mounts and
-# exec the requested command, skipping the rest of the installation procedure.
-if [ -n "$runChroot" ]; then
- mount -t tmpfs -o "mode=0755" none $mountPoint/run
- rm -rf $mountPoint/var/run
- ln -s /run $mountPoint/var/run
- for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done
- for f in /etc/passwd /etc/group; do touch $mountPoint/$f; [ -f "$f" ] && mount --rbind -o ro $f $mountPoint/$f; done
-
- if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then
- echo "$0: installation not finished; cannot chroot into installation directory"
- exit 1
- fi
- ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system
- exec chroot $mountPoint "${chrootCommand[@]}"
+if [[ ! -e $NIXOS_CONFIG && -z $system ]]; then
+ echo "configuration file $NIXOS_CONFIG doesn't exist"
+ exit 1
fi
-# A place to drop temporary closures
+# A place to drop temporary stuff.
trap "rm -rf $tmpdir" EXIT
tmpdir="$(mktemp -d)"
-# Build a closure (on the host; we then copy it into the guest)
-function closure() {
- nix-build "${extraBuildFlags[@]}" --no-out-link -E "with import {}; runCommand \"closure\" { exportReferencesGraph = [ \"x\" (buildEnv { name = \"env\"; paths = [ ($1) stdenv ]; }) ]; } \"cp x \$out\""
-}
+sub="auto?trusted=1"
-system_closure="$tmpdir/system.closure"
-# Use a FIFO for piping nix-store --export into nix-store --import, saving disk
-# I/O and space. nix-store --import is run by nixos-prepare-root.
-mkfifo $system_closure
-
-if [ -z "$closure" ]; then
- expr="(import {}).system"
- system_root="$(nix-build -E "$expr")"
- system_closure="$(closure "$expr")"
-else
- system_root=$closure
- # Create a temporary file ending in .closure (so nixos-prepare-root knows to --import it) to transport the store closure
- # to the filesytem we're preparing. Also delete it on exit!
- # Run in background to avoid blocking while trying to write to the FIFO
- # $system_closure refers to
- nix-store --export $(nix-store -qR $closure) > $system_closure &
+# Build the system configuration in the target filesystem.
+if [[ -z $system ]]; then
+ echo "building the configuration in $NIXOS_CONFIG..."
+ outLink="$tmpdir/system"
+ nix build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \
+ --extra-substituters "$sub" \
+ -f '' system -I "nixos-config=$NIXOS_CONFIG"
+ system=$(readlink -f $outLink)
fi
-channel_root="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")"
-channel_closure="$tmpdir/channel.closure"
-nix-store --export $channel_root > $channel_closure
+# Set the system profile to point to the configuration. TODO: combine
+# this with the previous step once we have a nix-env replacement with
+# a progress bar.
+nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \
+ --extra-substituters "$sub" \
+ -p $mountPoint/nix/var/nix/profiles/system --set "$system"
-# Populate the target root directory with the basics
-@prepare_root@/bin/nixos-prepare-root "$mountPoint" "$channel_root" "$system_root" @nixClosure@ "$system_closure" "$channel_closure"
+# Copy the NixOS/Nixpkgs sources to the target as the initial contents
+# of the NixOS channel.
+if [[ -z $noChannelCopy ]]; then
+ if [[ -z $channelPath ]]; then
+ channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")"
+ fi
+ if [[ -n $channelPath ]]; then
+ echo "copying channel..."
+ mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root
+ nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \
+ -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet
+ install -m 0700 -d $mountPoint/root/.nix-defexpr
+ ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
+ fi
+fi
-# nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead
-chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store
-
-
-
-# Grub needs an mtab.
-ln -sfn /proc/mounts $mountPoint/etc/mtab
+# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out.
+mkdir -m 0755 -p "$mountPoint/etc"
+touch "$mountPoint/etc/NIXOS"
# Switch to the new system configuration. This will install Grub with
# a menu default pointing at the kernel/initrd/etc of the new
# configuration.
-echo "finalising the installation..."
-if [ -z "$noBootLoader" ]; then
- NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint \
- /nix/var/nix/profiles/system/bin/switch-to-configuration boot
+if [[ -z $noBootLoader ]]; then
+ echo "installing the boot loader..."
+ # Grub needs an mtab.
+ ln -sfn /proc/mounts $mountPoint/etc/mtab
+ NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot
fi
-# Run the activation script.
-chroot $mountPoint /nix/var/nix/profiles/system/activate
-
-
-# Ask the user to set a root password.
-if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /run/wrappers/bin/passwd ] && [ -t 0 ]; then
- echo "setting root password..."
- chroot $mountPoint /run/wrappers/bin/passwd
+# Ask the user to set a root password, but only if the passwd command
+# exists (i.e. when mutable user accounts are enabled).
+if [[ -z $noRootPasswd ]] && [ -t 0 ]; then
+ nixos-enter --root "$mountPoint" -c '[[ -e /nix/var/nix/profiles/system/sw/bin/passwd ]] && echo "setting root password..." && /nix/var/nix/profiles/system/sw/bin/passwd'
fi
-
echo "installation finished!"
diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh
deleted file mode 100644
index ed5af234fec9..000000000000
--- a/nixos/modules/installer/tools/nixos-prepare-root.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#! @shell@
-
-# This script's goal is to perform all "static" setup of a filesystem structure from pre-built store paths. Everything
-# in here should run in a non-root context and inside a Nix builder. It's designed primarily to be called from image-
-# building scripts and from nixos-install, but because it makes very few assumptions about the context in which it runs,
-# it could be useful in other contexts as well.
-#
-# Current behavior:
-# - set up basic filesystem structure
-# - make Nix store etc.
-# - copy Nix, system, channel, and misceallaneous closures to target Nix store
-# - register validity of all paths in the target store
-# - set up channel and system profiles
-
-# Ensure a consistent umask.
-umask 0022
-
-set -e
-
-mountPoint="$1"
-channel="$2"
-system="$3"
-shift 3
-closures="$@"
-
-PATH="@coreutils@/bin:@nix@/bin:@perl@/bin:@utillinux@/bin:@rsync@/bin"
-
-if ! test -e "$mountPoint"; then
- echo "mount point $mountPoint doesn't exist"
- exit 1
-fi
-
-# Create a few of the standard directories in the target root directory.
-install -m 0755 -d $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
-install -m 01777 -d $mountPoint/tmp
-install -m 0755 -d $mountPoint/tmp/root
-install -m 0755 -d $mountPoint/var
-install -m 0700 -d $mountPoint/root
-
-ln -sf /run $mountPoint/var/run
-
-# Create the necessary Nix directories on the target device
-install -m 0755 -d \
- $mountPoint/nix/var/nix/gcroots \
- $mountPoint/nix/var/nix/temproots \
- $mountPoint/nix/var/nix/userpool \
- $mountPoint/nix/var/nix/profiles \
- $mountPoint/nix/var/nix/db \
- $mountPoint/nix/var/log/nix/drvs
-
-install -m 1775 -d $mountPoint/nix/store
-
-# All Nix operations below should operate on our target store, not /nix/store.
-# N.B: this relies on Nix 1.12 or higher
-export NIX_REMOTE=local?root=$mountPoint
-
-# Copy our closures to the Nix store on the target mount point, unless they're already there.
-for i in $closures; do
- # We support closures both in the format produced by `nix-store --export` and by `exportReferencesGraph`,
- # mostly because there doesn't seem to be a single format that can be produced outside of a nix build and
- # inside one. See https://github.com/NixOS/nix/issues/1242 for more discussion.
- if [[ "$i" =~ \.closure$ ]]; then
- echo "importing serialized closure $i to $mountPoint..."
- nix-store --import < $i
- else
- # There has to be a better way to do this, right?
- echo "copying closure $i to $mountPoint..."
- for j in $(perl @pathsFromGraph@ $i); do
- echo " $j... "
- rsync -a $j $mountPoint/nix/store/
- done
-
- nix-store --option build-users-group root --register-validity < $i
- fi
-done
-
-# Create the required /bin/sh symlink; otherwise lots of things
-# (notably the system() function) won't work.
-if [ ! -x $mountPoint/@shell@ ]; then
- echo "Error: @shell@ wasn't included in the closure" >&2
- exit 1
-fi
-install -m 0755 -d $mountPoint/bin
-ln -sf @shell@ $mountPoint/bin/sh
-
-echo "setting the system closure to '$system'..."
-nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set "$system"
-
-ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system
-
-# Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel.
-install -m 0755 -d $mountPoint/nix/var/nix/profiles
-install -m 1777 -d $mountPoint/nix/var/nix/profiles/per-user
-install -m 0755 -d $mountPoint/nix/var/nix/profiles/per-user/root
-
-if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then
- echo "copying channel..."
- nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet
-fi
-install -m 0700 -d $mountPoint/root/.nix-defexpr
-ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
-
-# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out.
-touch $mountPoint/etc/NIXOS
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 9ede74a54cd7..2af73519bc52 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -382,6 +382,6 @@ fi
if [ "$action" = build-vm ]; then
cat >&2 <system.nixos.tags separated by
+ "-" + "-" + NIXOS_LABEL_VERSION environment
+ variable (defaults to the value of
+ ).
+
+ Can be overriden by setting NIXOS_LABEL.
+
+ Useful for not loosing track of configurations built from different
+ nixos branches/revisions, e.g.:
+
+
+ #!/bin/sh
+ today=`date +%Y%m%d`
+ branch=`(cd nixpkgs ; git branch 2>/dev/null | sed -n '/^\* / { s|^\* ||; p; }')`
+ revision=`(cd nixpkgs ; git rev-parse HEAD)`
+ export NIXOS_LABEL_VERSION="$today.$branch-''${revision:0:7}"
+ nixos-rebuild switch
+ '';
+ };
+
+ nixos.tags = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "with-xen" ];
+ description = ''
+ Strings to prefix to the default
+ .
+
+ Useful for not loosing track of configurations built with
+ different options, e.g.:
+
+
+ {
+ system.nixos.tags = [ "with-xen" ];
+ virtualisation.xen.enable = true;
+ }
+
+ '';
+ };
+
+ };
+
+ config = {
+ # This is set here rather than up there so that changing it would
+ # not rebuild the manual
+ system.nixos.label = mkDefault (maybeEnv "NIXOS_LABEL"
+ (concatStringsSep "-" ((sort (x: y: x < y) cfg.tags)
+ ++ [ (maybeEnv "NIXOS_LABEL_VERSION" cfg.version) ])));
+ };
+
+}
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 1793c1447d60..9217250eec29 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -3,11 +3,13 @@
with lib;
let
+ cfg = config.nixpkgs;
+
isConfig = x:
- builtins.isAttrs x || builtins.isFunction x;
+ builtins.isAttrs x || lib.isFunction x;
optCall = f: x:
- if builtins.isFunction f
+ if lib.isFunction f
then f x
else f;
@@ -38,27 +40,68 @@ let
overlayType = mkOptionType {
name = "nixpkgs-overlay";
description = "nixpkgs overlay";
- check = builtins.isFunction;
+ check = lib.isFunction;
merge = lib.mergeOneOption;
};
- _pkgs = import ../../.. config.nixpkgs;
+ pkgsType = mkOptionType {
+ name = "nixpkgs";
+ description = "An evaluation of Nixpkgs; the top level attribute set of packages";
+ check = builtins.isAttrs;
+ };
in
{
options.nixpkgs = {
+
+ pkgs = mkOption {
+ defaultText = literalExample
+ ''import "''${nixos}/.." {
+ inherit (config.nixpkgs) config overlays system;
+ }
+ '';
+ default = import ../../.. { inherit (cfg) config overlays system crossSystem; };
+ type = pkgsType;
+ example = literalExample ''import {}'';
+ description = ''
+ This is the evaluation of Nixpkgs that will be provided to
+ all NixOS modules. Defining this option has the effect of
+ ignoring the other options that would otherwise be used to
+ evaluate Nixpkgs, because those are arguments to the default
+ value. The default value imports the Nixpkgs source files
+ relative to the location of this NixOS module, because
+ NixOS and Nixpkgs are distributed together for consistency,
+ so the nixos in the default value is in fact a
+ relative path. The config, overlays
+ and system come from this option's siblings.
+
+ This option can be used by applications like NixOps to increase
+ the performance of evaluation, or to create packages that depend
+ on a container that should be built with the exact same evaluation
+ of Nixpkgs, for example. Applications like this should set
+ their default value using lib.mkDefault, so
+ user-provided configuration can override it without using
+ lib.
+
+ Note that using a distinct version of Nixpkgs with NixOS may
+ be an unexpected source of problems. Use this option with care.
+ '';
+ };
+
config = mkOption {
default = {};
example = literalExample
''
- { firefox.enableGeckoMediaPlayer = true; }
+ { allowBroken = true; allowUnfree = true; }
'';
type = configType;
description = ''
The configuration of the Nix Packages collection. (For
details, see the Nixpkgs documentation.) It allows you to set
package configuration options.
+
+ Ignored when nixpkgs.pkgs is set.
'';
};
@@ -69,7 +112,6 @@ in
[ (self: super: {
openssh = super.openssh.override {
hpnSupport = true;
- withKerberos = true;
kerberos = self.libkrb5;
};
};
@@ -83,6 +125,20 @@ in
takes as an argument the original Nixpkgs.
The first argument should be used for finding dependencies, and
the second should be used for overriding recipes.
+
+ Ignored when nixpkgs.pkgs is set.
+ '';
+ };
+
+ crossSystem = mkOption {
+ type = types.nullOr types.attrs;
+ default = null;
+ description = ''
+ The description of the system we're cross-compiling to, or null
+ if this isn't a cross-compile. See the description of the
+ crossSystem argument in the nixpkgs manual.
+
+ Ignored when nixpkgs.pkgs is set.
'';
};
@@ -94,14 +150,16 @@ in
If unset, it defaults to the platform type of your host system.
Specifying this option is useful when doing distributed
multi-platform deployment, or when building virtual machines.
+
+ Ignored when nixpkgs.pkgs is set.
'';
};
};
config = {
_module.args = {
- pkgs = _pkgs;
- pkgs_i686 = _pkgs.pkgsi686Linux;
+ pkgs = cfg.pkgs;
+ pkgs_i686 = cfg.pkgs.pkgsi686Linux;
};
};
}
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 48cde2ebbc8a..b8f0a223c910 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -3,7 +3,7 @@
with lib;
let
- cfg = config.system;
+ cfg = config.system.nixos;
releaseFile = "${toString pkgs.path}/.version";
suffixFile = "${toString pkgs.path}/.version-suffix";
@@ -16,9 +16,44 @@ in
options.system = {
+ nixos.version = mkOption {
+ internal = true;
+ type = types.str;
+ description = "The full NixOS version (e.g. 16.03.1160.f2d4ee1).";
+ };
+
+ nixos.release = mkOption {
+ readOnly = true;
+ type = types.str;
+ default = fileContents releaseFile;
+ description = "The NixOS release (e.g. 16.03).";
+ };
+
+ nixos.versionSuffix = mkOption {
+ internal = true;
+ type = types.str;
+ default = if pathExists suffixFile then fileContents suffixFile else "pre-git";
+ description = "The NixOS version suffix (e.g. 1160.f2d4ee1).";
+ };
+
+ nixos.revision = mkOption {
+ internal = true;
+ type = types.str;
+ default = if pathIsDirectory gitRepo then commitIdFromGitRepo gitRepo
+ else if pathExists revisionFile then fileContents revisionFile
+ else "master";
+ description = "The Git revision from which this NixOS configuration was built.";
+ };
+
+ nixos.codeName = mkOption {
+ readOnly = true;
+ type = types.str;
+ description = "The NixOS release code name (e.g. Emu).";
+ };
+
stateVersion = mkOption {
type = types.str;
- default = cfg.nixosRelease;
+ default = cfg.release;
description = ''
Every once in a while, a new NixOS release may change
configuration defaults in a way incompatible with stateful
@@ -32,49 +67,6 @@ in
'';
};
- nixosLabel = mkOption {
- type = types.str;
- description = ''
- Label to be used in the names of generated outputs and boot
- labels.
- '';
- };
-
- nixosVersion = mkOption {
- internal = true;
- type = types.str;
- description = "The full NixOS version (e.g. 16.03.1160.f2d4ee1).";
- };
-
- nixosRelease = mkOption {
- readOnly = true;
- type = types.str;
- default = fileContents releaseFile;
- description = "The NixOS release (e.g. 16.03).";
- };
-
- nixosVersionSuffix = mkOption {
- internal = true;
- type = types.str;
- default = if pathExists suffixFile then fileContents suffixFile else "pre-git";
- description = "The NixOS version suffix (e.g. 1160.f2d4ee1).";
- };
-
- nixosRevision = mkOption {
- internal = true;
- type = types.str;
- default = if pathIsDirectory gitRepo then commitIdFromGitRepo gitRepo
- else if pathExists revisionFile then fileContents revisionFile
- else "master";
- description = "The Git revision from which this NixOS configuration was built.";
- };
-
- nixosCodeName = mkOption {
- readOnly = true;
- type = types.str;
- description = "The NixOS release code name (e.g. Emu).";
- };
-
defaultChannel = mkOption {
internal = true;
type = types.str;
@@ -86,16 +78,15 @@ in
config = {
- system = {
+ system.nixos = {
# These defaults are set here rather than up there so that
# changing them would not rebuild the manual
- nixosLabel = mkDefault cfg.nixosVersion;
- nixosVersion = mkDefault (cfg.nixosRelease + cfg.nixosVersionSuffix);
- nixosRevision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId);
- nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
+ version = mkDefault (cfg.release + cfg.versionSuffix);
+ revision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId);
+ versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
- # Note: code names must only increase in alphabetical order.
- nixosCodeName = "Impala";
+ # Note: the first letter is bumped on every release. It's an animal.
+ codeName = "Jellyfish";
};
# Generate /etc/os-release. See
@@ -105,10 +96,10 @@ in
''
NAME=NixOS
ID=nixos
- VERSION="${config.system.nixosVersion} (${config.system.nixosCodeName})"
- VERSION_CODENAME=${toLower config.system.nixosCodeName}
- VERSION_ID="${config.system.nixosVersion}"
- PRETTY_NAME="NixOS ${config.system.nixosVersion} (${config.system.nixosCodeName})"
+ VERSION="${cfg.version} (${cfg.codeName})"
+ VERSION_CODENAME=${toLower cfg.codeName}
+ VERSION_ID="${cfg.version}"
+ PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})"
HOME_URL="https://nixos.org/"
SUPPORT_URL="https://nixos.org/nixos/support.html"
BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d63606489649..d47600fbc61a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -31,6 +31,7 @@
./hardware/ckb.nix
./hardware/cpu/amd-microcode.nix
./hardware/cpu/intel-microcode.nix
+ ./hardware/digitalbitbox.nix
./hardware/sensor/iio.nix
./hardware/ksm.nix
./hardware/mcelog.nix
@@ -60,6 +61,7 @@
./misc/extra-arguments.nix
./misc/ids.nix
./misc/lib.nix
+ ./misc/label.nix
./misc/locate.nix
./misc/meta.nix
./misc/nixpkgs.nix
@@ -71,10 +73,13 @@
./programs/bcc.nix
./programs/blcr.nix
./programs/browserpass.nix
+ ./programs/ccache.nix
./programs/cdemu.nix
./programs/chromium.nix
./programs/command-not-found/command-not-found.nix
+ ./programs/criu.nix
./programs/dconf.nix
+ ./programs/digitalbitbox/default.nix
./programs/environment.nix
./programs/fish.nix
./programs/freetds.nix
@@ -83,6 +88,7 @@
./programs/info.nix
./programs/java.nix
./programs/kbdlight.nix
+ ./programs/less.nix
./programs/light.nix
./programs/man.nix
./programs/mosh.nix
@@ -90,25 +96,33 @@
./programs/nano.nix
./programs/npm.nix
./programs/oblogout.nix
+ ./programs/plotinus.nix
./programs/qt5ct.nix
+ ./programs/rootston.nix
./programs/screen.nix
./programs/slock.nix
./programs/shadow.nix
./programs/shell.nix
./programs/spacefm.nix
+ ./programs/singularity.nix
./programs/ssh.nix
./programs/ssmtp.nix
./programs/sysdig.nix
+ ./programs/systemtap.nix
./programs/sway.nix
./programs/thefuck.nix
./programs/tmux.nix
+ ./programs/udevil.nix
./programs/venus.nix
./programs/vim.nix
+ ./programs/way-cooler.nix
./programs/wireshark.nix
./programs/xfs_quota.nix
./programs/xonsh.nix
+ ./programs/yabar.nix
./programs/zsh/oh-my-zsh.nix
./programs/zsh/zsh.nix
+ ./programs/zsh/zsh-autoenv.nix
./programs/zsh/zsh-syntax-highlighting.nix
./rename.nix
./security/acme.nix
@@ -146,7 +160,9 @@
./services/audio/ympd.nix
./services/backup/almir.nix
./services/backup/bacula.nix
+ ./services/backup/borgbackup.nix
./services/backup/crashplan.nix
+ ./services/backup/crashplan-small-business.nix
./services/backup/mysql-backup.nix
./services/backup/postgresql-backup.nix
./services/backup/rsnapshot.nix
@@ -196,7 +212,9 @@
./services/desktops/dleyna-renderer.nix
./services/desktops/dleyna-server.nix
./services/desktops/geoclue2.nix
+ ./services/desktops/pipewire.nix
./services/desktops/gnome3/at-spi2-core.nix
+ ./services/desktops/gnome3/chrome-gnome-shell.nix
./services/desktops/gnome3/evolution-data-server.nix
./services/desktops/gnome3/gnome-disks.nix
./services/desktops/gnome3/gnome-documents.nix
@@ -210,22 +228,22 @@
./services/desktops/gnome3/seahorse.nix
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
+ ./services/desktops/gnome3/tracker-miners.nix
./services/desktops/profile-sync-daemon.nix
./services/desktops/telepathy.nix
./services/development/hoogle.nix
./services/editors/emacs.nix
./services/editors/infinoted.nix
./services/games/factorio.nix
- ./services/games/ghost-one.nix
./services/games/minecraft-server.nix
./services/games/minetest-server.nix
./services/games/terraria.nix
./services/hardware/acpid.nix
./services/hardware/actkbd.nix
- ./services/hardware/amd-hybrid-graphics.nix
./services/hardware/bluetooth.nix
./services/hardware/brltty.nix
./services/hardware/freefall.nix
+ ./services/hardware/fwupd.nix
./services/hardware/illum.nix
./services/hardware/interception-tools.nix
./services/hardware/irqbalance.nix
@@ -233,13 +251,16 @@
./services/hardware/pcscd.nix
./services/hardware/pommed.nix
./services/hardware/sane.nix
+ ./services/hardware/sane_extra_backends/brscan4.nix
./services/hardware/tcsd.nix
./services/hardware/tlp.nix
./services/hardware/thinkfan.nix
./services/hardware/trezord.nix
+ ./services/hardware/u2f.nix
./services/hardware/udev.nix
./services/hardware/udisks2.nix
./services/hardware/upower.nix
+ ./services/hardware/usbmuxd.nix
./services/hardware/thermald.nix
./services/logging/SystemdJournal2Gelf.nix
./services/logging/awstats.nix
@@ -255,6 +276,8 @@
./services/logging/rsyslogd.nix
./services/logging/syslog-ng.nix
./services/logging/syslogd.nix
+ ./services/mail/clamsmtp.nix
+ ./services/mail/dkimproxy-out.nix
./services/mail/dovecot.nix
./services/mail/dspam.nix
./services/mail/exim.nix
@@ -306,6 +329,7 @@
./services/misc/gogs.nix
./services/misc/gollum.nix
./services/misc/gpsd.nix
+ ./services/misc/home-assistant.nix
./services/misc/ihaskell.nix
./services/misc/irkerd.nix
./services/misc/jackett.nix
@@ -324,8 +348,10 @@
./services/misc/nix-optimise.nix
./services/misc/nixos-manual.nix
./services/misc/nix-ssh-serve.nix
+ ./services/misc/novacomd.nix
./services/misc/nzbget.nix
./services/misc/octoprint.nix
+ ./services/misc/osrm.nix
./services/misc/packagekit.nix
./services/misc/parsoid.nix
./services/misc/phd.nix
@@ -337,6 +363,7 @@
./services/misc/rippled.nix
./services/misc/ripple-data-api.nix
./services/misc/rogue.nix
+ ./services/misc/serviio.nix
./services/misc/siproxd.nix
./services/misc/snapper.nix
./services/misc/sonarr.nix
@@ -350,6 +377,7 @@
./services/misc/taskserver
./services/misc/tzupdate.nix
./services/misc/uhub.nix
+ ./services/misc/xmr-stak.nix
./services/misc/zookeeper.nix
./services/monitoring/apcupsd.nix
./services/monitoring/arbtt.nix
@@ -371,16 +399,7 @@
./services/monitoring/osquery.nix
./services/monitoring/prometheus/default.nix
./services/monitoring/prometheus/alertmanager.nix
- ./services/monitoring/prometheus/blackbox-exporter.nix
- ./services/monitoring/prometheus/collectd-exporter.nix
- ./services/monitoring/prometheus/fritzbox-exporter.nix
- ./services/monitoring/prometheus/json-exporter.nix
- ./services/monitoring/prometheus/minio-exporter.nix
- ./services/monitoring/prometheus/nginx-exporter.nix
- ./services/monitoring/prometheus/node-exporter.nix
- ./services/monitoring/prometheus/snmp-exporter.nix
- ./services/monitoring/prometheus/unifi-exporter.nix
- ./services/monitoring/prometheus/varnish-exporter.nix
+ ./services/monitoring/prometheus/exporters.nix
./services/monitoring/riemann.nix
./services/monitoring/riemann-dash.nix
./services/monitoring/riemann-tools.nix
@@ -396,14 +415,17 @@
./services/monitoring/vnstat.nix
./services/monitoring/zabbix-agent.nix
./services/monitoring/zabbix-server.nix
+ ./services/network-filesystems/beegfs.nix
./services/network-filesystems/cachefilesd.nix
+ ./services/network-filesystems/davfs2.nix
./services/network-filesystems/drbd.nix
./services/network-filesystems/glusterfs.nix
./services/network-filesystems/kbfs.nix
./services/network-filesystems/ipfs.nix
./services/network-filesystems/netatalk.nix
./services/network-filesystems/nfsd.nix
- ./services/network-filesystems/openafs-client/default.nix
+ ./services/network-filesystems/openafs/client.nix
+ ./services/network-filesystems/openafs/server.nix
./services/network-filesystems/rsyncd.nix
./services/network-filesystems/samba.nix
./services/network-filesystems/tahoe.nix
@@ -411,7 +433,9 @@
./services/network-filesystems/u9fs.nix
./services/network-filesystems/yandex-disk.nix
./services/network-filesystems/xtreemfs.nix
+ ./services/network-filesystems/ceph.nix
./services/networking/amuled.nix
+ ./services/networking/aria2.nix
./services/networking/asterisk.nix
./services/networking/atftpd.nix
./services/networking/avahi-daemon.nix
@@ -476,6 +500,7 @@
./services/networking/minidlna.nix
./services/networking/miniupnpd.nix
./services/networking/mosquitto.nix
+ ./services/networking/monero.nix
./services/networking/miredo.nix
./services/networking/mstpd.nix
./services/networking/murmur.nix
@@ -486,6 +511,7 @@
./services/networking/ngircd.nix
./services/networking/nghttpx/default.nix
./services/networking/nix-serve.nix
+ ./services/networking/nixops-dns.nix
./services/networking/nntp-proxy.nix
./services/networking/nsd.nix
./services/networking/ntopng.nix
@@ -513,6 +539,7 @@
./services/networking/redsocks.nix
./services/networking/resilio.nix
./services/networking/rpcbind.nix
+ ./services/networking/rxe.nix
./services/networking/sabnzbd.nix
./services/networking/searx.nix
./services/networking/seeks.nix
@@ -528,6 +555,7 @@
./services/networking/ssh/lshd.nix
./services/networking/ssh/sshd.nix
./services/networking/strongswan.nix
+ ./services/networking/stunnel.nix
./services/networking/supplicant.nix
./services/networking/supybot.nix
./services/networking/syncthing.nix
@@ -586,6 +614,7 @@
./services/system/cloud-init.nix
./services/system/dbus.nix
./services/system/earlyoom.nix
+ ./services/system/localtime.nix
./services/system/kerberos.nix
./services/system/nscd.nix
./services/system/saslauthd.nix
@@ -603,11 +632,10 @@
./services/web-apps/atlassian/jira.nix
./services/web-apps/frab.nix
./services/web-apps/mattermost.nix
- ./services/web-apps/nixbot.nix
./services/web-apps/nexus.nix
./services/web-apps/pgpkeyserver-lite.nix
- ./services/web-apps/piwik.nix
- ./services/web-apps/pump.io.nix
+ ./services/web-apps/matomo.nix
+ ./services/web-apps/restya-board.nix
./services/web-apps/tt-rss.nix
./services/web-apps/selfoss.nix
./services/web-apps/quassel-webserver.nix
@@ -620,6 +648,7 @@
./services/web-servers/lighttpd/default.nix
./services/web-servers/lighttpd/gitweb.nix
./services/web-servers/lighttpd/inginious.nix
+ ./services/web-servers/mighttpd2.nix
./services/web-servers/minio.nix
./services/web-servers/nginx/default.nix
./services/web-servers/phpfpm/default.nix
@@ -666,8 +695,10 @@
./services/x11/xserver.nix
./system/activation/activation-script.nix
./system/activation/top-level.nix
+ ./system/boot/binfmt.nix
./system/boot/coredump.nix
./system/boot/emergency-mode.nix
+ ./system/boot/grow-partition.nix
./system/boot/initrd-network.nix
./system/boot/initrd-ssh.nix
./system/boot/kernel.nix
@@ -734,6 +765,7 @@
./virtualisation/lxcfs.nix
./virtualisation/lxd.nix
./virtualisation/amazon-options.nix
+ ./virtualisation/hyperv-guest.nix
./virtualisation/openvswitch.nix
./virtualisation/parallels-guest.nix
./virtualisation/rkt.nix
@@ -742,6 +774,4 @@
./virtualisation/vmware-guest.nix
./virtualisation/xen-dom0.nix
./virtualisation/xe-guest-utilities.nix
- ./virtualisation/openstack/keystone.nix
- ./virtualisation/openstack/glance.nix
]
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 3c7e516c497f..f56640f19782 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -19,13 +19,12 @@
"sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
"sata_uli" "sata_via" "sata_vsc"
- "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
- "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+ "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar"
"pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
"pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
"pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
"pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
- "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+ "pata_serverworks" "pata_sil680" "pata_sis"
"pata_sl82c105" "pata_triflex" "pata_via"
"pata_winbond"
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 39b8553976eb..3bf06a951193 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -9,7 +9,7 @@
environment.systemPackages = [
pkgs.w3m-nox # needed for the manual anyway
pkgs.testdisk # useful for repairing boot problems
- pkgs.mssys # for writing Microsoft boot sectors / MBRs
+ pkgs.ms-sys # for writing Microsoft boot sectors / MBRs
pkgs.efibootmgr
pkgs.efivar
pkgs.parted
diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
index 77d86f8d7405..5b4e68beb6a6 100644
--- a/nixos/modules/profiles/clone-config.nix
+++ b/nixos/modules/profiles/clone-config.nix
@@ -17,7 +17,7 @@ let
# you should use files).
moduleFiles =
# FIXME: use typeOf (Nix 1.6.1).
- filter (x: !isAttrs x && !builtins.isFunction x) modules;
+ filter (x: !isAttrs x && !lib.isFunction x) modules;
# Partition module files because between NixOS and non-NixOS files. NixOS
# files may change if the repository is updated.
diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index ef6fd77b5f8d..c3ee6e98371e 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
@@ -10,4 +10,10 @@
password = "demo";
uid = 1000;
};
+
+ services.xserver.displayManager.sddm.autoLogin = {
+ enable = true;
+ relogin = true;
+ user = "demo";
+ };
}
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 506a6ee3eaa8..43f06c219f82 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -72,7 +72,13 @@ with lib;
# To speed up installation a little bit, include the complete
# stdenv in the Nix store on the CD.
- system.extraDependencies = with pkgs; [ stdenv stdenvNoCC busybox ];
+ system.extraDependencies = with pkgs;
+ [
+ stdenv
+ stdenvNoCC # for runCommand
+ busybox
+ jq # for closureInfo
+ ];
# Show all debug messages from the kernel but don't log refused packets
# because we have the firewall enabled. This makes installs from the
diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index 987eb051b98c..a1ec1d45395e 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -4,7 +4,7 @@
{ config, pkgs, ... }:
{
- boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
+ boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ];
boot.initrd.postDeviceCommands =
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index 18290555b79d..f648d70bd9fa 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -16,6 +16,7 @@ with lib;
To grant access to a user, it must be part of adbusers group:
users.extraUsers.alice.extraGroups = ["adbusers"];
'';
+ relatedPackages = [ ["androidenv" "platformTools"] ];
};
};
};
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index e23849d350b4..c0967316c0c7 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -14,13 +14,16 @@ let
bashCompletion = optionalString cfg.enableCompletion ''
# Check whether we're running a version of Bash that has support for
# programmable completion. If we do, enable all modules installed in
- # the system (and user profile).
+ # the system and user profile in obsolete /etc/bash_completion.d/
+ # directories. Bash loads completions in all
+ # $XDG_DATA_DIRS/share/bash-completion/completions/
+ # on demand, so they do not need to be sourced here.
if shopt -q progcomp &>/dev/null; then
. "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"
nullglobStatus=$(shopt -p nullglob)
shopt -s nullglob
for p in $NIX_PROFILES; do
- for m in "$p/etc/bash_completion.d/"* "$p/share/bash-completion/completions/"*; do
+ for m in "$p/etc/bash_completion.d/"*; do
. $m
done
done
@@ -123,7 +126,7 @@ in
programs.bash = {
shellInit = ''
- . ${config.system.build.setEnvironment}
+ ${config.system.build.setEnvironment.text}
${cfge.shellInit}
'';
@@ -197,8 +200,9 @@ in
fi
'';
- # Configuration for readline in bash.
- environment.etc."inputrc".source = ./inputrc;
+ # Configuration for readline in bash. We use "option default"
+ # priority to allow user override using both .text and .source.
+ environment.etc."inputrc".source = mkOptionDefault ./inputrc;
users.defaultUserShell = mkDefault pkgs.bashInteractive;
@@ -207,6 +211,9 @@ in
"/share/bash-completion"
];
+ environment.systemPackages = optional cfg.enableCompletion
+ pkgs.nix-bash-completions;
+
environment.shells =
[ "/run/current-system/sw/bin/bash"
"/var/run/current-system/sw/bin/bash"
diff --git a/nixos/modules/programs/browserpass.nix b/nixos/modules/programs/browserpass.nix
index a073c7e66eb8..5f8a44a9848e 100644
--- a/nixos/modules/programs/browserpass.nix
+++ b/nixos/modules/programs/browserpass.nix
@@ -18,5 +18,6 @@ with lib;
"opt/chrome/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json";
"opt/chrome/policies/managed/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-policy.json";
};
+ nixpkgs.config.firefox.enableBrowserpass = true;
};
}
diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix
new file mode 100644
index 000000000000..874774c72b47
--- /dev/null
+++ b/nixos/modules/programs/ccache.nix
@@ -0,0 +1,83 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+ cfg = config.programs.ccache;
+in {
+ options.programs.ccache = {
+ # host configuration
+ enable = mkEnableOption "CCache";
+ cacheDir = mkOption {
+ type = types.path;
+ description = "CCache directory";
+ default = "/var/cache/ccache";
+ };
+ # target configuration
+ packageNames = mkOption {
+ type = types.listOf types.str;
+ description = "Nix top-level packages to be compiled using CCache";
+ default = [];
+ example = [ "wxGTK30" "qt48" "ffmpeg_3_3" "libav_all" ];
+ };
+ };
+
+ config = mkMerge [
+ # host configuration
+ (mkIf cfg.enable {
+ systemd.tmpfiles.rules = [ "d ${cfg.cacheDir} 0770 root nixbld -" ];
+
+ # "nix-ccache --show-stats" and "nix-ccache --clear"
+ security.wrappers.nix-ccache = {
+ group = "nixbld";
+ setgid = true;
+ source = pkgs.writeScript "nix-ccache.pl" ''
+ #!${pkgs.perl}/bin/perl
+
+ %ENV=( CCACHE_DIR => '${cfg.cacheDir}' );
+ sub untaint {
+ my $v = shift;
+ return '-C' if $v eq '-C' || $v eq '--clear';
+ return '-V' if $v eq '-V' || $v eq '--version';
+ return '-s' if $v eq '-s' || $v eq '--show-stats';
+ return '-z' if $v eq '-z' || $v eq '--zero-stats';
+ exec('${pkgs.ccache}/bin/ccache', '-h');
+ }
+ exec('${pkgs.ccache}/bin/ccache', map { untaint $_ } @ARGV);
+ '';
+ };
+ })
+
+ # target configuration
+ (mkIf (cfg.packageNames != []) {
+ nixpkgs.overlays = [
+ (self: super: genAttrs cfg.packageNames (pn: super.${pn}.override { stdenv = builtins.trace "with ccache: ${pn}" self.ccacheStdenv; }))
+
+ (self: super: {
+ ccacheWrapper = super.ccacheWrapper.override {
+ extraConfig = ''
+ export CCACHE_COMPRESS=1
+ export CCACHE_DIR="${cfg.cacheDir}"
+ export CCACHE_UMASK=007
+ if [ ! -d "$CCACHE_DIR" ]; then
+ echo "====="
+ echo "Directory '$CCACHE_DIR' does not exist"
+ echo "Please create it with:"
+ echo " sudo mkdir -m0770 '$CCACHE_DIR'"
+ echo " sudo chown root:nixbld '$CCACHE_DIR'"
+ echo "====="
+ exit 1
+ fi
+ if [ ! -w "$CCACHE_DIR" ]; then
+ echo "====="
+ echo "Directory '$CCACHE_DIR' is not accessible for user $(whoami)"
+ echo "Please verify its access permissions"
+ echo "====="
+ exit 1
+ fi
+ '';
+ };
+ })
+ ];
+ })
+ ];
+}
\ No newline at end of file
diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix
index 54739feab976..41c49db8c71c 100644
--- a/nixos/modules/programs/chromium.nix
+++ b/nixos/modules/programs/chromium.nix
@@ -36,6 +36,7 @@ in
"chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet
"mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot
"gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
+ "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
]
'';
};
@@ -52,8 +53,7 @@ in
description = "Chromium default search provider url.";
default = null;
example =
- "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:
- ↪searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}";
+ "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}";
};
defaultSearchProviderSuggestURL = mkOption {
@@ -79,7 +79,11 @@ in
###### implementation
config = lib.mkIf cfg.enable {
+ # for chromium
environment.etc."chromium/policies/managed/default.json".text = builtins.toJSON defaultProfile;
environment.etc."chromium/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts;
+ # for google-chrome https://www.chromium.org/administrators/linux-quick-start
+ environment.etc."opt/chrome/policies/managed/default.json".text = builtins.toJSON defaultProfile;
+ environment.etc."opt/chrome/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts;
};
}
diff --git a/nixos/modules/programs/criu.nix b/nixos/modules/programs/criu.nix
new file mode 100644
index 000000000000..48cf5c88a9fc
--- /dev/null
+++ b/nixos/modules/programs/criu.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.programs.criu;
+in {
+
+ options = {
+ programs.criu = {
+ enable = mkOption {
+ default = false;
+ description = ''
+ Install criu along with necessary kernel options.
+ '';
+ };
+ };
+ };
+ config = mkIf cfg.enable {
+ system.requiredKernelConfig = with config.lib.kernelConfig; [
+ (isYes "CHECKPOINT_RESTORE")
+ ];
+ boot.kernel.features.criu = true;
+ environment.systemPackages = [ pkgs.criu ];
+ };
+
+}
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix
index 1b7e20799819..b7d8a345e65c 100644
--- a/nixos/modules/programs/dconf.nix
+++ b/nixos/modules/programs/dconf.nix
@@ -1,7 +1,8 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
+
+with lib;
let
- inherit (lib) mkOption mkIf types mapAttrsToList;
cfg = config.programs.dconf;
mkDconfProfile = name: path:
@@ -13,6 +14,7 @@ in
options = {
programs.dconf = {
+ enable = mkEnableOption "dconf";
profiles = mkOption {
type = types.attrsOf types.path;
@@ -26,9 +28,15 @@ in
###### implementation
- config = mkIf (cfg.profiles != {}) {
- environment.etc =
+ config = mkIf (cfg.profiles != {} || cfg.enable) {
+ environment.etc = optionals (cfg.profiles != {})
(mapAttrsToList mkDconfProfile cfg.profiles);
+
+ environment.variables.GIO_EXTRA_MODULES = optional cfg.enable
+ "${pkgs.gnome3.dconf.lib}/lib/gio/modules";
+ # https://github.com/NixOS/nixpkgs/pull/31891
+ #environment.variables.XDG_DATA_DIRS = optional cfg.enable
+ # "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
};
}
diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixos/modules/programs/digitalbitbox/default.nix
new file mode 100644
index 000000000000..7c727489c6c9
--- /dev/null
+++ b/nixos/modules/programs/digitalbitbox/default.nix
@@ -0,0 +1,39 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.digitalbitbox;
+in
+
+{
+ options.programs.digitalbitbox = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Installs the Digital Bitbox application and enables the complementary hardware module.
+ '';
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.digitalbitbox;
+ defaultText = "pkgs.digitalbitbox";
+ description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults.";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ cfg.package ];
+ hardware.digitalbitbox = {
+ enable = true;
+ package = cfg.package;
+ };
+ };
+
+ meta = {
+ doc = ./doc.xml;
+ maintainers = with stdenv.lib.maintainers; [ vidbina ];
+ };
+}
diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml
new file mode 100644
index 000000000000..7acbc2fc4dde
--- /dev/null
+++ b/nixos/modules/programs/digitalbitbox/doc.xml
@@ -0,0 +1,85 @@
+
+
+ Digital Bitbox
+
+
+ Digital Bitbox is a hardware wallet and second-factor authenticator.
+
+
+
+ The digitalbitbox programs module may be
+ installed by setting programs.digitalbitbox
+ to true in a manner similar to
+
+
+ programs.digitalbitbox.enable = true;
+
+
+ and bundles the digitalbitbox package (see ), which contains the
+ dbb-app and dbb-cli binaries,
+ along with the hardware module (see ) which sets up the
+ necessary udev rules to access the device.
+
+
+
+ Enabling the digitalbitbox module is pretty much the easiest way to
+ get a Digital Bitbox device working on your system.
+
+
+
+ For more information, see
+ .
+
+
+
+ Package
+
+
+ The binaries, dbb-app (a GUI tool) and
+ dbb-cli (a CLI tool), are available through the
+ digitalbitbox package which could be installed
+ as follows:
+
+
+ environment.systemPackages = [
+ pkgs.digitalbitbox
+ ];
+
+
+
+
+
+
+ Hardware
+
+
+ The digitalbitbox hardware package enables the udev rules for
+ Digital Bitbox devices and may be installed as follows:
+
+
+ hardware.digitalbitbox.enable = true;
+
+
+
+
+ In order to alter the udev rules, one may provide different values for
+ the udevRule51 and udevRule52
+ attributes by means of overriding as follows:
+
+
+ programs.digitalbitbox = {
+ enable = true;
+ package = pkgs.digitalbitbox.override {
+ udevRule51 = "something else";
+ };
+ };
+
+
+
+
diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix
new file mode 100644
index 000000000000..c0283c9e6862
--- /dev/null
+++ b/nixos/modules/programs/less.nix
@@ -0,0 +1,118 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.programs.less;
+
+ configFile = ''
+ #command
+ ${concatStringsSep "\n"
+ (mapAttrsToList (command: action: "${command} ${action}") cfg.commands)
+ }
+ ${if cfg.clearDefaultCommands then "#stop" else ""}
+
+ #line-edit
+ ${concatStringsSep "\n"
+ (mapAttrsToList (command: action: "${command} ${action}") cfg.lineEditingKeys)
+ }
+
+ #env
+ ${concatStringsSep "\n"
+ (mapAttrsToList (variable: values: "${variable}=${values}") cfg.envVariables)
+ }
+ '';
+
+ lessKey = pkgs.runCommand "lesskey"
+ { src = pkgs.writeText "lessconfig" configFile; }
+ "${pkgs.less}/bin/lesskey -o $out $src";
+
+in
+
+{
+ options = {
+
+ programs.less = {
+
+ enable = mkEnableOption "less";
+
+ commands = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = {
+ "h" = "noaction 5\e(";
+ "l" = "noaction 5\e)";
+ };
+ description = "Defines new command keys.";
+ };
+
+ clearDefaultCommands = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Clear all default commands.
+ You should remember to set the quit key.
+ Otherwise you will not be able to leave less without killing it.
+ '';
+ };
+
+ lineEditingKeys = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = {
+ "\e" = "abort";
+ };
+ description = "Defines new line-editing keys.";
+ };
+
+ envVariables = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = {
+ LESS = "--quit-if-one-screen";
+ };
+ description = "Defines environment variables.";
+ };
+
+ lessopen = mkOption {
+ type = types.nullOr types.str;
+ default = "|${pkgs.lesspipe}/bin/lesspipe.sh %s";
+ description = ''
+ Before less opens a file, it first gives your input preprocessor a chance to modify the way the contents of the file are displayed.
+ '';
+ };
+
+ lessclose = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ When less closes a file opened in such a way, it will call another program, called the input postprocessor, which may perform any desired clean-up action (such as deleting the replacement file created by LESSOPEN).
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ pkgs.less ];
+
+ environment.variables = {
+ "LESSKEY_SYSTEM" = toString lessKey;
+ } // optionalAttrs (cfg.lessopen != null) {
+ "LESSOPEN" = cfg.lessopen;
+ } // optionalAttrs (cfg.lessclose != null) {
+ "LESSCLOSE" = cfg.lessclose;
+ };
+
+ warnings = optional (
+ cfg.clearDefaultCommands && (all (x: x != "quit") (attrValues cfg.commands))
+ ) ''
+ config.programs.less.clearDefaultCommands clears all default commands of less but there is no alternative binding for exiting.
+ Consider adding a binding for 'quit'.
+ '';
+ };
+
+ meta.maintainers = with maintainers; [ johnazoidberg ];
+
+}
diff --git a/nixos/modules/programs/plotinus.nix b/nixos/modules/programs/plotinus.nix
new file mode 100644
index 000000000000..065e72d6c374
--- /dev/null
+++ b/nixos/modules/programs/plotinus.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.plotinus;
+in
+{
+ meta = {
+ maintainers = pkgs.plotinus.meta.maintainers;
+ doc = ./plotinus.xml;
+ };
+
+ ###### interface
+
+ options = {
+ programs.plotinus = {
+ enable = mkOption {
+ default = false;
+ description = ''
+ Whether to enable the Plotinus GTK+3 plugin. Plotinus provides a
+ popup (triggered by Ctrl-Shift-P) to search the menus of a
+ compatible application.
+ '';
+ type = types.bool;
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+ environment.variables.XDG_DATA_DIRS = [ "${pkgs.plotinus}/share/gsettings-schemas/${pkgs.plotinus.name}" ];
+ environment.variables.GTK3_MODULES = [ "${pkgs.plotinus}/lib/libplotinus.so" ];
+ };
+}
diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml
new file mode 100644
index 000000000000..85b0e023e6c1
--- /dev/null
+++ b/nixos/modules/programs/plotinus.xml
@@ -0,0 +1,25 @@
+
+
+Plotinus
+
+Source: modules/programs/plotinus.nix
+
+Upstream documentation:
+
+Plotinus is a searchable command palette in every modern GTK+ application.
+
+When in a GTK+3 application and Plotinus is enabled, you can press Ctrl+Shift+P to open the command palette. The command palette provides a searchable list of of all menu items in the application.
+
+To enable Plotinus, add the following to your configuration.nix:
+
+
+programs.plotinus.enable = true;
+
+
+
+
+
diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix
new file mode 100644
index 000000000000..842d9e6cfb48
--- /dev/null
+++ b/nixos/modules/programs/rootston.nix
@@ -0,0 +1,103 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.rootston;
+
+ rootstonWrapped = pkgs.writeScriptBin "rootston" ''
+ #! ${pkgs.runtimeShell}
+ if [[ "$#" -ge 1 ]]; then
+ exec ${pkgs.rootston}/bin/rootston "$@"
+ else
+ ${cfg.extraSessionCommands}
+ exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile}
+ fi
+ '';
+in {
+ options.programs.rootston = {
+ enable = mkEnableOption ''
+ rootston, the reference compositor for wlroots. The purpose of rootston
+ is to test and demonstrate the features of wlroots (if you want a real
+ Wayland compositor you should e.g. use Sway instead). You can manually
+ start the compositor by running "rootston" from a terminal'';
+
+ extraSessionCommands = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ # Define a keymap (US QWERTY is the default)
+ export XKB_DEFAULT_LAYOUT=de,us
+ export XKB_DEFAULT_VARIANT=nodeadkeys
+ export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape
+ '';
+ description = ''
+ Shell commands executed just before rootston is started.
+ '';
+ };
+
+ extraPackages = mkOption {
+ type = with types; listOf package;
+ default = with pkgs; [
+ westonLite xwayland rofi
+ ];
+ defaultText = literalExample ''
+ with pkgs; [
+ westonLite xwayland rofi
+ ]
+ '';
+ example = literalExample "[ ]";
+ description = ''
+ Extra packages to be installed system wide.
+ '';
+ };
+
+ config = mkOption {
+ type = types.str;
+ default = ''
+ [keyboard]
+ meta-key = Logo
+
+ # Sway/i3 like Keybindings
+ # Maps key combinations with commands to execute
+ # Commands include:
+ # - "exit" to stop the compositor
+ # - "exec" to execute a shell command
+ # - "close" to close the current view
+ # - "next_window" to cycle through windows
+ [bindings]
+ Logo+Shift+e = exit
+ Logo+q = close
+ Logo+m = maximize
+ Alt+Tab = next_window
+ Logo+Return = exec weston-terminal
+ Logo+d = exec rofi -show run
+ '';
+ description = ''
+ Default configuration for rootston (used when called without any
+ parameters).
+ '';
+ };
+
+ configFile = mkOption {
+ type = types.path;
+ default = "/etc/rootston.ini";
+ example = literalExample "${pkgs.rootston}/etc/rootston.ini";
+ description = ''
+ Path to the default rootston configuration file (the "config" option
+ will have no effect if you change the path).
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.etc."rootston.ini".text = cfg.config;
+ environment.systemPackages = [ rootstonWrapped ] ++ cfg.extraPackages;
+
+ hardware.opengl.enable = mkDefault true;
+ fonts.enableDefaultFonts = mkDefault true;
+ programs.dconf.enable = mkDefault true;
+ };
+
+ meta.maintainers = with lib.maintainers; [ primeos gnidorah ];
+}
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 0f3f42901bab..8ec4169207db 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -26,8 +26,9 @@ let
# Ensure privacy for newly created home directories.
UMASK 077
- # Uncomment this to allow non-root users to change their account
- #information. This should be made configurable.
+ # Uncomment this and install chfn SUID to allow non-root
+ # users to change their account GECOS information.
+ # This should be made configurable.
#CHFN_RESTRICT frwh
'';
@@ -103,13 +104,12 @@ in
security.wrappers = {
su.source = "${pkgs.shadow.su}/bin/su";
- chfn.source = "${pkgs.shadow.out}/bin/chfn";
+ sg.source = "${pkgs.shadow.out}/bin/sg";
+ newgrp.source = "${pkgs.shadow.out}/bin/newgrp";
newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap";
newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap";
} // (if config.users.mutableUsers then {
passwd.source = "${pkgs.shadow.out}/bin/passwd";
- sg.source = "${pkgs.shadow.out}/bin/sg";
- newgrp.source = "${pkgs.shadow.out}/bin/newgrp";
} else {});
};
}
diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix
new file mode 100644
index 000000000000..86153d933855
--- /dev/null
+++ b/nixos/modules/programs/singularity.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+ cfg = config.programs.singularity;
+in {
+ options.programs.singularity = {
+ enable = mkEnableOption "Singularity";
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.singularity ];
+ systemd.tmpfiles.rules = [ "d /var/singularity/mnt/session 0770 root root -"
+ "d /var/singularity/mnt/final 0770 root root -"
+ "d /var/singularity/mnt/overlay 0770 root root -"
+ "d /var/singularity/mnt/container 0770 root root -"
+ "d /var/singularity/mnt/source 0770 root root -"];
+ };
+
+}
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 0935bf0cae71..36289080a82a 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -13,7 +13,7 @@ let
askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper"
''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')"
exec ${askPassword}
'';
diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index 9070722c770b..d9503d6004ff 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -4,33 +4,42 @@ with lib;
let
cfg = config.programs.sway;
- sway = pkgs.sway;
+ swayPackage = pkgs.sway;
- swayWrapped = pkgs.writeScriptBin "sway" ''
- #! ${pkgs.stdenv.shell}
- ${cfg.extraSessionCommands}
- PATH="${sway}/bin:$PATH"
- exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
+ swayWrapped = pkgs.writeShellScriptBin "sway" ''
+ if [[ "$#" -ge 1 ]]; then
+ exec sway-setcap "$@"
+ else
+ ${cfg.extraSessionCommands}
+ exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
+ fi
'';
swayJoined = pkgs.symlinkJoin {
- name = "sway-wrapped";
- paths = [ swayWrapped sway ];
+ name = "sway-joined";
+ paths = [ swayWrapped swayPackage ];
};
-in
-{
+in {
options.programs.sway = {
- enable = mkEnableOption "sway";
+ enable = mkEnableOption ''
+ the tiling Wayland compositor Sway. After adding yourself to the "sway"
+ group you can manually launch Sway by executing "sway" from a terminal.
+ If you call "sway" with any parameters the extraSessionCommands won't be
+ executed and Sway won't be launched with dbus-launch'';
extraSessionCommands = mkOption {
- default = "";
- type = types.lines;
+ type = types.lines;
+ default = "";
example = ''
- export XKB_DEFAULT_LAYOUT=us,de
- export XKB_DEFAULT_VARIANT=,nodeadkeys
- export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,
+ # Define a keymap (US QWERTY is the default)
+ export XKB_DEFAULT_LAYOUT=de,us
+ export XKB_DEFAULT_VARIANT=nodeadkeys
+ export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape
+ # Change the Keyboard repeat delay and rate
+ export WLC_REPEAT_DELAY=660
+ export WLC_REPEAT_RATE=25
'';
description = ''
- Shell commands executed just before sway is started.
+ Shell commands executed just before Sway is started.
'';
};
@@ -39,9 +48,12 @@ in
default = with pkgs; [
i3status xwayland rxvt_unicode dmenu
];
+ defaultText = literalExample ''
+ with pkgs; [ i3status xwayland rxvt_unicode dmenu ];
+ '';
example = literalExample ''
with pkgs; [
- i3status xwayland rxvt_unicode dmenu
+ i3lock light termite
]
'';
description = ''
@@ -54,7 +66,7 @@ in
environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
security.wrappers.sway = {
program = "sway-setcap";
- source = "${sway}/bin/sway";
+ source = "${swayPackage}/bin/sway";
capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip";
owner = "root";
group = "sway";
@@ -62,8 +74,12 @@ in
};
users.extraGroups.sway = {};
+ security.pam.services.swaylock = {};
hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true;
+ programs.dconf.enable = mkDefault true;
};
+
+ meta.maintainers = with lib.maintainers; [ gnidorah primeos ];
}
diff --git a/nixos/modules/programs/systemtap.nix b/nixos/modules/programs/systemtap.nix
new file mode 100644
index 000000000000..fd84732cd412
--- /dev/null
+++ b/nixos/modules/programs/systemtap.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.programs.systemtap;
+in {
+
+ options = {
+ programs.systemtap = {
+ enable = mkOption {
+ default = false;
+ description = ''
+ Install systemtap along with necessary kernel options.
+ '';
+ };
+ };
+ };
+ config = mkIf cfg.enable {
+ system.requiredKernelConfig = with config.lib.kernelConfig; [
+ (isYes "DEBUG")
+ ];
+ boot.kernel.features.debug = true;
+ environment.systemPackages = [
+ config.boot.kernelPackages.systemtap
+ ];
+ };
+
+}
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index ed1d88a420a2..4a60403a2827 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -61,7 +61,12 @@ in {
options = {
programs.tmux = {
- enable = mkEnableOption "tmux - a screen replacement.";
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whenever to configure tmux system-wide.";
+ relatedPackages = [ "tmux" ];
+ };
aggressiveResize = mkOption {
default = false;
@@ -151,6 +156,15 @@ in {
type = types.str;
description = "Set the $TERM variable.";
};
+
+ secureSocket = mkOption {
+ default = true;
+ type = types.bool;
+ description = ''
+ Store tmux socket under /run, which is more secure than /tmp, but as a
+ downside it doesn't survive user logout.
+ '';
+ };
};
};
@@ -163,7 +177,7 @@ in {
systemPackages = [ pkgs.tmux ];
variables = {
- TMUX_TMPDIR = ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}'';
+ TMUX_TMPDIR = lib.optional cfg.secureSocket ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}'';
};
};
};
diff --git a/nixos/modules/programs/udevil.nix b/nixos/modules/programs/udevil.nix
new file mode 100644
index 000000000000..ba5670f9dfe9
--- /dev/null
+++ b/nixos/modules/programs/udevil.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.udevil;
+
+in {
+ options.programs.udevil.enable = mkEnableOption "udevil";
+
+ config = mkIf cfg.enable {
+ security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil";
+ };
+}
diff --git a/nixos/modules/programs/way-cooler.nix b/nixos/modules/programs/way-cooler.nix
new file mode 100644
index 000000000000..633e959be9f3
--- /dev/null
+++ b/nixos/modules/programs/way-cooler.nix
@@ -0,0 +1,78 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.way-cooler;
+ way-cooler = pkgs.way-cooler;
+
+ wcWrapped = pkgs.writeShellScriptBin "way-cooler" ''
+ ${cfg.extraSessionCommands}
+ exec ${pkgs.dbus.dbus-launch} --exit-with-session ${way-cooler}/bin/way-cooler
+ '';
+ wcJoined = pkgs.symlinkJoin {
+ name = "way-cooler-wrapped";
+ paths = [ wcWrapped way-cooler ];
+ };
+ configFile = readFile "${way-cooler}/etc/way-cooler/init.lua";
+ spawnBar = ''
+ util.program.spawn_at_startup("lemonbar");
+ '';
+in
+{
+ options.programs.way-cooler = {
+ enable = mkEnableOption "way-cooler";
+
+ extraSessionCommands = mkOption {
+ default = "";
+ type = types.lines;
+ example = ''
+ export XKB_DEFAULT_LAYOUT=us,de
+ export XKB_DEFAULT_VARIANT=,nodeadkeys
+ export XKB_DEFAULT_OPTIONS=grp:caps_toggle,
+ '';
+ description = ''
+ Shell commands executed just before way-cooler is started.
+ '';
+ };
+
+ extraPackages = mkOption {
+ type = with types; listOf package;
+ default = with pkgs; [
+ westonLite xwayland dmenu
+ ];
+ example = literalExample ''
+ with pkgs; [
+ westonLite xwayland dmenu
+ ]
+ '';
+ description = ''
+ Extra packages to be installed system wide.
+ '';
+ };
+
+ enableBar = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to enable an unofficial bar.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ wcJoined ] ++ cfg.extraPackages;
+
+ security.pam.services.wc-lock = {};
+ environment.etc."way-cooler/init.lua".text = ''
+ ${configFile}
+ ${optionalString cfg.enableBar spawnBar}
+ '';
+
+ hardware.opengl.enable = mkDefault true;
+ fonts.enableDefaultFonts = mkDefault true;
+ programs.dconf.enable = mkDefault true;
+ };
+
+ meta.maintainers = with maintainers; [ gnidorah ];
+}
diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix
new file mode 100644
index 000000000000..a01083c3ace9
--- /dev/null
+++ b/nixos/modules/programs/yabar.nix
@@ -0,0 +1,149 @@
+{ lib, pkgs, config, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.yabar;
+
+ mapExtra = v: lib.concatStringsSep "\n" (mapAttrsToList (
+ key: val: "${key} = ${if (isString val) then "\"${val}\"" else "${builtins.toString val}"};"
+ ) v);
+
+ listKeys = r: concatStringsSep "," (map (n: "\"${n}\"") (attrNames r));
+
+ configFile = let
+ bars = mapAttrsToList (
+ name: cfg: ''
+ ${name}: {
+ font: "${cfg.font}";
+ position: "${cfg.position}";
+
+ ${mapExtra cfg.extra}
+
+ block-list: [${listKeys cfg.indicators}]
+
+ ${concatStringsSep "\n" (mapAttrsToList (
+ name: cfg: ''
+ ${name}: {
+ exec: "${cfg.exec}";
+ align: "${cfg.align}";
+ ${mapExtra cfg.extra}
+ };
+ ''
+ ) cfg.indicators)}
+ };
+ ''
+ ) cfg.bars;
+ in pkgs.writeText "yabar.conf" ''
+ bar-list = [${listKeys cfg.bars}];
+ ${concatStringsSep "\n" bars}
+ '';
+in
+ {
+ options.programs.yabar = {
+ enable = mkEnableOption "yabar";
+
+ package = mkOption {
+ default = pkgs.yabar;
+ example = literalExample "pkgs.yabar-unstable";
+ type = types.package;
+
+ description = ''
+ The package which contains the `yabar` binary.
+
+ Nixpkgs provides the `yabar` and `yabar-unstable`
+ derivations since 18.03, so it's possible to choose.
+ '';
+ };
+
+ bars = mkOption {
+ default = {};
+ type = types.attrsOf(types.submodule {
+ options = {
+ font = mkOption {
+ default = "sans bold 9";
+ example = "Droid Sans, FontAwesome Bold 9";
+ type = types.string;
+
+ description = ''
+ The font that will be used to draw the status bar.
+ '';
+ };
+
+ position = mkOption {
+ default = "top";
+ example = "bottom";
+ type = types.enum [ "top" "bottom" ];
+
+ description = ''
+ The position where the bar will be rendered.
+ '';
+ };
+
+ extra = mkOption {
+ default = {};
+ type = types.attrsOf types.string;
+
+ description = ''
+ An attribute set which contains further attributes of a bar.
+ '';
+ };
+
+ indicators = mkOption {
+ default = {};
+ type = types.attrsOf(types.submodule {
+ options.exec = mkOption {
+ example = "YABAR_DATE";
+ type = types.string;
+ description = ''
+ The type of the indicator to be executed.
+ '';
+ };
+
+ options.align = mkOption {
+ default = "left";
+ example = "right";
+ type = types.enum [ "left" "center" "right" ];
+
+ description = ''
+ Whether to align the indicator at the left or right of the bar.
+ '';
+ };
+
+ options.extra = mkOption {
+ default = {};
+ type = types.attrsOf (types.either types.string types.int);
+
+ description = ''
+ An attribute set which contains further attributes of a indicator.
+ '';
+ };
+ });
+
+ description = ''
+ Indicators that should be rendered by yabar.
+ '';
+ };
+ };
+ });
+
+ description = ''
+ List of bars that should be rendered by yabar.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.user.services.yabar = {
+ description = "yabar service";
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
+
+ script = ''
+ ${cfg.package}/bin/yabar -c ${configFile}
+ '';
+
+ serviceConfig.Restart = "always";
+ };
+ };
+ }
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix
index 9077643c4440..b995d390b279 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.nix
+++ b/nixos/modules/programs/zsh/oh-my-zsh.nix
@@ -48,6 +48,15 @@ in
Name of the theme to be used by oh-my-zsh.
'';
};
+
+ cacheDir = mkOption {
+ default = "$HOME/.cache/oh-my-zsh";
+ type = types.str;
+ description = ''
+ Cache directory to be used by `oh-my-zsh`.
+ Without this option it would default to the read-only nix store.
+ '';
+ };
};
};
@@ -74,6 +83,13 @@ in
"ZSH_THEME=\"${cfg.theme}\""
}
+ ${optionalString (cfg.cacheDir != null) ''
+ if [[ ! -d "${cfg.cacheDir}" ]]; then
+ mkdir -p "${cfg.cacheDir}"
+ fi
+ ZSH_CACHE_DIR=${cfg.cacheDir}
+ ''}
+
source $ZSH/oh-my-zsh.sh
'';
};
diff --git a/nixos/modules/programs/zsh/zsh-autoenv.nix b/nixos/modules/programs/zsh/zsh-autoenv.nix
new file mode 100644
index 000000000000..630114bcda9f
--- /dev/null
+++ b/nixos/modules/programs/zsh/zsh-autoenv.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.zsh.zsh-autoenv;
+in {
+ options = {
+ programs.zsh.zsh-autoenv = {
+ enable = mkEnableOption "zsh-autoenv";
+ package = mkOption {
+ default = pkgs.zsh-autoenv;
+ defaultText = "pkgs.zsh-autoenv";
+ description = ''
+ Package to install for `zsh-autoenv` usage.
+ '';
+
+ type = types.package;
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ programs.zsh.interactiveShellInit = ''
+ source ${cfg.package}/share/zsh-autoenv/autoenv.zsh
+ '';
+ };
+}
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 6fb1346bbb33..f689250dc61f 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -36,8 +36,9 @@ in
shellAliases = mkOption {
default = config.environment.shellAliases;
description = ''
- Set of aliases for zsh shell. See
- for an option format description.
+ Set of aliases for zsh shell. Overrides the default value taken from
+ .
+ See for an option format description.
'';
type = types.attrs; # types.attrsOf types.stringOrPath;
};
@@ -107,7 +108,7 @@ in
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
- . ${config.system.build.setEnvironment}
+ ${config.system.build.setEnvironment.text}
${cfge.shellInit}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index f30cbe427f09..b0ca274b939f 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -48,6 +48,10 @@ with lib;
(mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead")
(mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead")
+ # 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" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
(mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])
@@ -78,6 +82,10 @@ with lib;
(mkRenamedOptionModule [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ])
(mkRenamedOptionModule [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ])
+ # libvirtd
+ (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ]
+ "Set the option `virtualisation.libvirtd.qemuPackage' instead.")
+
# Tarsnap
(mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ])
@@ -140,6 +148,12 @@ with lib;
# parsoid
(mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] [ "services" "parsoid" "wikis" ])
+ # piwik was renamed to matomo
+ (mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ])
+ (mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ])
+ (mkRenamedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] [ "services" "matomo" "phpfpmProcessManagerConfig" ])
+ (mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ])
+
# tarsnap
(mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir")
@@ -178,6 +192,17 @@ with lib;
(mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ])
(mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
+ # Profile splitting
+ (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])
+
+ # misc/version.nix
+ (mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
+ (mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ])
+ (mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
+ (mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ])
+ (mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ])
+ (mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ])
+
# Options that are obsolete and have no replacement.
(mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
(mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
@@ -194,11 +219,14 @@ with lib;
"See the 16.09 release notes for more information.")
(mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
(mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")
+ (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 [ "fonts" "fontconfig" "forceAutohint" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
+ (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")
# ZSH
(mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
@@ -209,5 +237,14 @@ with lib;
(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" ])
- ];
+
+ # Xen
+ (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])
+ ] ++ (flip map [ "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.
+ '' ));
}
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index fb011019f7f5..0736239ed2cf 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -6,10 +6,11 @@ let
cfg = config.security.acme;
- certOpts = { ... }: {
+ certOpts = { name, ... }: {
options = {
webroot = mkOption {
type = types.str;
+ example = "/var/lib/acme/acme-challenges";
description = ''
Where the webroot of the HTTP vhost is located.
.well-known/acme-challenge/ directory
@@ -20,8 +21,8 @@ let
};
domain = mkOption {
- type = types.nullOr types.str;
- default = null;
+ type = types.str;
+ default = name;
description = "Domain to fetch certificate for (defaults to the entry name)";
};
@@ -48,7 +49,7 @@ let
default = false;
description = ''
Give read permissions to the specified group
- () to read SSL private certificates.
+ () to read SSL private certificates.
'';
};
@@ -87,7 +88,7 @@ let
}
'';
description = ''
- Extra domain names for which certificates are to be issued, with their
+ A list of extra domain names, which are included in the one certificate to be issued, with their
own server roots if needed.
'';
};
@@ -139,6 +140,14 @@ in
'';
};
+ tosHash = mkOption {
+ type = types.string;
+ default = "cc88d8d9517f490191401e7b54e9ffd12a2b9082ec7a1d4cec6101f9f1647e7b";
+ description = ''
+ SHA256 of the Terms of Services document. This changes once in a while.
+ '';
+ };
+
production = mkOption {
type = types.bool;
default = true;
@@ -185,10 +194,9 @@ in
servicesLists = mapAttrsToList certToServices cfg.certs;
certToServices = cert: data:
let
- domain = if data.domain != null then data.domain else cert;
cpath = "${cfg.directory}/${cert}";
rights = if data.allowKeysForGroup then "750" else "700";
- cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
+ cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin "--tos_sha256" cfg.tosHash ]
++ optionals (data.email != null) [ "--email" data.email ]
++ concatMap (p: [ "-f" p ]) data.plugins
++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
diff --git a/nixos/modules/security/audit.nix b/nixos/modules/security/audit.nix
index 7ac21fd96507..2b22bdd9f0ae 100644
--- a/nixos/modules/security/audit.nix
+++ b/nixos/modules/security/audit.nix
@@ -13,7 +13,7 @@ let
};
disableScript = pkgs.writeScript "audit-disable" ''
- #!${pkgs.stdenv.shell} -eu
+ #!${pkgs.runtimeShell} -eu
# Explicitly disable everything, as otherwise journald might start it.
auditctl -D
auditctl -e 0 -a task,never
@@ -23,7 +23,7 @@ let
# put in the store like this. At the same time, it doesn't feel like a huge deal and working
# around that is a pain so I'm leaving it like this for now.
startScript = pkgs.writeScript "audit-start" ''
- #!${pkgs.stdenv.shell} -eu
+ #!${pkgs.runtimeShell} -eu
# Clear out any rules we may start with
auditctl -D
@@ -43,7 +43,7 @@ let
'';
stopScript = pkgs.writeScript "audit-stop" ''
- #!${pkgs.stdenv.shell} -eu
+ #!${pkgs.runtimeShell} -eu
# Clear the rules
auditctl -D
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 9ca818e86ffa..df6108dede7c 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -25,14 +25,14 @@ let
loginCfgFile = optional cfg.ssh.enable
{ source = pkgs.writeText "login_duo.conf" configFile;
mode = "0600";
- uid = config.ids.uids.sshd;
+ user = "sshd";
target = "duo/login_duo.conf";
};
pamCfgFile = optional cfg.pam.enable
{ source = pkgs.writeText "pam_duo.conf" configFile;
mode = "0600";
- uid = config.ids.uids.sshd;
+ user = "sshd";
target = "duo/pam_duo.conf";
};
in
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 2d6713311a45..e1cad03e66e2 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -46,6 +46,18 @@ let
'';
};
+ googleAuthenticator = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ If set, users with enabled Google Authenticator (created
+ ~/.google_authenticator) will be required
+ to provide Google Authenticator token to log in.
+ '';
+ };
+ };
+
usbAuth = mkOption {
default = config.security.pam.usb.enable;
type = types.bool;
@@ -223,6 +235,17 @@ let
'';
};
+ enableGnomeKeyring = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ If enabled, pam_gnome_keyring will attempt to automatically unlock the
+ user's default Gnome keyring upon login. If the user login password does
+ not match their keyring password, Gnome Keyring will prompt separately
+ after login.
+ '';
+ };
+
text = mkOption {
type = types.nullOr types.lines;
description = "Contents of the PAM service file.";
@@ -273,7 +296,12 @@ let
# prompts the user for password so we run it once with 'required' at an
# earlier point and it will run again with 'sufficient' further down.
# We use try_first_pass the second time to avoid prompting password twice
- (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet)) ''
+ (optionalString (cfg.unixAuth &&
+ (config.security.pam.enableEcryptfs
+ || cfg.pamMount
+ || cfg.enableKwallet
+ || cfg.enableGnomeKeyring
+ || cfg.googleAuthenticator.enable)) ''
auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth
${optionalString config.security.pam.enableEcryptfs
"auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@@ -282,6 +310,10 @@ let
${optionalString cfg.enableKwallet
("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
+ ${optionalString cfg.enableGnomeKeyring
+ ("auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so")}
+ ${optionalString cfg.googleAuthenticator.enable
+ "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"}
'') + ''
${optionalString cfg.unixAuth
"auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
@@ -351,6 +383,10 @@ let
${optionalString (cfg.enableKwallet)
("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
+ ${optionalString (cfg.enableGnomeKeyring)
+ "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}
+ ${optionalString (config.virtualisation.lxc.lxcfs.enable)
+ "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"}
'');
};
@@ -519,7 +555,6 @@ in
ftp = {};
i3lock = {};
i3lock-color = {};
- swaylock = {};
screen = {};
vlock = {};
xlock = {};
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index cfd0595e63b7..24283e1d6165 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -8,6 +8,22 @@ let
inherit (pkgs) sudo;
+ toUserString = user: if (isInt user) then "#${toString user}" else "${user}";
+ toGroupString = group: if (isInt group) then "%#${toString group}" else "%${group}";
+
+ toCommandOptionsString = options:
+ "${concatStringsSep ":" options}${optionalString (length options != 0) ":"} ";
+
+ toCommandsString = commands:
+ concatStringsSep ", " (
+ map (command:
+ if (isString command) then
+ command
+ else
+ "${toCommandOptionsString command.options}${command.command}"
+ ) commands
+ );
+
in
{
@@ -31,8 +47,8 @@ in
default = true;
description =
''
- Whether users of the wheel group can execute
- commands as super user without entering a password.
+ Whether users of the wheel group must
+ provide a password to run commands as super user via sudo.
'';
};
@@ -47,6 +63,97 @@ in
'';
};
+ security.sudo.extraRules = mkOption {
+ description = ''
+ Define specific rules to be in the sudoers file.
+ '';
+ default = [];
+ example = [
+ # Allow execution of any command by all users in group sudo,
+ # requiring a password.
+ { groups = [ "sudo" ]; commands = [ "ALL" ]; }
+
+ # Allow execution of "/home/root/secret.sh" by user `backup`, `database`
+ # and the group with GID `1006` without a password.
+ { users = [ "backup" ]; groups = [ 1006 ];
+ commands = [ { command = "/home/root/secret.sh"; options = [ "SETENV" "NOPASSWD" ]; } ]; }
+
+ # Allow all users of group `bar` to run two executables as user `foo`
+ # with arguments being pre-set.
+ { groups = [ "bar" ]; runAs = "foo";
+ commands =
+ [ "/home/baz/cmd1.sh hello-sudo"
+ { command = ''/home/baz/cmd2.sh ""''; options = [ "SETENV" ]; } ]; }
+ ];
+ type = with types; listOf (submodule {
+ options = {
+ users = mkOption {
+ type = with types; listOf (either string int);
+ description = ''
+ The usernames / UIDs this rule should apply for.
+ '';
+ default = [];
+ };
+
+ groups = mkOption {
+ type = with types; listOf (either string int);
+ description = ''
+ The groups / GIDs this rule should apply for.
+ '';
+ default = [];
+ };
+
+ host = mkOption {
+ type = types.string;
+ default = "ALL";
+ description = ''
+ For what host this rule should apply.
+ '';
+ };
+
+ runAs = mkOption {
+ type = with types; string;
+ default = "ALL:ALL";
+ description = ''
+ Under which user/group the specified command is allowed to run.
+
+ A user can be specified using just the username: "foo".
+ It is also possible to specify a user/group combination using "foo:bar"
+ or to only allow running as a specific group with ":bar".
+ '';
+ };
+
+ commands = mkOption {
+ description = ''
+ The commands for which the rule should apply.
+ '';
+ type = with types; listOf (either string (submodule {
+
+ options = {
+ command = mkOption {
+ type = with types; string;
+ description = ''
+ A command being either just a path to a binary to allow any arguments,
+ the full command with arguments pre-set or with "" used as the argument,
+ not allowing arguments to the command at all.
+ '';
+ };
+
+ options = mkOption {
+ type = with types; listOf (enum [ "NOPASSWD" "PASSWD" "NOEXEC" "EXEC" "SETENV" "NOSETENV" "LOG_INPUT" "NOLOG_INPUT" "LOG_OUTPUT" "NOLOG_OUTPUT" ]);
+ description = ''
+ Options for running the command. Refer to the sudo manual.
+ '';
+ default = [];
+ };
+ };
+
+ }));
+ };
+ };
+ });
+ };
+
security.sudo.extraConfig = mkOption {
type = types.lines;
default = "";
@@ -61,10 +168,16 @@ in
config = mkIf cfg.enable {
+ security.sudo.extraRules = [
+ { groups = [ "wheel" ];
+ commands = [ { command = "ALL"; options = (if cfg.wheelNeedsPassword then [ "SETENV" ] else [ "NOPASSWD" "SETENV" ]); } ];
+ }
+ ];
+
security.sudo.configFile =
''
# Don't edit this file. Set the NixOS options ‘security.sudo.configFile’
- # or ‘security.sudo.extraConfig’ instead.
+ # or ‘security.sudo.extraRules’ instead.
# Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
Defaults env_keep+=SSH_AUTH_SOCK
@@ -72,8 +185,18 @@ in
# "root" is allowed to do anything.
root ALL=(ALL:ALL) SETENV: ALL
- # Users in the "wheel" group can do anything.
- %wheel ALL=(ALL:ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL
+ # extraRules
+ ${concatStringsSep "\n" (
+ lists.flatten (
+ map (
+ rule: if (length rule.commands != 0) then [
+ (map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users)
+ (map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups)
+ ] else []
+ ) cfg.extraRules
+ )
+ )}
+
${cfg.extraConfig}
'';
@@ -92,7 +215,7 @@ in
{ src = pkgs.writeText "sudoers-in" cfg.configFile; }
# Make sure that the sudoers file is syntactically valid.
# (currently disabled - NIXOS-66)
- "${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
+ "${pkgs.buildPackages.sudo}/sbin/visudo -f $src -c && cp $src $out";
target = "sudoers";
mode = "0440";
};
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 1f64213accd4..77e4b2a616d8 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -17,7 +17,7 @@ let
hardeningEnable = [ "pie" ];
installPhase = ''
mkdir -p $out/bin
- gcc -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \
+ $CC -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \
-lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper
'';
};
@@ -79,7 +79,7 @@ let
({ owner = "root";
group = "root";
} // s)
- else if
+ else if
(s ? "setuid" && s.setuid) ||
(s ? "setgid" && s.setgid) ||
(s ? "permissions")
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index acf48d3c3d03..e3e8bb28c58b 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -21,7 +21,7 @@ in
enable = mkOption {
type = types.bool;
- default = true;
+ default = false;
description = ''
Whether to enable ALSA sound.
'';
diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix
index c0a0f0374294..52613d450b51 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@@ -4,17 +4,22 @@ with pkgs;
with lib;
let
-
uid = config.ids.uids.mopidy;
gid = config.ids.gids.mopidy;
cfg = config.services.mopidy;
mopidyConf = writeText "mopidy.conf" cfg.configuration;
- mopidyEnv = python.buildEnv.override {
- extraLibs = [ mopidy ] ++ cfg.extensionPackages;
+ mopidyEnv = buildEnv {
+ name = "mopidy-with-extensions-${mopidy.version}";
+ paths = closePropagation cfg.extensionPackages;
+ pathsToLink = [ "/${python.sitePackages}" ];
+ buildInputs = [ makeWrapper ];
+ postBuild = ''
+ makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \
+ --prefix PYTHONPATH : $out/${python.sitePackages}
+ '';
};
-
in {
options = {
@@ -61,7 +66,6 @@ in {
};
-
###### implementation
config = mkIf cfg.enable {
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
new file mode 100644
index 000000000000..1b730e0c2b76
--- /dev/null
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -0,0 +1,580 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ isLocalPath = x:
+ builtins.substring 0 1 x == "/" # absolute path
+ || builtins.substring 0 1 x == "." # relative path
+ || builtins.match "[.*:.*]" == null; # not machine:path
+
+ mkExcludeFile = cfg:
+ # Write each exclude pattern to a new line
+ pkgs.writeText "excludefile" (concatStringsSep "\n" cfg.exclude);
+
+ mkKeepArgs = cfg:
+ # If cfg.prune.keep e.g. has a yearly attribute,
+ # its content is passed on as --keep-yearly
+ concatStringsSep " "
+ (mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep);
+
+ mkBackupScript = cfg: ''
+ on_exit()
+ {
+ exitStatus=$?
+ # Reset the EXIT handler, or else we're called again on 'exit' below
+ trap - EXIT
+ ${cfg.postHook}
+ exit $exitStatus
+ }
+ trap 'on_exit' INT TERM QUIT EXIT
+
+ archiveName="${cfg.archiveBaseName}-$(date ${cfg.dateFormat})"
+ archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}"
+ ${cfg.preHook}
+ '' + optionalString cfg.doInit ''
+ # Run borg init if the repo doesn't exist yet
+ if ! borg list > /dev/null; then
+ borg init \
+ --encryption ${cfg.encryption.mode} \
+ $extraInitArgs
+ ${cfg.postInit}
+ fi
+ '' + ''
+ borg create \
+ --compression ${cfg.compression} \
+ --exclude-from ${mkExcludeFile cfg} \
+ $extraCreateArgs \
+ "::$archiveName$archiveSuffix" \
+ ${escapeShellArgs cfg.paths}
+ '' + optionalString cfg.appendFailedSuffix ''
+ borg rename "::$archiveName$archiveSuffix" "$archiveName"
+ '' + ''
+ ${cfg.postCreate}
+ '' + optionalString (cfg.prune.keep != { }) ''
+ borg prune \
+ ${mkKeepArgs cfg} \
+ --prefix ${escapeShellArg cfg.prune.prefix} \
+ $extraPruneArgs
+ ${cfg.postPrune}
+ '';
+
+ mkPassEnv = cfg: with cfg.encryption;
+ if passCommand != null then
+ { BORG_PASSCOMMAND = passCommand; }
+ else if passphrase != null then
+ { BORG_PASSPHRASE = passphrase; }
+ else { };
+
+ mkBackupService = name: cfg:
+ let
+ userHome = config.users.users.${cfg.user}.home;
+ in nameValuePair "borgbackup-job-${name}" {
+ description = "BorgBackup job ${name}";
+ path = with pkgs; [
+ borgbackup openssh
+ ];
+ script = mkBackupScript cfg;
+ serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
+ # Only run when no other process is using CPU or disk
+ CPUSchedulingPolicy = "idle";
+ IOSchedulingClass = "idle";
+ ProtectSystem = "strict";
+ ReadWritePaths =
+ [ "${userHome}/.config/borg" "${userHome}/.cache/borg" ]
+ # Borg needs write access to repo if it is not remote
+ ++ optional (isLocalPath cfg.repo) cfg.repo;
+ PrivateTmp = true;
+ };
+ environment = {
+ BORG_REPO = cfg.repo;
+ inherit (cfg) extraInitArgs extraCreateArgs extraPruneArgs;
+ } // (mkPassEnv cfg) // cfg.environment;
+ inherit (cfg) startAt;
+ };
+
+ # Paths listed in ReadWritePaths must exist before service is started
+ mkActivationScript = name: cfg:
+ let
+ install = "install -o ${cfg.user} -g ${cfg.group}";
+ in
+ nameValuePair "borgbackup-job-${name}" (stringAfter [ "users" ] (''
+ # Eensure that the home directory already exists
+ # We can't assert createHome == true because that's not the case for root
+ cd "${config.users.users.${cfg.user}.home}"
+ ${install} -d .config/borg
+ ${install} -d .cache/borg
+ '' + optionalString (isLocalPath cfg.repo) ''
+ ${install} -d ${escapeShellArg cfg.repo}
+ ''));
+
+ mkPassAssertion = name: cfg: {
+ assertion = with cfg.encryption;
+ mode != "none" -> passCommand != null || passphrase != null;
+ message =
+ "passCommand or passphrase has to be specified because"
+ + '' borgbackup.jobs.${name}.encryption != "none"'';
+ };
+
+ mkRepoService = name: cfg:
+ nameValuePair "borgbackup-repo-${name}" {
+ description = "Create BorgBackup repository ${name} directory";
+ script = ''
+ mkdir -p ${escapeShellArg cfg.path}
+ chown ${cfg.user}:${cfg.group} ${escapeShellArg cfg.path}
+ '';
+ serviceConfig = {
+ # The service's only task is to ensure that the specified path exists
+ Type = "oneshot";
+ };
+ wantedBy = [ "multi-user.target" ];
+ };
+
+ mkAuthorizedKey = cfg: appendOnly: key:
+ let
+ # Because of the following line, clients do not need to specify an absolute repo path
+ cdCommand = "cd ${escapeShellArg cfg.path}";
+ restrictedArg = "--restrict-to-${if cfg.allowSubRepos then "path" else "repository"} .";
+ appendOnlyArg = optionalString appendOnly "--append-only";
+ quotaArg = optionalString (cfg.quota != null) "--storage-quota ${cfg.quota}";
+ serveCommand = "borg serve ${restrictedArg} ${appendOnlyArg} ${quotaArg}";
+ in
+ ''command="${cdCommand} && ${serveCommand}",restrict ${key}'';
+
+ mkUsersConfig = name: cfg: {
+ users.${cfg.user} = {
+ openssh.authorizedKeys.keys =
+ (map (mkAuthorizedKey cfg false) cfg.authorizedKeys
+ ++ map (mkAuthorizedKey cfg true) cfg.authorizedKeysAppendOnly);
+ useDefaultShell = true;
+ };
+ groups.${cfg.group} = { };
+ };
+
+ mkKeysAssertion = name: cfg: {
+ assertion = cfg.authorizedKeys != [ ] || cfg.authorizedKeysAppendOnly != [ ];
+ message =
+ "borgbackup.repos.${name} does not make sense"
+ + " without at least one public key";
+ };
+
+in {
+ meta.maintainers = with maintainers; [ dotlambda ];
+
+ ###### interface
+
+ options.services.borgbackup.jobs = mkOption {
+ description = "Deduplicating backups using BorgBackup.";
+ default = { };
+ example = literalExample ''
+ {
+ rootBackup = {
+ paths = "/";
+ exclude = [ "/nix" ];
+ repo = "/path/to/local/repo";
+ encryption = {
+ mode = "repokey";
+ passphrase = "secret";
+ };
+ compression = "auto,lzma";
+ startAt = "weekly";
+ };
+ }
+ '';
+ type = types.attrsOf (types.submodule (let globalConfig = config; in
+ { name, config, ... }: {
+ options = {
+
+ paths = mkOption {
+ type = with types; either path (nonEmptyListOf path);
+ description = "Path(s) to back up.";
+ example = "/home/user";
+ apply = x: if isList x then x else [ x ];
+ };
+
+ repo = mkOption {
+ type = types.str;
+ description = "Remote or local repository to back up to.";
+ example = "user@machine:/path/to/repo";
+ };
+
+ archiveBaseName = mkOption {
+ type = types.strMatching "[^/{}]+";
+ default = "${globalConfig.networking.hostName}-${name}";
+ defaultText = "\${config.networking.hostName}-";
+ description = ''
+ How to name the created archives. A timestamp, whose format is
+ determined by , will be appended. The full
+ name can be modified at runtime ($archiveName).
+ Placeholders like {hostname} must not be used.
+ '';
+ };
+
+ dateFormat = mkOption {
+ type = types.str;
+ description = ''
+ Arguments passed to date
+ to create a timestamp suffix for the archive name.
+ '';
+ default = "+%Y-%m-%dT%H:%M:%S";
+ example = "-u +%s";
+ };
+
+ startAt = mkOption {
+ type = with types; either str (listOf str);
+ default = "daily";
+ description = ''
+ When or how often the backup should run.
+ Must be in the format described in
+ systemd.time
+ 7.
+ If you do not want the backup to start
+ automatically, use [ ].
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ description = ''
+ The user borg is run as.
+ User or group need read permission
+ for the specified .
+ '';
+ default = "root";
+ };
+
+ group = mkOption {
+ type = types.str;
+ description = ''
+ The group borg is run as. User or group needs read permission
+ for the specified .
+ '';
+ default = "root";
+ };
+
+ encryption.mode = mkOption {
+ type = types.enum [
+ "repokey" "keyfile"
+ "repokey-blake2" "keyfile-blake2"
+ "authenticated" "authenticated-blake2"
+ "none"
+ ];
+ description = ''
+ Encryption mode to use. Setting a mode
+ other than "none" requires
+ you to specify a
+ or a .
+ '';
+ };
+
+ encryption.passCommand = mkOption {
+ type = with types; nullOr str;
+ description = ''
+ A command which prints the passphrase to stdout.
+ Mutually exclusive with .
+ '';
+ default = null;
+ example = "cat /path/to/passphrase_file";
+ };
+
+ encryption.passphrase = mkOption {
+ type = with types; nullOr str;
+ description = ''
+ The passphrase the backups are encrypted with.
+ Mutually exclusive with .
+ If you do not want the passphrase to be stored in the
+ world-readable Nix store, use .
+ '';
+ default = null;
+ };
+
+ compression = mkOption {
+ # "auto" is optional,
+ # compression mode must be given,
+ # compression level is optional
+ type = types.strMatching "none|(auto,)?(lz4|zstd|zlib|lzma)(,[[:digit:]]{1,2})?";
+ description = ''
+ Compression method to use. Refer to
+ borg help compression
+ for all available options.
+ '';
+ default = "lz4";
+ example = "auto,lzma";
+ };
+
+ exclude = mkOption {
+ type = with types; listOf str;
+ description = ''
+ Exclude paths matching any of the given patterns. See
+ borg help patterns for pattern syntax.
+ '';
+ default = [ ];
+ example = [
+ "/home/*/.cache"
+ "/nix"
+ ];
+ };
+
+ doInit = mkOption {
+ type = types.bool;
+ description = ''
+ Run borg init if the
+ specified does not exist.
+ You should set this to false
+ if the repository is located on an external drive
+ that might not always be mounted.
+ '';
+ default = true;
+ };
+
+ appendFailedSuffix = mkOption {
+ type = types.bool;
+ description = ''
+ Append a .failed suffix
+ to the archive name, which is only removed if
+ borg create has a zero exit status.
+ '';
+ default = true;
+ };
+
+ prune.keep = mkOption {
+ # Specifying e.g. `prune.keep.yearly = -1`
+ # means there is no limit of yearly archives to keep
+ # The regex is for use with e.g. --keep-within 1y
+ type = with types; attrsOf (either int (strMatching "[[:digit:]]+[Hdwmy]"));
+ description = ''
+ Prune a repository by deleting all archives not matching any of the
+ specified retention options. See borg help prune
+ for the available options.
+ '';
+ default = { };
+ example = literalExample ''
+ {
+ within = "1d"; # Keep all archives from the last day
+ daily = 7;
+ weekly = 4;
+ monthly = -1; # Keep at least one archive for each month
+ }
+ '';
+ };
+
+ prune.prefix = mkOption {
+ type = types.str;
+ description = ''
+ Only consider archive names starting with this prefix for pruning.
+ By default, only archives created by this job are considered.
+ Use "" to consider all archives.
+ '';
+ default = config.archiveBaseName;
+ defaultText = "\${archiveBaseName}";
+ };
+
+ environment = mkOption {
+ type = with types; attrsOf str;
+ description = ''
+ Environment variables passed to the backup script.
+ You can for example specify which SSH key to use.
+ '';
+ default = { };
+ example = { BORG_RSH = "ssh -i /path/to/key"; };
+ };
+
+ preHook = mkOption {
+ type = types.lines;
+ description = ''
+ Shell commands to run before the backup.
+ This can for example be used to mount file systems.
+ '';
+ default = "";
+ example = ''
+ # To add excluded paths at runtime
+ extraCreateArgs="$extraCreateArgs --exclude /some/path"
+ '';
+ };
+
+ postInit = mkOption {
+ type = types.lines;
+ description = ''
+ Shell commands to run after borg init.
+ '';
+ default = "";
+ };
+
+ postCreate = mkOption {
+ type = types.lines;
+ description = ''
+ Shell commands to run after borg create. The name
+ of the created archive is stored in $archiveName.
+ '';
+ default = "";
+ };
+
+ postPrune = mkOption {
+ type = types.lines;
+ description = ''
+ Shell commands to run after borg prune.
+ '';
+ default = "";
+ };
+
+ postHook = mkOption {
+ type = types.lines;
+ description = ''
+ Shell commands to run just before exit. They are executed
+ even if a previous command exits with a non-zero exit code.
+ The latter is available as $exitStatus.
+ '';
+ default = "";
+ };
+
+ extraInitArgs = mkOption {
+ type = types.str;
+ description = ''
+ Additional arguments for borg init.
+ Can also be set at runtime using $extraInitArgs.
+ '';
+ default = "";
+ example = "--append-only";
+ };
+
+ extraCreateArgs = mkOption {
+ type = types.str;
+ description = ''
+ Additional arguments for borg create.
+ Can also be set at runtime using $extraCreateArgs.
+ '';
+ default = "";
+ example = "--stats --checkpoint-interval 600";
+ };
+
+ extraPruneArgs = mkOption {
+ type = types.str;
+ description = ''
+ Additional arguments for borg prune.
+ Can also be set at runtime using $extraPruneArgs.
+ '';
+ default = "";
+ example = "--save-space";
+ };
+
+ };
+ }
+ ));
+ };
+
+ options.services.borgbackup.repos = mkOption {
+ description = ''
+ Serve BorgBackup repositories to given public SSH keys,
+ restricting their access to the repository only.
+ Also, clients do not need to specify the absolute path when accessing the repository,
+ i.e. user@machine:. is enough. (Note colon and dot.)
+ '';
+ default = { };
+ type = types.attrsOf (types.submodule (
+ { name, config, ... }: {
+ options = {
+
+ path = mkOption {
+ type = types.path;
+ description = ''
+ Where to store the backups. Note that the directory
+ is created automatically, with correct permissions.
+ '';
+ default = "/var/lib/borgbackup";
+ };
+
+ user = mkOption {
+ type = types.str;
+ description = ''
+ The user borg serve is run as.
+ User or group needs write permission
+ for the specified .
+ '';
+ default = "borg";
+ };
+
+ group = mkOption {
+ type = types.str;
+ description = ''
+ The group borg serve is run as.
+ User or group needs write permission
+ for the specified .
+ '';
+ default = "borg";
+ };
+
+ authorizedKeys = mkOption {
+ type = with types; listOf str;
+ description = ''
+ Public SSH keys that are given full write access to this repository.
+ You should use a different SSH key for each repository you write to, because
+ the specified keys are restricted to running borg serve
+ and can only access this single repository.
+ '';
+ default = [ ];
+ };
+
+ authorizedKeysAppendOnly = mkOption {
+ type = with types; listOf str;
+ description = ''
+ Public SSH keys that can only be used to append new data (archives) to the repository.
+ Note that archives can still be marked as deleted and are subsequently removed from disk
+ upon accessing the repo with full write access, e.g. when pruning.
+ '';
+ default = [ ];
+ };
+
+ allowSubRepos = mkOption {
+ type = types.bool;
+ description = ''
+ Allow clients to create repositories in subdirectories of the
+ specified . These can be accessed using
+ user@machine:path/to/subrepo. Note that a
+ applies to repositories independently.
+ Therefore, if this is enabled, clients can create multiple
+ repositories and upload an arbitrary amount of data.
+ '';
+ default = false;
+ };
+
+ quota = mkOption {
+ # See the definition of parse_file_size() in src/borg/helpers/parseformat.py
+ type = with types; nullOr (strMatching "[[:digit:].]+[KMGTP]?");
+ description = ''
+ Storage quota for the repository. This quota is ensured for all
+ sub-repositories if is enabled
+ but not for the overall storage space used.
+ '';
+ default = null;
+ example = "100G";
+ };
+
+ };
+ }
+ ));
+ };
+
+ ###### implementation
+
+ config = mkIf (with config.services.borgbackup; jobs != { } || repos != { })
+ (with config.services.borgbackup; {
+ assertions =
+ mapAttrsToList mkPassAssertion jobs
+ ++ mapAttrsToList mkKeysAssertion repos;
+
+ system.activationScripts = mapAttrs' mkActivationScript jobs;
+
+ systemd.services =
+ # A job named "foo" is mapped to systemd.services.borgbackup-job-foo
+ mapAttrs' mkBackupService jobs
+ # A repo named "foo" is mapped to systemd.services.borgbackup-repo-foo
+ // mapAttrs' mkRepoService repos;
+
+ users = mkMerge (mapAttrsToList mkUsersConfig repos);
+
+ environment.systemPackages = with pkgs; [ borgbackup ];
+ });
+}
diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix
new file mode 100644
index 000000000000..9497d8c18bb7
--- /dev/null
+++ b/nixos/modules/services/backup/crashplan-small-business.nix
@@ -0,0 +1,74 @@
+{ config, pkgs, lib, ... }:
+
+let
+ cfg = config.services.crashplansb;
+ crashplansb = pkgs.crashplansb.override { maxRam = cfg.maxRam; };
+ varDir = "/var/lib/crashplan";
+in
+
+with lib;
+
+{
+ options = {
+ services.crashplansb = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Starts crashplan for small business background service.
+ '';
+ };
+ maxRam = mkOption {
+ default = "1024m";
+ example = "2G";
+ type = types.str;
+ description = ''
+ Maximum amount of ram that the crashplan engine should use.
+ '';
+ };
+ openPorts = mkOption {
+ description = "Open ports in the firewall for crashplan.";
+ default = true;
+ type = types.bool;
+ };
+ ports = mkOption {
+ # https://support.code42.com/Administrator/6/Planning_and_installing/TCP_and_UDP_ports_used_by_the_Code42_platform
+ # used ports can also be checked in the desktop app console using the command connection.info
+ description = "which ports to open.";
+ default = [ 4242 4243 4244 4247 ];
+ type = types.listOf types.int;
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ crashplansb ];
+ networking.firewall.allowedTCPPorts = mkIf cfg.openPorts cfg.ports;
+
+ systemd.services.crashplansb = {
+ description = "CrashPlan Backup Engine";
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" "local-fs.target" ];
+
+ preStart = ''
+ install -d -m 755 ${crashplansb.vardir}
+ install -d -m 700 ${crashplansb.vardir}/conf
+ install -d -m 700 ${crashplansb.manifestdir}
+ install -d -m 700 ${crashplansb.vardir}/cache
+ install -d -m 700 ${crashplansb.vardir}/backupArchives
+ install -d -m 777 ${crashplansb.vardir}/log
+ cp -avn ${crashplansb}/conf.template/* ${crashplansb.vardir}/conf
+ '';
+
+ serviceConfig = {
+ Type = "forking";
+ EnvironmentFile = "${crashplansb}/bin/run.conf";
+ ExecStart = "${crashplansb}/bin/CrashPlanEngine start";
+ ExecStop = "${crashplansb}/bin/CrashPlanEngine stop";
+ PIDFile = "${crashplansb.vardir}/CrashPlanEngine.pid";
+ WorkingDirectory = crashplansb;
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 7c9dedb67ad2..59e9d122fb50 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -115,7 +115,7 @@ in
description = ''
Print global archive statistics upon completion.
The output is available via
- systemctl status tarsnap@archive-name.
+ systemctl status tarsnap-archive-name.
'';
};
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index baf99930e3eb..762bb4b38675 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -1,39 +1,372 @@
{ config, lib, pkgs, ... }:
with lib;
+with types;
let
+
+ # Converts a plan like
+ # { "1d" = "1h"; "1w" = "1d"; }
+ # into
+ # "1d=>1h,1w=>1d"
+ attrToPlan = attrs: concatStringsSep "," (builtins.attrValues (
+ mapAttrs (n: v: "${n}=>${v}") attrs));
+
+ planDescription = ''
+ The znapzend backup plan to use for the source.
+
+
+ The plan specifies how often to backup and for how long to keep the
+ backups. It consists of a series of retention periodes to interval
+ associations:
+
+
+
+ retA=>intA,retB=>intB,...
+
+
+
+ Both intervals and retention periods are expressed in standard units
+ of time or multiples of them. You can use both the full name or a
+ shortcut according to the following listing:
+
+
+
+ second|sec|s, minute|min, hour|h, day|d, week|w, month|mon|m, year|y
+
+
+
+ See znapzendzetup1 for more info.
+ '';
+ planExample = "1h=>10min,1d=>1h,1w=>1d,1m=>1w,1y=>1m";
+
+ # A type for a string of the form number{b|k|M|G}
+ mbufferSizeType = str // {
+ check = x: str.check x && builtins.isList (builtins.match "^[0-9]+[bkMG]$" x);
+ description = "string of the form number{b|k|M|G}";
+ };
+
+ # Type for a string that must contain certain other strings (the list parameter).
+ # Note that these would need regex escaping.
+ stringContainingStrings = list: let
+ matching = s: map (str: builtins.match ".*${str}.*" s) list;
+ in str // {
+ check = x: str.check x && all isList (matching x);
+ description = "string containing all of the characters ${concatStringsSep ", " list}";
+ };
+
+ timestampType = stringContainingStrings [ "%Y" "%m" "%d" "%H" "%M" "%S" ];
+
+ destType = srcConfig: submodule ({ name, ... }: {
+ options = {
+
+ label = mkOption {
+ type = str;
+ description = "Label for this destination. Defaults to the attribute name.";
+ };
+
+ plan = mkOption {
+ type = str;
+ description = planDescription;
+ example = planExample;
+ };
+
+ dataset = mkOption {
+ type = str;
+ description = "Dataset name to send snapshots to.";
+ example = "tank/main";
+ };
+
+ host = mkOption {
+ type = nullOr str;
+ description = ''
+ Host to use for the destination dataset. Can be prefixed with
+ user@ to specify the ssh user.
+ '';
+ default = null;
+ example = "john@example.com";
+ };
+
+ presend = mkOption {
+ type = nullOr str;
+ description = ''
+ Command to run before sending the snapshot to the destination.
+ Intended to run a remote script via ssh on the
+ destination, e.g. to bring up a backup disk or server or to put a
+ zpool online/offline. See also .
+ '';
+ default = null;
+ example = "ssh root@bserv zpool import -Nf tank";
+ };
+
+ postsend = mkOption {
+ type = nullOr str;
+ description = ''
+ Command to run after sending the snapshot to the destination.
+ Intended to run a remote script via ssh on the
+ destination, e.g. to bring up a backup disk or server or to put a
+ zpool online/offline. See also .
+ '';
+ default = null;
+ example = "ssh root@bserv zpool export tank";
+ };
+ };
+
+ config = {
+ label = mkDefault name;
+ plan = mkDefault srcConfig.plan;
+ };
+ });
+
+
+
+ srcType = submodule ({ name, config, ... }: {
+ options = {
+
+ enable = mkOption {
+ type = bool;
+ description = "Whether to enable this source.";
+ default = true;
+ };
+
+ recursive = mkOption {
+ type = bool;
+ description = "Whether to do recursive snapshots.";
+ default = false;
+ };
+
+ mbuffer = {
+ enable = mkOption {
+ type = bool;
+ description = "Whether to use mbuffer.";
+ default = false;
+ };
+
+ port = mkOption {
+ type = nullOr ints.u16;
+ description = ''
+ Port to use for mbuffer.
+
+
+ If this is null, it will run mbuffer through
+ ssh.
+
+
+ If this is not null, it will run mbuffer
+ directly through TCP, which is not encrypted but faster. In that
+ case the given port needs to be open on the destination host.
+ '';
+ default = null;
+ };
+
+ size = mkOption {
+ type = mbufferSizeType;
+ description = ''
+ The size for mbuffer.
+ Supports the units b, k, M, G.
+ '';
+ default = "1G";
+ example = "128M";
+ };
+ };
+
+ presnap = mkOption {
+ type = nullOr str;
+ description = ''
+ Command to run before snapshots are taken on the source dataset,
+ e.g. for database locking/flushing. See also
+ .
+ '';
+ default = null;
+ example = literalExample ''
+ ''${pkgs.mariadb}/bin/mysql -e "set autocommit=0;flush tables with read lock;\\! ''${pkgs.coreutils}/bin/sleep 600" & ''${pkgs.coreutils}/bin/echo $! > /tmp/mariadblock.pid ; sleep 10
+ '';
+ };
+
+ postsnap = mkOption {
+ type = nullOr str;
+ description = ''
+ Command to run after snapshots are taken on the source dataset,
+ e.g. for database unlocking. See also .
+ '';
+ default = null;
+ example = literalExample ''
+ ''${pkgs.coreutils}/bin/kill `''${pkgs.coreutils}/bin/cat /tmp/mariadblock.pid`;''${pkgs.coreutils}/bin/rm /tmp/mariadblock.pid
+ '';
+ };
+
+ timestampFormat = mkOption {
+ type = timestampType;
+ description = ''
+ The timestamp format to use for constructing snapshot names.
+ The syntax is strftime-like. The string must
+ consist of the mandatory %Y %m %d %H %M %S.
+ Optionally - _ . : characters as well as any
+ alphanumeric character are allowed. If suffixed by a
+ Z, times will be in UTC.
+ '';
+ default = "%Y-%m-%d-%H%M%S";
+ example = "znapzend-%m.%d.%Y-%H%M%SZ";
+ };
+
+ sendDelay = mkOption {
+ type = int;
+ description = ''
+ Specify delay (in seconds) before sending snaps to the destination.
+ May be useful if you want to control sending time.
+ '';
+ default = 0;
+ example = 60;
+ };
+
+ plan = mkOption {
+ type = str;
+ description = planDescription;
+ example = planExample;
+ };
+
+ dataset = mkOption {
+ type = str;
+ description = "The dataset to use for this source.";
+ example = "tank/home";
+ };
+
+ destinations = mkOption {
+ type = loaOf (destType config);
+ description = "Additional destinations.";
+ default = {};
+ example = literalExample ''
+ {
+ local = {
+ dataset = "btank/backup";
+ presend = "zpool import -N btank";
+ postsend = "zpool export btank";
+ };
+ remote = {
+ host = "john@example.com";
+ dataset = "tank/john";
+ };
+ };
+ '';
+ };
+ };
+
+ config = {
+ dataset = mkDefault name;
+ };
+
+ });
+
+ ### Generating the configuration from here
+
cfg = config.services.znapzend;
+
+ onOff = b: if b then "on" else "off";
+ nullOff = b: if isNull b then "off" else toString b;
+ stripSlashes = replaceStrings [ "/" ] [ "." ];
+
+ attrsToFile = config: concatStringsSep "\n" (builtins.attrValues (
+ mapAttrs (n: v: "${n}=${v}") config));
+
+ mkDestAttrs = dst: with dst;
+ mapAttrs' (n: v: nameValuePair "dst_${label}${n}" v) ({
+ "" = optionalString (! isNull host) "${host}:" + dataset;
+ _plan = plan;
+ } // optionalAttrs (presend != null) {
+ _precmd = presend;
+ } // optionalAttrs (postsend != null) {
+ _pstcmd = postsend;
+ });
+
+ mkSrcAttrs = srcCfg: with srcCfg; {
+ enabled = onOff enable;
+ mbuffer = with mbuffer; if enable then "${pkgs.mbuffer}/bin/mbuffer"
+ + optionalString (port != null) ":${toString port}" else "off";
+ mbuffer_size = mbuffer.size;
+ post_znap_cmd = nullOff postsnap;
+ pre_znap_cmd = nullOff presnap;
+ recursive = onOff recursive;
+ src = dataset;
+ src_plan = plan;
+ tsformat = timestampFormat;
+ zend_delay = toString sendDelay;
+ } // fold (a: b: a // b) {} (
+ map mkDestAttrs (builtins.attrValues destinations)
+ );
+
+ files = mapAttrs' (n: srcCfg: let
+ fileText = attrsToFile (mkSrcAttrs srcCfg);
+ in {
+ name = srcCfg.dataset;
+ value = pkgs.writeText (stripSlashes srcCfg.dataset) fileText;
+ }) cfg.zetup;
+
in
{
options = {
services.znapzend = {
- enable = mkEnableOption "ZnapZend daemon";
+ enable = mkEnableOption "ZnapZend ZFS backup daemon";
logLevel = mkOption {
default = "debug";
example = "warning";
- type = lib.types.enum ["debug" "info" "warning" "err" "alert"];
- description = "The log level when logging to file. Any of debug, info, warning, err, alert. Default in daemonized form is debug.";
+ type = enum ["debug" "info" "warning" "err" "alert"];
+ description = ''
+ The log level when logging to file. Any of debug, info, warning, err,
+ alert. Default in daemonized form is debug.
+ '';
};
logTo = mkOption {
- type = types.str;
+ type = str;
default = "syslog::daemon";
example = "/var/log/znapzend.log";
- description = "Where to log to (syslog::<facility> or <filepath>).";
+ description = ''
+ Where to log to (syslog::<facility> or <filepath>).
+ '';
};
noDestroy = mkOption {
- type = types.bool;
+ type = bool;
default = false;
description = "Does all changes to the filesystem except destroy.";
};
autoCreation = mkOption {
- type = types.bool;
+ type = bool;
+ default = false;
+ description = "Automatically create the destination dataset if it does not exists.";
+ };
+
+ zetup = mkOption {
+ type = loaOf srcType;
+ description = "Znapzend configuration.";
+ default = {};
+ example = literalExample ''
+ {
+ "tank/home" = {
+ # Make snapshots of tank/home every hour, keep those for 1 day,
+ # keep every days snapshot for 1 month, etc.
+ plan = "1d=>1h,1m=>1d,1y=>1m";
+ recursive = true;
+ # Send all those snapshots to john@example.com:rtank/john as well
+ destinations.remote = {
+ host = "john@example.com";
+ dataset = "rtank/john";
+ };
+ };
+ };
+ '';
+ };
+
+ pure = mkOption {
+ type = bool;
+ description = ''
+ Do not persist any stateful znapzend setups. If this option is
+ enabled, your previously set znapzend setups will be cleared and only
+ the ones defined with this module will be applied.
+ '';
default = false;
- description = "Automatically create the dataset on dest if it does not exists.";
};
};
};
@@ -49,12 +382,30 @@ in
path = with pkgs; [ zfs mbuffer openssh ];
+ preStart = optionalString cfg.pure ''
+ echo Resetting znapzend zetups
+ ${pkgs.znapzend}/bin/znapzendzetup list \
+ | grep -oP '(?<=\*\*\* backup plan: ).*(?= \*\*\*)' \
+ | xargs ${pkgs.znapzend}/bin/znapzendzetup delete
+ '' + concatStringsSep "\n" (mapAttrsToList (dataset: config: ''
+ echo Importing znapzend zetup ${config} for dataset ${dataset}
+ ${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config}
+ '') files);
+
serviceConfig = {
- ExecStart = "${pkgs.znapzend}/bin/znapzend --logto=${cfg.logTo} --loglevel=${cfg.logLevel} ${optionalString cfg.noDestroy "--nodestroy"} ${optionalString cfg.autoCreation "--autoCreation"}";
+ ExecStart = let
+ args = concatStringsSep " " [
+ "--logto=${cfg.logTo}"
+ "--loglevel=${cfg.logLevel}"
+ (optionalString cfg.noDestroy "--nodestroy")
+ (optionalString cfg.autoCreation "--autoCreation")
+ ]; in "${pkgs.znapzend}/bin/znapzend ${args}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
Restart = "on-failure";
};
};
};
};
+
+ meta.maintainers = with maintainers; [ infinisil ];
}
diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix
index 75d71fccfda4..e331889b9dd5 100644
--- a/nixos/modules/services/cluster/kubernetes/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix
@@ -6,12 +6,12 @@ let
cfg = config.services.kubernetes.addons.dashboard;
name = "gcr.io/google_containers/kubernetes-dashboard-amd64";
- version = "v1.6.3";
+ version = "v1.8.2";
image = pkgs.dockerTools.pullImage {
imageName = name;
imageTag = version;
- sha256 = "1sf54d96nkgic9hir9c6p14gw24ns1k5d5a0r1sg414kjrvic0b4";
+ sha256 = "11h0fz3wxp0f10fsyqaxjm7l2qg7xws50dv5iwlck5gb1fjmajad";
};
in {
options.services.kubernetes.addons.dashboard = {
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 077953e4d4f8..4a2c6f0833eb 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -301,8 +301,8 @@ in {
Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See
'';
- default = ["RBAC"];
- type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC"]);
+ default = ["RBAC" "Node"];
+ type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]);
};
authorizationPolicy = mkOption {
@@ -344,7 +344,7 @@ in {
Kubernetes admission control plugins to use. See
'';
- default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds"];
+ default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"];
example = [
"NamespaceLifecycle" "NamespaceExists" "LimitRanger"
"SecurityContextDeny" "ServiceAccount" "ResourceQuota"
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index fb91a29a4000..45d34f5b76f5 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -6,14 +6,20 @@ let
cfg = config.services.slurm;
# configuration file can be generated by http://slurm.schedmd.com/configurator.html
- configFile = pkgs.writeText "slurm.conf"
+ configFile = pkgs.writeText "slurm.conf"
''
${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''}
+ PlugStackConfig=${plugStackConfig}
${cfg.extraConfig}
'';
+
+ plugStackConfig = pkgs.writeText "plugstack.conf"
+ ''
+ ${optionalString cfg.enableSrunX11 ''optional ${pkgs.slurm-spank-x11}/lib/x11.so''}
+ '';
in
{
@@ -28,7 +34,7 @@ in
enable = mkEnableOption "slurm control daemon";
};
-
+
client = {
enable = mkEnableOption "slurm rlient daemon";
@@ -86,8 +92,19 @@ in
'';
};
+ enableSrunX11 = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ 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 requires 'services.openssh.forwardX11'
+ to be enabled on the compute nodes.
+ '';
+ };
+
extraConfig = mkOption {
- default = "";
+ default = "";
type = types.lines;
description = ''
Extra configuration options that will be added verbatim at
@@ -134,7 +151,8 @@ in
environment.systemPackages = [ wrappedSlurm ];
systemd.services.slurmd = mkIf (cfg.client.enable) {
- path = with pkgs; [ wrappedSlurm coreutils ];
+ path = with pkgs; [ wrappedSlurm coreutils ]
+ ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
wantedBy = [ "multi-user.target" ];
after = [ "systemd-tmpfiles-clean.service" ];
@@ -152,8 +170,9 @@ in
};
systemd.services.slurmctld = mkIf (cfg.server.enable) {
- path = with pkgs; [ wrappedSlurm munge coreutils ];
-
+ path = with pkgs; [ wrappedSlurm munge coreutils ]
+ ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
+
wantedBy = [ "multi-user.target" ];
after = [ "network.target" "munged.service" ];
requires = [ "munged.service" ];
diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 9c06e1d43bbe..03af9a7859ec 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -4,14 +4,31 @@ with lib;
let
cfg = config.services.buildkite-agent;
- configFile = pkgs.writeText "buildkite-agent.cfg"
- ''
- token="${cfg.token}"
- name="${cfg.name}"
- meta-data="${cfg.meta-data}"
- hooks-path="${cfg.package}/share/hooks"
- build-path="${cfg.dataDir}"
+
+ mkHookOption = { name, description, example ? null }: {
+ inherit name;
+ value = mkOption {
+ default = null;
+ inherit description;
+ type = types.nullOr types.lines;
+ } // (if example == null then {} else { inherit example; });
+ };
+ mkHookOptions = hooks: listToAttrs (map mkHookOption hooks);
+
+ hooksDir = let
+ mkHookEntry = name: value: ''
+ cat > $out/${name} <key=value pairs.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = "debug=true";
+ description = ''
+ Extra lines to be added verbatim to the configuration file.
'';
};
openssh =
- { privateKey = mkOption {
- type = types.str;
+ { privateKeyPath = mkOption {
+ type = types.path;
description = ''
Private agent key.
+
+ A run-time path to the key file, which is supposed to be provisioned
+ outside of Nix store.
'';
};
- publicKey = mkOption {
- type = types.str;
+ publicKeyPath = mkOption {
+ type = types.path;
description = ''
Public agent key.
+
+ A run-time path to the key file, which is supposed to be provisioned
+ outside of Nix store.
'';
};
};
+
+ hooks = mkHookOptions [
+ { name = "checkout";
+ description = ''
+ The `checkout` hook script will replace the default checkout routine of the
+ bootstrap.sh script. You can use this hook to do your own SCM checkout
+ behaviour
+ ''; }
+ { name = "command";
+ description = ''
+ The `command` hook script will replace the default implementation of running
+ the build command.
+ ''; }
+ { name = "environment";
+ description = ''
+ The `environment` hook will run before all other commands, and can be used
+ to set up secrets, data, etc. Anything exported in hooks will be available
+ to the build script.
+
+ Note: the contents of this file will be copied to the world-readable
+ Nix store.
+ '';
+ example = ''
+ export SECRET_VAR=`head -1 /run/keys/secret`
+ ''; }
+ { name = "post-artifact";
+ description = ''
+ The `post-artifact` hook will run just after artifacts are uploaded
+ ''; }
+ { name = "post-checkout";
+ description = ''
+ The `post-checkout` hook will run after the bootstrap script has checked out
+ your projects source code.
+ ''; }
+ { name = "post-command";
+ description = ''
+ The `post-command` hook will run after the bootstrap script has run your
+ build commands
+ ''; }
+ { name = "pre-artifact";
+ description = ''
+ The `pre-artifact` hook will run just before artifacts are uploaded
+ ''; }
+ { name = "pre-checkout";
+ description = ''
+ The `pre-checkout` hook will run just before your projects source code is
+ checked out from your SCM provider
+ ''; }
+ { name = "pre-command";
+ description = ''
+ The `pre-command` hook will run just before your build command runs
+ ''; }
+ { name = "pre-exit";
+ description = ''
+ The `pre-exit` hook will run just before your build job finishes
+ ''; }
+ ];
+
+ hooksPath = mkOption {
+ type = types.path;
+ default = hooksDir;
+ defaultText = "generated from services.buildkite-agent.hooks";
+ description = ''
+ Path to the directory storing the hooks.
+ Consider using
+ instead.
+ '';
+ };
};
};
@@ -84,6 +190,7 @@ in
home = cfg.dataDir;
createHome = true;
description = "Buildkite agent user";
+ extraGroups = [ "keys" ];
};
environment.systemPackages = [ cfg.package ];
@@ -92,28 +199,54 @@ in
{ description = "Buildkite Agent";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- path = cfg.runtimePackages;
+ path = cfg.runtimePackages ++ [ pkgs.coreutils ];
environment = config.networking.proxy.envVars // {
HOME = cfg.dataDir;
NIX_REMOTE = "daemon";
};
- preStart = ''
- ${pkgs.coreutils}/bin/mkdir -m 0700 -p ${cfg.dataDir}/.ssh
- echo "${cfg.openssh.privateKey}" > ${cfg.dataDir}/.ssh/id_rsa
- ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa
+ ## NB: maximum care is taken so that secrets (ssh keys and the CI token)
+ ## don't end up in the Nix store.
+ preStart = let
+ sshDir = "${cfg.dataDir}/.ssh";
+ in
+ ''
+ mkdir -m 0700 -p "${sshDir}"
+ cp -f "${toString cfg.openssh.privateKeyPath}" "${sshDir}/id_rsa"
+ cp -f "${toString cfg.openssh.publicKeyPath}" "${sshDir}/id_rsa.pub"
+ chmod 600 "${sshDir}"/id_rsa*
- echo "${cfg.openssh.publicKey}" > ${cfg.dataDir}/.ssh/id_rsa.pub
- ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa.pub
- '';
+ cat > "${cfg.dataDir}/buildkite-agent.cfg" <' are mutually exclusive.
+ '';
+ }
+ ];
};
+ imports = [
+ (mkRenamedOptionModule [ "services" "buildkite-agent" "token" ] [ "services" "buildkite-agent" "tokenPath" ])
+ (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "privateKey" ] [ "services" "buildkite-agent" "openssh" "privateKeyPath" ])
+ (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "publicKey" ] [ "services" "buildkite-agent" "openssh" "publicKeyPath" ])
+ ];
}
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 43fec5ff5bb2..2fa7c59a965d 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -28,6 +28,7 @@ let
serverEnv = env //
{ HYDRA_TRACKER = cfg.tracker;
+ XDG_CACHE_HOME = "${baseDir}/www/.cache";
COLUMNS = "80";
PGPASSFILE = "${baseDir}/pgpass-www"; # grrr
} // (optionalAttrs cfg.debugServer { DBIC_TRACE = "1"; });
@@ -225,14 +226,14 @@ in
services.hydra.extraConfig =
''
- using_frontend_proxy 1
- base_uri ${cfg.hydraURL}
- notification_sender ${cfg.notificationSender}
- max_servers 25
+ using_frontend_proxy = 1
+ base_uri = ${cfg.hydraURL}
+ notification_sender = ${cfg.notificationSender}
+ max_servers = 25
${optionalString (cfg.logo != null) ''
- hydra_logo ${cfg.logo}
+ hydra_logo = ${cfg.logo}
''}
- gc_roots_dir ${cfg.gcRootsDir}
+ gc_roots_dir = ${cfg.gcRootsDir}
use-substitutes = ${if cfg.useSubstitutes then "1" else "0"}
'';
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 0dd59e4fb444..c2f4e9c0c5a7 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -145,6 +145,11 @@ in {
};
config = mkIf cfg.enable {
+ # server references the dejavu fonts
+ environment.systemPackages = [
+ pkgs.dejavu_fonts
+ ];
+
users.extraGroups = optional (cfg.group == "jenkins") {
name = "jenkins";
gid = config.ids.gids.jenkins;
@@ -200,15 +205,17 @@ in {
${replacePlugins}
'';
+ # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
script = ''
${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
--httpPort=${toString cfg.port} \
--prefix=${cfg.prefix} \
+ -Djava.awt.headless=true \
${concatStringsSep " " cfg.extraOptions}
'';
postStart = ''
- until [[ $(${pkgs.curl.bin}/bin/curl -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do
+ until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do
sleep 1
done
'';
diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
index 906cb320df98..d528355671f6 100644
--- a/nixos/modules/services/databases/4store-endpoint.nix
+++ b/nixos/modules/services/databases/4store-endpoint.nix
@@ -2,7 +2,7 @@
let
cfg = config.services.fourStoreEndpoint;
endpointUser = "fourstorehttp";
- run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${endpointUser} -c";
+ run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${endpointUser} -c";
in
with lib;
{
diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
index 62856822f906..abb62e1f2637 100644
--- a/nixos/modules/services/databases/4store.nix
+++ b/nixos/modules/services/databases/4store.nix
@@ -3,7 +3,7 @@ let
cfg = config.services.fourStore;
stateDir = "/var/lib/4store";
fourStoreUser = "fourstore";
- run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fourStoreUser}";
+ run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fourStoreUser}";
in
with lib;
{
diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index c6875af506d3..46bc6fc5c132 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
@@ -40,11 +40,7 @@ in
description = "The port to bind to";
};
- socket = mkOption {
- default = "";
- description = "Unix socket path to listen on. Setting this will disable network support";
- example = "/var/run/memcached";
- };
+ enableUnixSocket = mkEnableOption "unix socket at /run/memcached/memcached.sock";
maxMemory = mkOption {
default = 64;
@@ -68,31 +64,40 @@ in
config = mkIf config.services.memcached.enable {
- users.extraUsers.memcached =
- { name = cfg.user;
- uid = config.ids.uids.memcached;
- description = "Memcached server user";
- };
+ users.extraUsers = optional (cfg.user == "memcached") {
+ name = "memcached";
+ description = "Memcached server user";
+ };
environment.systemPackages = [ memcached ];
- systemd.services.memcached =
- { description = "Memcached server";
+ systemd.services.memcached = {
+ description = "Memcached server";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
- serviceConfig = {
- ExecStart =
- let
- networking = if cfg.socket != ""
- then "-s ${cfg.socket}"
- else "-l ${cfg.listen} -p ${toString cfg.port}";
- in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}";
+ serviceConfig = {
+ PermissionsStartOnly = true;
+ ExecStartPre = optionals cfg.enableUnixSocket [
+ "${pkgs.coreutils}/bin/install -d -o ${cfg.user} /run/memcached/"
+ "${pkgs.coreutils}/bin/chown -R ${cfg.user} /run/memcached/"
+ ];
+ ExecStart =
+ let
+ networking = if cfg.enableUnixSocket
+ then "-s /run/memcached/memcached.sock"
+ else "-l ${cfg.listen} -p ${toString cfg.port}";
+ in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}";
- User = cfg.user;
- };
+ User = cfg.user;
};
+ };
};
+ imports = [
+ (mkRemovedOptionModule ["services" "memcached" "socket"] ''
+ This option was replaced by a fixed unix socket path at /run/memcached/memcached.sock enabled using services.memached.enableUnixSocket.
+ '')
+ ];
}
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index a3bf4f9ba925..21a131b90a81 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -7,14 +7,12 @@ let
cfg = config.services.mysql;
mysql = cfg.package;
-
- isMariaDB =
+
+ isMariaDB =
let
pName = _p: (builtins.parseDrvName (_p.name)).name;
in pName mysql == pName pkgs.mariadb;
- atLeast55 = versionAtLeast mysql.mysqlVersion "5.5";
-
pidFile = "${cfg.pidDir}/mysqld.pid";
mysqldOptions =
@@ -28,13 +26,6 @@ let
${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
- ${optionalString (cfg.replication.role == "slave" && !atLeast55)
- ''
- master-host = ${cfg.replication.masterHost}
- master-user = ${cfg.replication.masterUser}
- master-password = ${cfg.replication.masterPassword}
- master-port = ${toString cfg.replication.masterPort}
- ''}
${optionalString (cfg.ensureUsers != [])
''
plugin-load-add = auth_socket.so
@@ -142,7 +133,7 @@ in
'';
example = [
"nextcloud"
- "piwik"
+ "matomo"
];
};
@@ -298,10 +289,10 @@ in
# Create initial databases
if ! test -e "${cfg.dataDir}/${database.name}"; then
echo "Creating initial database: ${database.name}"
- ( echo "create database ${database.name};"
+ ( echo 'create database `${database.name}`;'
${optionalString (database ? "schema") ''
- echo "use ${database.name};"
+ echo 'use `${database.name}`;'
if [ -f "${database.schema}" ]
then
@@ -315,7 +306,7 @@ in
fi
'') cfg.initialDatabases}
- ${optionalString (cfg.replication.role == "master" && atLeast55)
+ ${optionalString (cfg.replication.role == "master")
''
# Set up the replication master
@@ -326,7 +317,7 @@ in
) | ${mysql}/bin/mysql -u root -N
''}
- ${optionalString (cfg.replication.role == "slave" && atLeast55)
+ ${optionalString (cfg.replication.role == "slave")
''
# Set up the replication slave
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index e884098cb08d..a67c61eb9949 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -7,8 +7,10 @@ let
cfg = config.services.openldap;
openldap = pkgs.openldap;
+ dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents;
configFile = pkgs.writeText "slapd.conf" cfg.extraConfig;
-
+ configOpts = if cfg.configDir == null then "-f ${configFile}"
+ else "-F ${cfg.configDir}";
in
{
@@ -81,6 +83,34 @@ in
'''
'';
};
+
+ declarativeContents = mkOption {
+ type = with types; nullOr lines;
+ default = null;
+ description = ''
+ Declarative contents for the LDAP database, in LDIF format.
+
+ Note a few facts when using it. First, the database
+ must be stored in the directory defined by
+ dataDir. Second, all dataDir will be erased
+ when starting the LDAP server. Third, modifications to the database
+ are not prevented, they are just dropped on the next reboot of the
+ server. Finally, performance-wise the database and indexes are rebuilt
+ on each server startup, so this will slow down server startup,
+ especially with large databases.
+ '';
+ example = ''
+ dn: dc=example,dc=org
+ objectClass: domain
+ dc: example
+
+ dn: ou=users,dc=example,dc=org
+ objectClass = organizationalUnit
+ ou: users
+
+ # ...
+ '';
+ };
};
};
@@ -88,7 +118,7 @@ in
###### implementation
- config = mkIf config.services.openldap.enable {
+ config = mkIf cfg.enable {
environment.systemPackages = [ openldap ];
@@ -98,11 +128,21 @@ in
after = [ "network.target" ];
preStart = ''
mkdir -p /var/run/slapd
- chown -R ${cfg.user}:${cfg.group} /var/run/slapd
- mkdir -p ${cfg.dataDir}
- chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
+ chown -R "${cfg.user}:${cfg.group}" /var/run/slapd
+ ${optionalString (cfg.declarativeContents != null) ''
+ rm -Rf "${cfg.dataDir}"
+ ''}
+ mkdir -p "${cfg.dataDir}"
+ ${optionalString (cfg.declarativeContents != null) ''
+ ${openldap.out}/bin/slapadd ${configOpts} -l ${dataFile}
+ ''}
+ chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}"
'';
- serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" ${if cfg.configDir == null then "-f "+configFile else "-F "+cfg.configDir}";
+ serviceConfig.ExecStart =
+ "${openldap.out}/libexec/slapd -d 0 " +
+ "-u '${cfg.user}' -g '${cfg.group}' " +
+ "-h '${concatStringsSep " " cfg.urlList}' " +
+ "${configOpts}";
};
users.extraUsers.openldap =
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 9b5e3735239f..0dcbfe2e47ac 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -122,7 +122,7 @@ in
extraPlugins = mkOption {
type = types.listOf types.path;
default = [];
- example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]";
+ example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]";
description = ''
When this list contains elements a new store path is created.
PostgreSQL and the elements are symlinked into it. Then pg_config,
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index a039ad138f6f..e4e38a4364a0 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -219,7 +219,6 @@ in
users.extraUsers.redis =
{ name = cfg.user;
- uid = config.ids.uids.redis;
description = "Redis database user";
};
diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
index 55ed2d9ee21b..cca98c43dc7a 100644
--- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
@@ -28,14 +28,15 @@ with lib;
###### implementation
- config = mkIf config.services.gnome3.at-spi2-core.enable {
-
- environment.systemPackages = [ pkgs.at_spi2_core ];
-
- services.dbus.packages = [ pkgs.at_spi2_core ];
-
- systemd.packages = [ pkgs.at_spi2_core ];
-
- };
+ config = mkMerge [
+ (mkIf config.services.gnome3.at-spi2-core.enable {
+ environment.systemPackages = [ pkgs.at-spi2-core ];
+ services.dbus.packages = [ pkgs.at-spi2-core ];
+ systemd.packages = [ pkgs.at-spi2-core ];
+ })
+ (mkIf (!config.services.gnome3.at-spi2-core.enable) {
+ environment.variables.NO_AT_BRIDGE = "1";
+ })
+ ];
}
diff --git a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
new file mode 100644
index 000000000000..2740a22c7ca0
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
@@ -0,0 +1,27 @@
+# Chrome GNOME Shell native host connector.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ ###### interface
+ options = {
+ services.gnome3.chrome-gnome-shell.enable = mkEnableOption ''
+ Chrome GNOME Shell native host connector, a DBus service
+ allowing to install GNOME Shell extensions from a web browser.
+ '';
+ };
+
+
+ ###### implementation
+ config = mkIf config.services.gnome3.chrome-gnome-shell.enable {
+ environment.etc = {
+ "chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json";
+ "opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json";
+ };
+
+ environment.systemPackages = [ pkgs.chrome-gnome-shell ];
+
+ services.dbus.packages = [ pkgs.chrome-gnome-shell ];
+ };
+}
diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index 86a47488d865..7e312a1b81eb 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -30,11 +30,11 @@ with lib;
config = mkIf config.services.gnome3.evolution-data-server.enable {
- environment.systemPackages = [ pkgs.gnome3.evolution_data_server ];
+ environment.systemPackages = [ pkgs.gnome3.evolution-data-server ];
- services.dbus.packages = [ pkgs.gnome3.evolution_data_server ];
+ services.dbus.packages = [ pkgs.gnome3.evolution-data-server ];
- systemd.packages = [ pkgs.gnome3.evolution_data_server ];
+ systemd.packages = [ pkgs.gnome3.evolution-data-server ];
};
diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
index 2a68af5a7dd8..aa1165ab3bba 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
@@ -31,9 +31,9 @@ with lib;
config = mkIf config.services.gnome3.gnome-keyring.enable {
- environment.systemPackages = [ pkgs.gnome3.gnome_keyring ];
+ environment.systemPackages = [ pkgs.gnome3.gnome-keyring ];
- services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ];
+ services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ];
};
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
index 0da4aca73ecb..4286251357f7 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
@@ -30,9 +30,9 @@ with lib;
config = mkIf config.services.gnome3.gnome-online-accounts.enable {
- environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ];
+ environment.systemPackages = [ pkgs.gnome3.gnome-online-accounts ];
- services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ];
+ services.dbus.packages = [ pkgs.gnome3.gnome-online-accounts ];
};
diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
index 3ac767bfa00d..fd14efee5f2e 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
@@ -30,11 +30,11 @@ with lib;
config = mkIf config.services.gnome3.gnome-terminal-server.enable {
- environment.systemPackages = [ pkgs.gnome3.gnome_terminal ];
+ environment.systemPackages = [ pkgs.gnome3.gnome-terminal ];
- services.dbus.packages = [ pkgs.gnome3.gnome_terminal ];
+ services.dbus.packages = [ pkgs.gnome3.gnome-terminal ];
- systemd.packages = [ pkgs.gnome3.gnome_terminal ];
+ systemd.packages = [ pkgs.gnome3.gnome-terminal ];
};
diff --git a/nixos/modules/services/desktops/gnome3/tracker-miners.nix b/nixos/modules/services/desktops/gnome3/tracker-miners.nix
new file mode 100644
index 000000000000..20154fc2fed3
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/tracker-miners.nix
@@ -0,0 +1,41 @@
+# Tracker Miners daemons.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.gnome3.tracker-miners = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable Tracker miners, indexing services for Tracker
+ search engine and metadata storage system.
+ '';
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.services.gnome3.tracker-miners.enable {
+
+ environment.systemPackages = [ pkgs.gnome3.tracker-miners ];
+
+ services.dbus.packages = [ pkgs.gnome3.tracker-miners ];
+
+ systemd.packages = [ pkgs.gnome3.tracker-miners ];
+
+ };
+
+}
diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix
new file mode 100644
index 000000000000..263a06156f84
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire.nix
@@ -0,0 +1,23 @@
+# pipewire service.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ ###### interface
+ options = {
+ services.pipewire = {
+ enable = mkEnableOption "pipewire service";
+ };
+ };
+
+
+ ###### implementation
+ config = mkIf config.services.pipewire.enable {
+ environment.systemPackages = [ pkgs.pipewire ];
+
+ systemd.packages = [ pkgs.pipewire ];
+ };
+
+ meta.maintainers = with lib.maintainers; [ jtojnar ];
+}
diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix
index 2554f3a1666f..f5401c180984 100644
--- a/nixos/modules/services/desktops/telepathy.nix
+++ b/nixos/modules/services/desktops/telepathy.nix
@@ -30,9 +30,9 @@ with lib;
config = mkIf config.services.telepathy.enable {
- environment.systemPackages = [ pkgs.telepathy_mission_control ];
+ environment.systemPackages = [ pkgs.telepathy-mission-control ];
- services.dbus.packages = [ pkgs.telepathy_mission_control ];
+ services.dbus.packages = [ pkgs.telepathy-mission-control ];
};
diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix
index 2c5a0c4849ef..bbc9bcf3dae1 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixos/modules/services/editors/emacs.nix
@@ -7,7 +7,7 @@ let
cfg = config.services.emacs;
editorScript = pkgs.writeScriptBin "emacseditor" ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
if [ -z "$1" ]; then
exec ${cfg.package}/bin/emacsclient --create-frame --alternate-editor ${cfg.package}/bin/emacs
else
diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index 1dc8ce93a0e5..3f6bf9de8931 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.factorio;
factorio = pkgs.factorio-headless;
name = "Factorio";
- stateDir = "/var/lib/factorio";
+ stateDir = cfg.stateDir;
mkSavePath = name: "${stateDir}/saves/${name}.zip";
configFile = pkgs.writeText "factorio.conf" ''
use-system-read-write-data-directories=true
@@ -25,7 +25,7 @@ let
password = cfg.password;
token = cfg.token;
game_password = cfg.game-password;
- require_user_verification = true;
+ require_user_verification = cfg.requireUserVerification;
max_upload_in_kilobytes_per_second = 0;
minimum_latency_in_ticks = 0;
ignore_player_limit_for_returning_players = false;
@@ -80,6 +80,15 @@ in
customizations.
'';
};
+ stateDir = mkOption {
+ type = types.path;
+ default = "/var/lib/factorio";
+ description = ''
+ The server's data directory.
+
+ The configuration and map will be stored here.
+ '';
+ };
mods = mkOption {
type = types.listOf types.package;
default = [];
@@ -148,6 +157,13 @@ in
Game password.
'';
};
+ requireUserVerification = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ When set to true, the server will only allow clients that have a valid factorio.com account.
+ '';
+ };
autosave-interval = mkOption {
type = types.nullOr types.int;
default = null;
diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix
deleted file mode 100644
index 71ff6bb2f3f0..000000000000
--- a/nixos/modules/services/games/ghost-one.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let
-
- cfg = config.services.ghostOne;
- ghostUser = "ghostone";
- stateDir = "/var/lib/ghost-one";
-
-in
-{
-
- ###### interface
-
- options = {
- services.ghostOne = {
-
- enable = mkOption {
- default = false;
- description = "Enable Ghost-One Warcraft3 game hosting server.";
- };
-
- language = mkOption {
- default = "English";
- type = types.enum [ "English" "Spanish" "Russian" "Serbian" "Turkish" ];
- description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish.";
- };
-
- war3path = mkOption {
- default = "";
- description = ''
- The path to your local Warcraft III directory, which must contain war3.exe, storm.dll, and game.dll.
- '';
- };
-
- mappath = mkOption {
- default = "";
- description = ''
- The path to the directory where you keep your map files. GHost One doesn't require
- map files but if it has access to them it can send them to players and automatically
- calculate most map config values. GHost One will search [bot_mappath + map_localpath]
- for the map file (map_localpath is set in each map's config file).
- '';
- };
-
- config = mkOption {
- default = "";
- description = "Extra configuration options.";
- };
-
- };
- };
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- users.extraUsers = singleton
- { name = ghostUser;
- uid = config.ids.uids.ghostone;
- description = "Ghost One game server user";
- home = stateDir;
- };
-
- users.extraGroups = singleton
- { name = ghostUser;
- gid = config.ids.gids.ghostone;
- };
-
- services.ghostOne.config = ''
-# bot_log = /dev/stderr
- bot_language = ${pkgs.ghostOne}/share/ghost-one/languages/${cfg.language}.cfg
- bot_war3path = ${cfg.war3path}
-
- bot_mapcfgpath = mapcfgs
- bot_savegamepath = savegames
- bot_mappath = ${cfg.mappath}
- bot_replaypath = replays
- '';
-
- systemd.services."ghost-one" = {
- wantedBy = [ "multi-user.target" ];
- script = ''
- mkdir -p ${stateDir}
- cd ${stateDir}
- chown ${ghostUser}:${ghostUser} .
-
- mkdir -p mapcfgs
- chown ${ghostUser}:${ghostUser} mapcfgs
-
- mkdir -p replays
- chown ${ghostUser}:${ghostUser} replays
-
- mkdir -p savegames
- chown ${ghostUser}:${ghostUser} savegames
-
- ln -sf ${pkgs.writeText "ghost.cfg" cfg.config} ghost.cfg
- ln -sf ${pkgs.ghostOne}/share/ghost-one/ip-to-country.csv
- ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${ghostUser} \
- -c "LANG=C ${pkgs.ghostOne}/bin/ghost++"
- '';
- };
-
- };
-
-}
diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix
index bb17c8859d84..0f05876aee32 100644
--- a/nixos/modules/services/hardware/acpid.nix
+++ b/nixos/modules/services/hardware/acpid.nix
@@ -31,7 +31,7 @@ let
''
fn=$out/${name}
echo "event=${handler.event}" > $fn
- echo "action=${pkgs.writeScript "${name}.sh" (concatStringsSep "\n" [ "#! ${pkgs.bash}/bin/sh" handler.action ])}" >> $fn
+ echo "action=${pkgs.writeShellScriptBin "${name}.sh" handler.action }/bin/${name}.sh '%e'" >> $fn
'';
in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // config.services.acpid.handlers))
}
@@ -53,6 +53,12 @@ in
description = "Whether to enable the ACPI daemon.";
};
+ logEvents = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Log all event activity.";
+ };
+
handlers = mkOption {
type = types.attrsOf (types.submodule {
options = {
@@ -69,11 +75,33 @@ in
};
});
- description = "Event handlers.";
+ description = ''
+ Event handlers.
+
+
+ Handler can be a single command.
+
+ '';
default = {};
- example = { mute = { event = "button/mute.*"; action = "amixer set Master toggle"; }; };
-
-
+ example = {
+ ac-power = {
+ event = "ac_adapter/*";
+ action = ''
+ vals=($1) # space separated string to array of multiple values
+ case ''${vals[3]} in
+ 00000000)
+ echo unplugged >> /tmp/acpi.log
+ ;;
+ 00000001)
+ echo plugged in >> /tmp/acpi.log
+ ;;
+ *)
+ echo unknown >> /tmp/acpi.log
+ ;;
+ esac
+ '';
+ };
+ };
};
powerEventCommands = mkOption {
@@ -120,7 +148,7 @@ in
ConditionPathExists = [ "/proc/acpi" ];
};
- script = "acpid --confdir ${acpiConfDir}";
+ script = "acpid ${optionalString config.services.acpid.logEvents "--logevents"} --confdir ${acpiConfDir}";
};
};
diff --git a/nixos/modules/services/hardware/amd-hybrid-graphics.nix b/nixos/modules/services/hardware/amd-hybrid-graphics.nix
deleted file mode 100644
index b0f9ff56d1b2..000000000000
--- a/nixos/modules/services/hardware/amd-hybrid-graphics.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-
- ###### interface
-
- options = {
-
- hardware.amdHybridGraphics.disable = lib.mkOption {
- default = false;
- type = lib.types.bool;
- description = ''
- Completely disable the AMD graphics card and use the
- integrated graphics processor instead.
- '';
- };
-
- };
-
-
- ###### implementation
-
- config = lib.mkIf config.hardware.amdHybridGraphics.disable {
- systemd.services."amd-hybrid-graphics" = {
- path = [ pkgs.bash ];
- description = "Disable AMD Card";
- after = [ "sys-kernel-debug.mount" ];
- before = [ "systemd-vconsole-setup.service" "display-manager.service" ];
- requires = [ "sys-kernel-debug.mount" "vgaswitcheroo.path" ];
- serviceConfig = {
- Type = "oneshot";
- RemainAfterExit = true;
- ExecStart = "${pkgs.bash}/bin/sh -c 'echo -e \"IGD\\nOFF\" > /sys/kernel/debug/vgaswitcheroo/switch'";
- ExecStop = "${pkgs.bash}/bin/sh -c 'echo ON >/sys/kernel/debug/vgaswitcheroo/switch'";
- };
- };
- systemd.paths."vgaswitcheroo" = {
- pathConfig = {
- PathExists = "/sys/kernel/debug/vgaswitcheroo/switch";
- Unit = "amd-hybrid-graphics.service";
- };
- wantedBy = ["multi-user.target"];
- };
- };
-
-}
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
new file mode 100644
index 000000000000..d8abde2a600a
--- /dev/null
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -0,0 +1,90 @@
+# fwupd daemon.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.fwupd;
+ originalEtc =
+ let
+ mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; };
+ in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc);
+ extraTrustedKeys =
+ let
+ mkName = p: "pki/fwupd/${baseNameOf (toString p)}";
+ mkEtcFile = p: nameValuePair (mkName p) { source = p; };
+ in listToAttrs (map mkEtcFile cfg.extraTrustedKeys);
+in {
+
+ ###### interface
+ options = {
+ services.fwupd = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable fwupd, a DBus service that allows
+ applications to update firmware.
+ '';
+ };
+
+ blacklistDevices = mkOption {
+ type = types.listOf types.string;
+ default = [];
+ example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ];
+ description = ''
+ Allow blacklisting specific devices by their GUID
+ '';
+ };
+
+ blacklistPlugins = mkOption {
+ type = types.listOf types.string;
+ default = [];
+ example = [ "udev" ];
+ description = ''
+ Allow blacklisting specific plugins
+ '';
+ };
+
+ extraTrustedKeys = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ example = literalExample "[ /etc/nixos/fwupd/myfirmware.pem ]";
+ description = ''
+ Installing a public key allows firmware signed with a matching private key to be recognized as trusted, which may require less authentication to install than for untrusted files. By default trusted firmware can be upgraded (but not downgraded) without the user or administrator password. Only very few keys are installed by default.
+ '';
+ };
+ };
+ };
+
+
+ ###### implementation
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.fwupd ];
+
+ environment.etc = {
+ "fwupd/daemon.conf" = {
+ source = pkgs.writeText "daemon.conf" ''
+ [fwupd]
+ BlacklistDevices=${lib.concatStringsSep ";" cfg.blacklistDevices}
+ BlacklistPlugins=${lib.concatStringsSep ";" cfg.blacklistPlugins}
+ '';
+ };
+ } // originalEtc // extraTrustedKeys;
+
+ services.dbus.packages = [ pkgs.fwupd ];
+
+ services.udev.packages = [ pkgs.fwupd ];
+
+ systemd.packages = [ pkgs.fwupd ];
+
+ systemd.tmpfiles.rules = [
+ "d /var/lib/fwupd 0755 root root -"
+ ];
+ };
+
+ meta = {
+ maintainers = pkgs.fwupd.maintainers;
+ };
+}
diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix
index 9fe4021c4247..eb1713baa140 100644
--- a/nixos/modules/services/hardware/nvidia-optimus.nix
+++ b/nixos/modules/services/hardware/nvidia-optimus.nix
@@ -23,7 +23,7 @@ let kernel = config.boot.kernelPackages; in
###### implementation
config = lib.mkIf config.hardware.nvidiaOptimus.disable {
- boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb"];
+ boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb" "nvidia-drm"];
boot.kernelModules = [ "bbswitch" ];
boot.extraModulePackages = [ kernel.bbswitch ];
diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index 018e82e58a3d..5a898631e090 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -55,7 +55,7 @@ in {
enable = mkOption {
default = false;
description = ''
- Whether to enable thinkfan, fan controller for ibm/lenovo thinkpads.
+ Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads.
'';
};
diff --git a/nixos/modules/services/hardware/u2f.nix b/nixos/modules/services/hardware/u2f.nix
new file mode 100644
index 000000000000..bb4b2f05f890
--- /dev/null
+++ b/nixos/modules/services/hardware/u2f.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.hardware.u2f;
+in {
+ options = {
+ hardware.u2f = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable U2F hardware support.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.udev.packages = [ pkgs.libu2f-host ];
+ };
+}
+
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 9f42f9e59ad5..7bfc3bb64872 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -146,7 +146,7 @@ let
echo "Generating hwdb database..."
# hwdb --update doesn't return error code even on errors!
- res="$(${udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)"
+ res="$(${pkgs.buildPackages.udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)"
echo "$res"
[ -z "$(echo "$res" | egrep '^Error')" ]
mv etc/udev/hwdb.bin $out
diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix
new file mode 100644
index 000000000000..7ebd49fa01c2
--- /dev/null
+++ b/nixos/modules/services/hardware/usbmuxd.nix
@@ -0,0 +1,74 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ defaultUserGroup = "usbmux";
+ apple = "05ac";
+
+ cfg = config.services.usbmuxd;
+
+in
+
+{
+ options.services.usbmuxd = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the usbmuxd ("USB multiplexing daemon") service. This daemon is
+ in charge of multiplexing connections over USB to an iOS device. This is
+ needed for transferring data from and to iOS devices (see ifuse). Also
+ this may enable plug-n-play tethering for iPhones.
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = defaultUserGroup;
+ description = ''
+ The user usbmuxd should use to run after startup.
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = defaultUserGroup;
+ description = ''
+ The group usbmuxd should use to run after startup.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ users.extraUsers = optional (cfg.user == defaultUserGroup) {
+ name = cfg.user;
+ description = "usbmuxd user";
+ group = cfg.group;
+ };
+
+ users.extraGroups = optional (cfg.group == defaultUserGroup) {
+ name = cfg.group;
+ };
+
+ # Give usbmuxd permission for Apple devices
+ services.udev.extraRules = ''
+ SUBSYSTEM=="usb", ATTR{idVendor}=="${apple}", GROUP="${cfg.group}"
+ '';
+
+ systemd.services.usbmuxd = {
+ description = "usbmuxd";
+ wantedBy = [ "multi-user.target" ];
+ unitConfig.Documentation = "man:usbmuxd(8)";
+ serviceConfig = {
+ # Trigger the udev rule manually. This doesn't require replugging the
+ # device when first enabling the option to get it to work
+ ExecStartPre = "${pkgs.libudev}/bin/udevadm trigger -s usb -a idVendor=${apple}";
+ ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f";
+ };
+ };
+
+ };
+}
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index a0dc0d6d089d..95f31829882f 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -141,7 +141,7 @@ in
JAVA_HOME = jre;
GRAYLOG_CONF = "${confFile}";
};
- path = [ pkgs.openjdk8 pkgs.which pkgs.procps ];
+ path = [ pkgs.jre_headless pkgs.which pkgs.procps ];
preStart = ''
mkdir -p /var/lib/graylog -m 755
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 2a8ac414720b..a4cab0c94cdc 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -8,7 +8,7 @@ let
defaultRules = pkgs.runCommand "logcheck-default-rules" {} ''
cp -prd ${pkgs.logcheck}/etc/logcheck $out
chmod u+w $out
- rm $out/logcheck.*
+ rm -r $out/logcheck.*
'';
rulesDir = pkgs.symlinkJoin
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index b4abd2cd7e5e..28d89a7463ab 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -103,7 +103,7 @@ in
listenAddress = mkOption {
type = types.str;
- default = "0.0.0.0";
+ default = "127.0.0.1";
description = "Address on which to start webserver.";
};
diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix
new file mode 100644
index 000000000000..8f4f39aa7288
--- /dev/null
+++ b/nixos/modules/services/mail/clamsmtp.nix
@@ -0,0 +1,179 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.services.clamsmtp;
+ clamdSocket = "/run/clamav/clamd.ctl"; # See services/security/clamav.nix
+in
+{
+ ##### interface
+ options = {
+ services.clamsmtp = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable clamsmtp.";
+ };
+
+ instances = mkOption {
+ description = "Instances of clamsmtp to run.";
+ type = types.listOf (types.submodule { options = {
+ action = mkOption {
+ type = types.enum [ "bounce" "drop" "pass" ];
+ default = "drop";
+ description =
+ ''
+ Action to take when a virus is detected.
+
+ Note that viruses often spoof sender addresses, so bouncing is
+ in most cases not a good idea.
+ '';
+ };
+
+ header = mkOption {
+ type = types.str;
+ default = "";
+ example = "X-Virus-Scanned: ClamAV using ClamSMTP";
+ description =
+ ''
+ A header to add to scanned messages. See clamsmtpd.conf(5) for
+ more details. Empty means no header.
+ '';
+ };
+
+ keepAlives = mkOption {
+ type = types.int;
+ default = 0;
+ description =
+ ''
+ Number of seconds to wait between each NOOP sent to the sending
+ server. 0 to disable.
+
+ This is meant for slow servers where the sending MTA times out
+ waiting for clamd to scan the file.
+ '';
+ };
+
+ listen = mkOption {
+ type = types.str;
+ example = "127.0.0.1:10025";
+ description =
+ ''
+ Address to wait for incoming SMTP connections on. See
+ clamsmtpd.conf(5) for more details.
+ '';
+ };
+
+ quarantine = mkOption {
+ type = types.bool;
+ default = false;
+ description =
+ ''
+ Whether to quarantine files that contain viruses by leaving them
+ in the temporary directory.
+ '';
+ };
+
+ maxConnections = mkOption {
+ type = types.int;
+ default = 64;
+ description = "Maximum number of connections to accept at once.";
+ };
+
+ outAddress = mkOption {
+ type = types.str;
+ description =
+ ''
+ Address of the SMTP server to send email to once it has been
+ scanned.
+ '';
+ };
+
+ tempDirectory = mkOption {
+ type = types.str;
+ default = "/tmp";
+ description =
+ ''
+ Temporary directory that needs to be accessible to both clamd
+ and clamsmtpd.
+ '';
+ };
+
+ timeout = mkOption {
+ type = types.int;
+ default = 180;
+ description = "Time-out for network connections.";
+ };
+
+ transparentProxy = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable clamsmtp's transparent proxy support.";
+ };
+
+ virusAction = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description =
+ ''
+ Command to run when a virus is found. Please see VIRUS ACTION in
+ clamsmtpd(8) for a discussion of this option and its safe use.
+ '';
+ };
+
+ xClient = mkOption {
+ type = types.bool;
+ default = false;
+ description =
+ ''
+ Send the XCLIENT command to the receiving server, for forwarding
+ client addresses and connection information if the receiving
+ server supports this feature.
+ '';
+ };
+ };});
+ };
+ };
+ };
+
+ ##### implementation
+ config = let
+ configfile = conf: pkgs.writeText "clamsmtpd.conf"
+ ''
+ Action: ${conf.action}
+ ClamAddress: ${clamdSocket}
+ Header: ${conf.header}
+ KeepAlives: ${toString conf.keepAlives}
+ Listen: ${conf.listen}
+ Quarantine: ${if conf.quarantine then "on" else "off"}
+ MaxConnections: ${toString conf.maxConnections}
+ OutAddress: ${conf.outAddress}
+ TempDirectory: ${conf.tempDirectory}
+ TimeOut: ${toString conf.timeout}
+ TransparentProxy: ${if conf.transparentProxy then "on" else "off"}
+ User: clamav
+ ${optionalString (conf.virusAction != null) "VirusAction: ${conf.virusAction}"}
+ XClient: ${if conf.xClient then "on" else "off"}
+ '';
+ in
+ mkIf cfg.enable {
+ assertions = [
+ { assertion = config.services.clamav.daemon.enable;
+ message = "clamsmtp requires clamav to be enabled";
+ }
+ ];
+
+ systemd.services = listToAttrs (imap1 (i: conf:
+ nameValuePair "clamsmtp-${toString i}" {
+ description = "ClamSMTP instance ${toString i}";
+ wantedBy = [ "multi-user.target" ];
+ script = "exec ${pkgs.clamsmtp}/bin/clamsmtpd -f ${configfile conf}";
+ after = [ "clamav-daemon.service" ];
+ requires = [ "clamav-daemon.service" ];
+ serviceConfig.Type = "forking";
+ serviceConfig.PrivateTmp = "yes";
+ unitConfig.JoinsNamespaceOf = "clamav-daemon.service";
+ }
+ ) cfg.instances);
+ };
+}
diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix
new file mode 100644
index 000000000000..894b88e25c1b
--- /dev/null
+++ b/nixos/modules/services/mail/dkimproxy-out.nix
@@ -0,0 +1,118 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.services.dkimproxy-out;
+ keydir = "/var/lib/dkimproxy-out";
+ privkey = "${keydir}/private.key";
+ pubkey = "${keydir}/public.key";
+in
+{
+ ##### interface
+ options = {
+ services.dkimproxy-out = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description =
+ ''
+ Whether to enable dkimproxy_out.
+
+ Note that a key will be auto-generated, and can be found in
+ ${keydir}.
+ '';
+ };
+
+ listen = mkOption {
+ type = types.str;
+ example = "127.0.0.1:10027";
+ description = "Address:port DKIMproxy should listen on.";
+ };
+
+ relay = mkOption {
+ type = types.str;
+ example = "127.0.0.1:10028";
+ description = "Address:port DKIMproxy should forward mail to.";
+ };
+
+ domains = mkOption {
+ type = with types; listOf str;
+ example = [ "example.org" "example.com" ];
+ description = "List of domains DKIMproxy can sign for.";
+ };
+
+ selector = mkOption {
+ type = types.str;
+ example = "selector1";
+ description =
+ ''
+ The selector to use for DKIM key identification.
+
+ For example, if 'selector1' is used here, then for each domain
+ 'example.org' given in `domain`, 'selector1._domainkey.example.org'
+ should contain the TXT record indicating the public key is the one
+ in ${pubkey}: "v=DKIM1; t=s; p=[THE PUBLIC KEY]".
+ '';
+ };
+
+ keySize = mkOption {
+ type = types.int;
+ default = 2048;
+ description =
+ ''
+ Size of the RSA key to use to sign outgoing emails. Note that the
+ maximum mandatorily verified as per RFC6376 is 2048.
+ '';
+ };
+
+ # TODO: allow signature for other schemes than dkim(c=relaxed/relaxed)?
+ # This being the scheme used by gmail, maybe nothing more is needed for
+ # reasonable use.
+ };
+ };
+
+ ##### implementation
+ config = let
+ configfile = pkgs.writeText "dkimproxy_out.conf"
+ ''
+ listen ${cfg.listen}
+ relay ${cfg.relay}
+
+ domain ${concatStringsSep "," cfg.domains}
+ selector ${cfg.selector}
+
+ signature dkim(c=relaxed/relaxed)
+
+ keyfile ${privkey}
+ '';
+ in
+ mkIf cfg.enable {
+ users.groups.dkimproxy-out = {};
+ users.users.dkimproxy-out = {
+ description = "DKIMproxy_out daemon";
+ group = "dkimproxy-out";
+ isSystemUser = true;
+ };
+
+ systemd.services.dkimproxy-out = {
+ description = "DKIMproxy_out";
+ wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ if [ ! -d "${keydir}" ]; then
+ mkdir -p "${keydir}"
+ chmod 0700 "${keydir}"
+ ${pkgs.openssl}/bin/openssl genrsa -out "${privkey}" ${toString cfg.keySize}
+ ${pkgs.openssl}/bin/openssl rsa -in "${privkey}" -pubout -out "${pubkey}"
+ chown -R dkimproxy-out:dkimproxy-out "${keydir}"
+ fi
+ '';
+ script = ''
+ exec ${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile}
+ '';
+ serviceConfig = {
+ User = "dkimproxy-out";
+ PermissionsStartOnly = true;
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 18101a312254..b42c73b86668 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -104,7 +104,7 @@ let
};
mailboxConfig = mailbox: ''
- mailbox ${mailbox.name} {
+ mailbox "${mailbox.name}" {
auto = ${toString mailbox.auto}
'' + optionalString (mailbox.specialUse != null) ''
special_use = \${toString mailbox.specialUse}
@@ -113,7 +113,7 @@ let
mailboxes = { lib, pkgs, ... }: {
options = {
name = mkOption {
- type = types.str;
+ type = types.strMatching ''[^"]+'';
example = "Spam";
description = "The name of the mailbox.";
};
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 867c0ea6761c..5ab331ac067f 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -15,20 +15,18 @@ let
haveVirtual = cfg.virtual != "";
clientAccess =
- if (cfg.dnsBlacklistOverrides != "")
- then [ "check_client_access hash:/etc/postfix/client_access" ]
- else [];
+ optional (cfg.dnsBlacklistOverrides != "")
+ "check_client_access hash:/etc/postfix/client_access";
dnsBl =
- if (cfg.dnsBlacklists != [])
- then [ (concatStringsSep ", " (map (s: "reject_rbl_client " + s) cfg.dnsBlacklists)) ]
- else [];
+ optionals (cfg.dnsBlacklists != [])
+ (map (s: "reject_rbl_client " + s) cfg.dnsBlacklists);
clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl);
mainCf = let
escape = replaceStrings ["$"] ["$$"];
- mkList = items: "\n " + concatStringsSep "\n " items;
+ mkList = items: "\n " + concatStringsSep ",\n " items;
mkVal = value:
if isList value then mkList value
else " " + (if value == true then "yes"
@@ -36,72 +34,9 @@ let
else toString value);
mkEntry = name: value: "${escape name} =${mkVal value}";
in
- concatStringsSep "\n" (mapAttrsToList mkEntry (recursiveUpdate defaultConf cfg.config))
+ concatStringsSep "\n" (mapAttrsToList mkEntry cfg.config)
+ "\n" + cfg.extraConfig;
- defaultConf = {
- compatibility_level = "9999";
- mail_owner = user;
- default_privs = "nobody";
-
- # NixOS specific locations
- data_directory = "/var/lib/postfix/data";
- queue_directory = "/var/lib/postfix/queue";
-
- # Default location of everything in package
- meta_directory = "${pkgs.postfix}/etc/postfix";
- command_directory = "${pkgs.postfix}/bin";
- sample_directory = "/etc/postfix";
- newaliases_path = "${pkgs.postfix}/bin/newaliases";
- mailq_path = "${pkgs.postfix}/bin/mailq";
- readme_directory = false;
- sendmail_path = "${pkgs.postfix}/bin/sendmail";
- daemon_directory = "${pkgs.postfix}/libexec/postfix";
- manpage_directory = "${pkgs.postfix}/share/man";
- html_directory = "${pkgs.postfix}/share/postfix/doc/html";
- shlib_directory = false;
- relayhost = if cfg.relayHost == "" then "" else
- if cfg.lookupMX
- then "${cfg.relayHost}:${toString cfg.relayPort}"
- else "[${cfg.relayHost}]:${toString cfg.relayPort}";
-
- mail_spool_directory = "/var/spool/mail/";
- setgid_group = setgidGroup;
- }
- // optionalAttrs config.networking.enableIPv6 { inet_protocols = "all"; }
- // optionalAttrs (cfg.networks != null) { mynetworks = cfg.networks; }
- // optionalAttrs (cfg.networksStyle != "") { mynetworks_style = cfg.networksStyle; }
- // optionalAttrs (cfg.hostname != "") { myhostname = cfg.hostname; }
- // optionalAttrs (cfg.domain != "") { mydomain = cfg.domain; }
- // optionalAttrs (cfg.origin != "") { myorigin = cfg.origin; }
- // optionalAttrs (cfg.destination != null) { mydestination = cfg.destination; }
- // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; }
- // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; }
- // optionalAttrs haveAliases { alias_maps = "${cfg.aliasMapType}:/etc/postfix/aliases"; }
- // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; }
- // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; }
- // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; }
- // optionalAttrs cfg.useSrs {
- sender_canonical_maps = "tcp:127.0.0.1:10001";
- sender_canonical_classes = "envelope_sender";
- recipient_canonical_maps = "tcp:127.0.0.1:10002";
- recipient_canonical_classes= "envelope_recipient";
- }
- // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; }
- // optionalAttrs (cfg.sslCert != "") {
- smtp_tls_CAfile = cfg.sslCACert;
- smtp_tls_cert_file = cfg.sslCert;
- smtp_tls_key_file = cfg.sslKey;
-
- smtp_use_tls = true;
-
- smtpd_tls_CAfile = cfg.sslCACert;
- smtpd_tls_cert_file = cfg.sslCert;
- smtpd_tls_key_file = cfg.sslKey;
-
- smtpd_use_tls = true;
- };
-
masterCfOptions = { options, config, name, ... }: {
options = {
name = mkOption {
@@ -479,7 +414,10 @@ in
postmasterAlias = mkOption {
type = types.str;
default = "root";
- description = "Who should receive postmaster e-mail.";
+ description = "
+ Who should receive postmaster e-mail. Multiple values can be added by
+ separating values with comma.
+ ";
};
rootAlias = mkOption {
@@ -487,6 +425,7 @@ in
default = "";
description = "
Who should receive root e-mail. Blank for no redirection.
+ Multiple values can be added by separating values with comma.
";
};
@@ -507,7 +446,6 @@ in
config = mkOption {
type = with types; attrsOf (either bool (either str (listOf str)));
- default = defaultConf;
description = ''
The main.cf configuration file as key value set.
'';
@@ -749,6 +687,67 @@ in
'';
};
+ services.postfix.config = (mapAttrs (_: v: mkDefault v) {
+ compatibility_level = "9999";
+ mail_owner = cfg.user;
+ default_privs = "nobody";
+
+ # NixOS specific locations
+ data_directory = "/var/lib/postfix/data";
+ queue_directory = "/var/lib/postfix/queue";
+
+ # Default location of everything in package
+ meta_directory = "${pkgs.postfix}/etc/postfix";
+ command_directory = "${pkgs.postfix}/bin";
+ sample_directory = "/etc/postfix";
+ newaliases_path = "${pkgs.postfix}/bin/newaliases";
+ mailq_path = "${pkgs.postfix}/bin/mailq";
+ readme_directory = false;
+ sendmail_path = "${pkgs.postfix}/bin/sendmail";
+ daemon_directory = "${pkgs.postfix}/libexec/postfix";
+ manpage_directory = "${pkgs.postfix}/share/man";
+ html_directory = "${pkgs.postfix}/share/postfix/doc/html";
+ shlib_directory = false;
+ mail_spool_directory = "/var/spool/mail/";
+ setgid_group = cfg.setgidGroup;
+ })
+ // optionalAttrs (cfg.relayHost != "") { relayhost = if cfg.lookupMX
+ then "${cfg.relayHost}:${toString cfg.relayPort}"
+ else "[${cfg.relayHost}]:${toString cfg.relayPort}"; }
+ // optionalAttrs config.networking.enableIPv6 { inet_protocols = mkDefault "all"; }
+ // optionalAttrs (cfg.networks != null) { mynetworks = cfg.networks; }
+ // optionalAttrs (cfg.networksStyle != "") { mynetworks_style = cfg.networksStyle; }
+ // optionalAttrs (cfg.hostname != "") { myhostname = cfg.hostname; }
+ // optionalAttrs (cfg.domain != "") { mydomain = cfg.domain; }
+ // optionalAttrs (cfg.origin != "") { myorigin = cfg.origin; }
+ // optionalAttrs (cfg.destination != null) { mydestination = cfg.destination; }
+ // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; }
+ // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; }
+ // optionalAttrs haveAliases { alias_maps = [ "${cfg.aliasMapType}:/etc/postfix/aliases" ]; }
+ // optionalAttrs haveTransport { transport_maps = [ "hash:/etc/postfix/transport" ]; }
+ // optionalAttrs haveVirtual { virtual_alias_maps = [ "${cfg.virtualMapType}:/etc/postfix/virtual" ]; }
+ // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; }
+ // optionalAttrs cfg.useSrs {
+ sender_canonical_maps = [ "tcp:127.0.0.1:10001" ];
+ sender_canonical_classes = [ "envelope_sender" ];
+ recipient_canonical_maps = [ "tcp:127.0.0.1:10002" ];
+ recipient_canonical_classes = [ "envelope_recipient" ];
+ }
+ // optionalAttrs cfg.enableHeaderChecks { header_checks = [ "regexp:/etc/postfix/header_checks" ]; }
+ // optionalAttrs (cfg.sslCert != "") {
+ smtp_tls_CAfile = cfg.sslCACert;
+ smtp_tls_cert_file = cfg.sslCert;
+ smtp_tls_key_file = cfg.sslKey;
+
+ smtp_use_tls = true;
+
+ smtpd_tls_CAfile = cfg.sslCACert;
+ smtpd_tls_cert_file = cfg.sslCert;
+ smtpd_tls_key_file = cfg.sslKey;
+
+ smtpd_use_tls = true;
+ };
+
services.postfix.masterConfig = {
smtp_inet = {
name = "smtp";
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 6d403e448e04..09fb587e74b5 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -1,14 +1,152 @@
-{ config, lib, pkgs, ... }:
+{ config, options, pkgs, lib, ... }:
with lib;
let
cfg = config.services.rspamd;
+ opts = options.services.rspamd;
- mkBindSockets = socks: concatStringsSep "\n" (map (each: " bind_socket = \"${each}\"") socks);
+ bindSocketOpts = {options, config, ... }: {
+ options = {
+ socket = mkOption {
+ type = types.str;
+ example = "localhost:11333";
+ description = ''
+ Socket for this worker to listen on in a format acceptable by rspamd.
+ '';
+ };
+ mode = mkOption {
+ type = types.str;
+ default = "0644";
+ description = "Mode to set on unix socket";
+ };
+ owner = mkOption {
+ type = types.str;
+ default = "${cfg.user}";
+ description = "Owner to set on unix socket";
+ };
+ group = mkOption {
+ type = types.str;
+ default = "${cfg.group}";
+ description = "Group to set on unix socket";
+ };
+ rawEntry = mkOption {
+ type = types.str;
+ internal = true;
+ };
+ };
+ config.rawEntry = let
+ maybeOption = option:
+ optionalString options.${option}.isDefined " ${option}=${config.${option}}";
+ in
+ if (!(hasPrefix "/" config.socket)) then "${config.socket}"
+ else "${config.socket}${maybeOption "mode"}${maybeOption "owner"}${maybeOption "group"}";
+ };
- rspamdConfFile = pkgs.writeText "rspamd.conf"
+ workerOpts = { name, ... }: {
+ options = {
+ enable = mkOption {
+ type = types.nullOr types.bool;
+ default = null;
+ description = "Whether to run the rspamd worker.";
+ };
+ name = mkOption {
+ type = types.nullOr types.str;
+ default = name;
+ description = "Name of the worker";
+ };
+ type = mkOption {
+ type = types.nullOr (types.enum [
+ "normal" "controller" "fuzzy_storage" "proxy" "lua"
+ ]);
+ description = "The type of this worker";
+ };
+ bindSockets = mkOption {
+ type = types.listOf (types.either types.str (types.submodule bindSocketOpts));
+ default = [];
+ description = ''
+ List of sockets to listen, in format acceptable by rspamd
+ '';
+ example = [{
+ socket = "/run/rspamd.sock";
+ mode = "0666";
+ owner = "rspamd";
+ } "*:11333"];
+ apply = value: map (each: if (isString each)
+ then if (isUnixSocket each)
+ then {socket = each; owner = cfg.user; group = cfg.group; mode = "0644"; rawEntry = "${each}";}
+ else {socket = each; rawEntry = "${each}";}
+ else each) value;
+ };
+ count = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ description = ''
+ Number of worker instances to run
+ '';
+ };
+ includes = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ List of files to include in configuration
+ '';
+ };
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = "Additional entries to put verbatim into worker section of rspamd config file.";
+ };
+ };
+ config = mkIf (name == "normal" || name == "controller" || name == "fuzzy") {
+ type = mkDefault name;
+ includes = mkDefault [ "$CONFDIR/worker-${name}.inc" ];
+ bindSockets = mkDefault (if name == "normal"
+ then [{
+ socket = "/run/rspamd/rspamd.sock";
+ mode = "0660";
+ owner = cfg.user;
+ group = cfg.group;
+ }]
+ else if name == "controller"
+ then [ "localhost:11334" ]
+ else [] );
+ };
+ };
+
+ indexOf = default: start: list: e:
+ if list == []
+ then default
+ else if (head list) == e then start
+ else (indexOf default (start + (length (listenStreams (head list).socket))) (tail list) e);
+
+ systemdSocket = indexOf (abort "Socket not found") 0 allSockets;
+
+ isUnixSocket = socket: hasPrefix "/" (if (isString socket) then socket else socket.socket);
+ isPort = hasPrefix "*:";
+ isIPv4Socket = hasPrefix "*v4:";
+ isIPv6Socket = hasPrefix "*v6:";
+ isLocalHost = hasPrefix "localhost:";
+ listenStreams = socket:
+ if (isLocalHost socket) then
+ let port = (removePrefix "localhost:" socket);
+ in [ "127.0.0.1:${port}" ] ++ (if config.networking.enableIPv6 then ["[::1]:${port}"] else [])
+ else if (isIPv6Socket socket) then [removePrefix "*v6:" socket]
+ else if (isPort socket) then [removePrefix "*:" socket]
+ else if (isIPv4Socket socket) then
+ throw "error: IPv4 only socket not supported in rspamd with socket activation"
+ else if (length (splitString " " socket)) != 1 then
+ throw "error: string options not supported in rspamd with socket activation"
+ else [socket];
+
+ mkBindSockets = enabled: socks: concatStringsSep "\n " (flatten (map (each:
+ if cfg.socketActivation && enabled != false then
+ let systemd = (systemdSocket each);
+ in (imap (idx: e: "bind_socket = \"systemd:${toString (systemd + idx - 1)}\";") (listenStreams each.socket))
+ else "bind_socket = \"${each.rawEntry}\";") socks));
+
+ rspamdConfFile = pkgs.writeText "rspamd.conf"
''
.include "$CONFDIR/common.conf"
@@ -22,17 +160,33 @@ let
.include "$CONFDIR/logging.inc"
}
- worker {
- ${mkBindSockets cfg.bindSocket}
- .include "$CONFDIR/worker-normal.inc"
- }
+ ${concatStringsSep "\n" (mapAttrsToList (name: value: ''
+ worker ${optionalString (value.name != "normal" && value.name != "controller") "${value.name}"} {
+ type = "${value.type}";
+ ${optionalString (value.enable != null)
+ "enabled = ${if value.enable != false then "yes" else "no"};"}
+ ${mkBindSockets value.enable value.bindSockets}
+ ${optionalString (value.count != null) "count = ${toString value.count};"}
+ ${concatStringsSep "\n " (map (each: ".include \"${each}\"") value.includes)}
+ ${value.extraConfig}
+ }
+ '') cfg.workers)}
- worker {
- ${mkBindSockets cfg.bindUISocket}
- .include "$CONFDIR/worker-controller.inc"
- }
+ ${cfg.extraConfig}
'';
+ allMappedSockets = flatten (mapAttrsToList (name: value:
+ if value.enable != false
+ then imap (idx: each: {
+ name = "${name}";
+ index = idx;
+ value = each;
+ }) value.bindSockets
+ else []) cfg.workers);
+ allSockets = map (e: e.value) allMappedSockets;
+
+ allSocketNames = map (each: "rspamd-${each.name}-${toString each.index}.socket") allMappedSockets;
+
in
{
@@ -46,36 +200,52 @@ in
enable = mkEnableOption "Whether to run the rspamd daemon.";
debug = mkOption {
+ type = types.bool;
default = false;
description = "Whether to run the rspamd daemon in debug mode.";
};
- bindSocket = mkOption {
- type = types.listOf types.str;
- default = [
- "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}"
- ];
- defaultText = ''[
- "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}"
- ]'';
+ socketActivation = mkOption {
+ type = types.bool;
description = ''
- List of sockets to listen, in format acceptable by rspamd
- '';
- example = ''
- bindSocket = [
- "/run/rspamd.sock mode=0666 owner=rspamd"
- "*:11333"
- ];
+ Enable systemd socket activation for rspamd.
'';
};
- bindUISocket = mkOption {
- type = types.listOf types.str;
- default = [
- "localhost:11334"
- ];
+ workers = mkOption {
+ type = with types; attrsOf (submodule workerOpts);
description = ''
- List of sockets for web interface, in format acceptable by rspamd
+ Attribute set of workers to start.
+ '';
+ default = {
+ normal = {};
+ controller = {};
+ };
+ example = literalExample ''
+ {
+ normal = {
+ includes = [ "$CONFDIR/worker-normal.inc" ];
+ bindSockets = [{
+ socket = "/run/rspamd/rspamd.sock";
+ mode = "0660";
+ owner = "${cfg.user}";
+ group = "${cfg.group}";
+ }];
+ };
+ controller = {
+ includes = [ "$CONFDIR/worker-controller.inc" ];
+ bindSockets = [ "[::1]:11334" ];
+ };
+ }
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Extra configuration to add at the end of the rspamd configuration
+ file.
'';
};
@@ -102,6 +272,13 @@ in
config = mkIf cfg.enable {
+ services.rspamd.socketActivation = mkDefault (!opts.bindSocket.isDefined && !opts.bindUISocket.isDefined);
+
+ assertions = [ {
+ assertion = !cfg.socketActivation || !(opts.bindSocket.isDefined || opts.bindUISocket.isDefined);
+ message = "Can't use socketActivation for rspamd when using renamed bind socket options";
+ } ];
+
# Allow users to run 'rspamc' and 'rspamadm'.
environment.systemPackages = [ pkgs.rspamd ];
@@ -117,17 +294,22 @@ in
gid = config.ids.gids.rspamd;
};
+ environment.etc."rspamd.conf".source = rspamdConfFile;
+
systemd.services.rspamd = {
description = "Rspamd Service";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
+ wantedBy = mkIf (!cfg.socketActivation) [ "multi-user.target" ];
+ after = [ "network.target" ] ++
+ (if cfg.socketActivation then allSocketNames else []);
+ requires = mkIf cfg.socketActivation allSocketNames;
serviceConfig = {
ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f";
Restart = "always";
RuntimeDirectory = "rspamd";
PrivateTmp = true;
+ Sockets = mkIf cfg.socketActivation (concatStringsSep " " allSocketNames);
};
preStart = ''
@@ -135,5 +317,25 @@ in
${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd
'';
};
+ systemd.sockets = mkIf cfg.socketActivation
+ (listToAttrs (map (each: {
+ name = "rspamd-${each.name}-${toString each.index}";
+ value = {
+ description = "Rspamd socket ${toString each.index} for worker ${each.name}";
+ wantedBy = [ "sockets.target" ];
+ listenStreams = (listenStreams each.value.socket);
+ socketConfig = {
+ BindIPv6Only = mkIf (isIPv6Socket each.value.socket) "ipv6-only";
+ Service = "rspamd.service";
+ SocketUser = mkIf (isUnixSocket each.value.socket) each.value.owner;
+ SocketGroup = mkIf (isUnixSocket each.value.socket) each.value.group;
+ SocketMode = mkIf (isUnixSocket each.value.socket) each.value.mode;
+ };
+ };
+ }) allMappedSockets));
};
+ imports = [
+ (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ])
+ (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])
+ ];
}
diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb
index 84622622db70..0b58c59c7a51 100644
--- a/nixos/modules/services/misc/defaultUnicornConfig.rb
+++ b/nixos/modules/services/misc/defaultUnicornConfig.rb
@@ -1,205 +1,69 @@
-# The following was taken from github.com/crohr/syslogger and is BSD
-# licensed.
-require 'syslog'
-require 'logger'
-require 'thread'
-
-class Syslogger
-
- VERSION = "1.6.0"
-
- attr_reader :level, :ident, :options, :facility, :max_octets
- attr_accessor :formatter
-
- MAPPING = {
- Logger::DEBUG => Syslog::LOG_DEBUG,
- Logger::INFO => Syslog::LOG_INFO,
- Logger::WARN => Syslog::LOG_WARNING,
- Logger::ERROR => Syslog::LOG_ERR,
- Logger::FATAL => Syslog::LOG_CRIT,
- Logger::UNKNOWN => Syslog::LOG_ALERT
- }
-
- #
- # Initializes default options for the logger
- # ident:: the name of your program [default=$0].
- # options:: syslog options [default=Syslog::LOG_PID | Syslog::LOG_CONS].
- # Correct values are:
- # LOG_CONS : writes the message on the console if an error occurs when sending the message;
- # LOG_NDELAY : no delay before sending the message;
- # LOG_PERROR : messages will also be written on STDERR;
- # LOG_PID : adds the process number to the message (just after the program name)
- # facility:: the syslog facility [default=nil] Correct values include:
- # Syslog::LOG_DAEMON
- # Syslog::LOG_USER
- # Syslog::LOG_SYSLOG
- # Syslog::LOG_LOCAL2
- # Syslog::LOG_NEWS
- # etc.
- #
- # Usage:
- # logger = Syslogger.new("my_app", Syslog::LOG_PID | Syslog::LOG_CONS, Syslog::LOG_LOCAL0)
- # logger.level = Logger::INFO # use Logger levels
- # logger.warn "warning message"
- # logger.debug "debug message"
- #
- def initialize(ident = $0, options = Syslog::LOG_PID | Syslog::LOG_CONS, facility = nil)
- @ident = ident
- @options = options || (Syslog::LOG_PID | Syslog::LOG_CONS)
- @facility = facility
- @level = Logger::INFO
- @mutex = Mutex.new
- @formatter = Logger::Formatter.new
- end
-
- %w{debug info warn error fatal unknown}.each do |logger_method|
- # Accepting *args as message could be nil.
- # Default params not supported in ruby 1.8.7
- define_method logger_method.to_sym do |*args, &block|
- return true if @level > Logger.const_get(logger_method.upcase)
- message = args.first || block && block.call
- add(Logger.const_get(logger_method.upcase), message)
- end
-
- unless logger_method == 'unknown'
- define_method "#{logger_method}?".to_sym do
- @level <= Logger.const_get(logger_method.upcase)
- end
- end
- end
-
- # Log a message at the Logger::INFO level. Useful for use with Rack::CommonLogger
- def write(msg)
- add(Logger::INFO, msg)
- end
-
- # Logs a message at the Logger::INFO level.
- def <<(msg)
- add(Logger::INFO, msg)
- end
-
- # Low level method to add a message.
- # +severity+:: the level of the message. One of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN
- # +message+:: the message string.
- # If nil, the method will call the block and use the result as the message string.
- # If both are nil or no block is given, it will use the progname as per the behaviour of both the standard Ruby logger, and the Rails BufferedLogger.
- # +progname+:: optionally, overwrite the program name that appears in the log message.
- def add(severity, message = nil, progname = nil, &block)
- if message.nil? && block.nil? && !progname.nil?
- message, progname = progname, nil
- end
- progname ||= @ident
-
- @mutex.synchronize do
- Syslog.open(progname, @options, @facility) do |s|
- s.mask = Syslog::LOG_UPTO(MAPPING[@level])
- communication = clean(message || block && block.call)
- if self.max_octets
- buffer = "#{tags_text}"
- communication.bytes do |byte|
- buffer.concat(byte)
- # if the last byte we added is potentially part of an escape, we'll go ahead and add another byte
- if buffer.bytesize >= self.max_octets && !['%'.ord,'\\'.ord].include?(byte)
- s.log(MAPPING[severity],buffer)
- buffer = ""
- end
- end
- s.log(MAPPING[severity],buffer) unless buffer.empty?
- else
- s.log(MAPPING[severity],"#{tags_text}#{communication}")
- end
- end
- end
- end
-
- # Set the max octets of the messages written to the log
- def max_octets=(max_octets)
- @max_octets = max_octets
- end
-
- # Sets the minimum level for messages to be written in the log.
- # +level+:: one of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN
- def level=(level)
- level = Logger.const_get(level.to_s.upcase) if level.is_a?(Symbol)
-
- unless level.is_a?(Fixnum)
- raise ArgumentError.new("Invalid logger level `#{level.inspect}`")
- end
-
- @level = level
- end
-
- # Sets the ident string passed along to Syslog
- def ident=(ident)
- @ident = ident
- end
-
- # Tagging code borrowed from ActiveSupport gem
- def tagged(*tags)
- new_tags = push_tags(*tags)
- yield self
- ensure
- pop_tags(new_tags.size)
- end
-
- def push_tags(*tags)
- tags.flatten.reject{ |i| i.respond_to?(:empty?) ? i.empty? : !i }.tap do |new_tags|
- current_tags.concat new_tags
- end
- end
-
- def pop_tags(size = 1)
- current_tags.pop size
- end
-
- def clear_tags!
- current_tags.clear
- end
-
- protected
-
- # Borrowed from SyslogLogger.
- def clean(message)
- message = message.to_s.dup
- message.strip! # remove whitespace
- message.gsub!(/\n/, '\\n') # escape newlines
- message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf)
- message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes
- message
- end
-
- private
-
- def tags_text
- tags = current_tags
- if tags.any?
- tags.collect { |tag| "[#{tag}] " }.join
- end
- end
-
- def current_tags
- Thread.current[:syslogger_tagged_logging_tags] ||= []
- end
-end
-
-worker_processes 2
-working_directory ENV["GITLAB_PATH"]
-pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
+worker_processes 3
listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024
+listen "/run/gitlab/gitlab.socket", :backlog => 1024
+
+working_directory ENV["GITLAB_PATH"]
+
+pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
timeout 60
-logger Syslogger.new
-
+# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
+# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
preload_app true
-
GC.respond_to?(:copy_on_write_friendly=) and
GC.copy_on_write_friendly = true
check_client_connection false
+before_fork do |server, worker|
+ # the following is highly recommended for Rails + "preload_app true"
+ # as there's no need for the master process to hold a connection
+ defined?(ActiveRecord::Base) and
+ ActiveRecord::Base.connection.disconnect!
+
+ # The following is only recommended for memory/DB-constrained
+ # installations. It is not needed if your system can house
+ # twice as many worker_processes as you have configured.
+ #
+ # This allows a new master process to incrementally
+ # phase out the old master process with SIGTTOU to avoid a
+ # thundering herd (especially in the "preload_app false" case)
+ # when doing a transparent upgrade. The last worker spawned
+ # will then kill off the old master process with a SIGQUIT.
+ old_pid = "#{server.config[:pid]}.oldbin"
+ if old_pid != server.pid
+ begin
+ sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+ Process.kill(sig, File.read(old_pid).to_i)
+ rescue Errno::ENOENT, Errno::ESRCH
+ end
+ end
+
+ # Throttle the master from forking too quickly by sleeping. Due
+ # to the implementation of standard Unix signal handlers, this
+ # helps (but does not completely) prevent identical, repeated signals
+ # from being lost when the receiving process is busy.
+ # sleep 1
+end
+
after_fork do |server, worker|
+ # per-process listener ports for debugging/admin/migrations
+ # addr = "127.0.0.1:#{9293 + worker.nr}"
+ # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
+
+ # the following is *required* for Rails + "preload_app true",
defined?(ActiveRecord::Base) and
ActiveRecord::Base.establish_connection
+
+ # reset prometheus client, this will cause any opened metrics files to be closed
+ defined?(::Prometheus::Client.reinitialize_on_pid_change) &&
+ Prometheus::Client.reinitialize_on_pid_change
+
+ # if preload_app is true, then you may also want to check and
+ # restart any other shared sockets/descriptors such as Memcached,
+ # and Redis. TokyoCabinet file handles are safe to reuse
+ # between any number of forked children (assuming your kernel
+ # correctly implements pread()/pwrite() system calls)
end
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index e96645c79c77..39d23610b064 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -32,11 +32,17 @@ in
description = "Whether to enable Disnix";
};
+ enableMultiUser = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Whether to support multi-user mode by enabling the Disnix D-Bus service";
+ };
+
useWebServiceInterface = mkOption {
default = false;
description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
};
-
+
package = mkOption {
type = types.path;
description = "The Disnix package";
@@ -52,7 +58,7 @@ in
config = mkIf cfg.enable {
dysnomia.enable = true;
-
+
environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
services.dbus.enable = true;
@@ -71,7 +77,7 @@ in
};
systemd.services = {
- disnix = {
+ disnix = mkIf cfg.enableMultiUser {
description = "Disnix server";
wants = [ "dysnomia.target" ];
wantedBy = [ "multi-user.target" ];
@@ -92,7 +98,7 @@ in
}
// (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {})
// (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {});
-
+
serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service";
};
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index df44d0a54866..c5c41ad296da 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -192,9 +192,11 @@ in
mysqlPassword = builtins.readFile (config.services.mysql.rootPassword);
};
}
- // lib.optionalAttrs (config.services.postgresql.enable && cfg.enableAuthentication) { postgresql-database = {
- postgresqlUsername = "root";
- }; }
+ // lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = {
+ } // lib.optionalAttrs (cfg.enableAuthentication) {
+ postgresqlUsername = "postgres";
+ };
+ }
// lib.optionalAttrs (config.services.tomcat.enable) { tomcat-webapplication = {
tomcatPort = 8080;
}; }
diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix
index 053e7e95635f..164221cbab7f 100644
--- a/nixos/modules/services/misc/folding-at-home.nix
+++ b/nixos/modules/services/misc/folding-at-home.nix
@@ -57,7 +57,7 @@ in {
chown ${fahUser} ${stateDir}
cp -f ${pkgs.writeText "client.cfg" cfg.config} ${stateDir}/client.cfg
'';
- script = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'";
+ script = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'";
};
services.foldingAtHome.config = ''
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix
index 760fa66e80d6..e0b9df96f8e8 100644
--- a/nixos/modules/services/misc/geoip-updater.nix
+++ b/nixos/modules/services/misc/geoip-updater.nix
@@ -14,7 +14,7 @@ let
# ExecStart= command with '@' doesn't work because we start a shell (new
# process) that creates a new argv[0].)
geoip-updater = pkgs.writeScriptBin "geoip-updater" ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
skipExisting=0
debug()
{
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index f0b44b7bedeb..63e976ae566c 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -4,6 +4,8 @@ with lib;
let
cfg = config.services.gitea;
+ pg = config.services.postgresql;
+ usePostgresql = cfg.database.type == "postgres";
configFile = pkgs.writeText "app.ini" ''
APP_NAME = ${cfg.appName}
RUN_USER = ${cfg.user}
@@ -16,6 +18,9 @@ let
USER = ${cfg.database.user}
PASSWD = #dbpass#
PATH = ${cfg.database.path}
+ ${optionalString usePostgresql ''
+ SSL_MODE = disable
+ ''}
[repository]
ROOT = ${cfg.repositoryRoot}
@@ -35,6 +40,10 @@ let
SECRET_KEY = #secretkey#
INSTALL_LOCK = true
+ [log]
+ ROOT_PATH = ${cfg.log.rootPath}
+ LEVEL = ${cfg.log.level}
+
${cfg.extraConfig}
'';
in
@@ -60,6 +69,19 @@ in
description = "gitea data directory.";
};
+ log = {
+ rootPath = mkOption {
+ default = "${cfg.stateDir}/log";
+ type = types.str;
+ description = "Root path for log files.";
+ };
+ level = mkOption {
+ default = "Trace";
+ type = types.enum [ "Trace" "Debug" "Info" "Warn" "Error" "Critical" ];
+ description = "General log level.";
+ };
+ };
+
user = mkOption {
type = types.str;
default = "gitea";
@@ -82,7 +104,7 @@ in
port = mkOption {
type = types.int;
- default = 3306;
+ default = (if !usePostgresql then 3306 else pg.port);
description = "Database host port.";
};
@@ -123,6 +145,15 @@ in
default = "${cfg.stateDir}/data/gitea.db";
description = "Path to the sqlite3 database file.";
};
+
+ createDatabase = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to create a local postgresql database automatically.
+ This only applies if database type "postgres" is selected.
+ '';
+ };
};
appName = mkOption {
@@ -186,10 +217,11 @@ in
};
config = mkIf cfg.enable {
+ services.postgresql.enable = mkIf usePostgresql (mkDefault true);
systemd.services.gitea = {
description = "gitea";
- after = [ "network.target" ];
+ after = [ "network.target" "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.gitea.bin ];
@@ -231,12 +263,31 @@ in
mkdir -p ${cfg.stateDir}/conf
cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale
fi
+ '' + optionalString (usePostgresql && cfg.database.createDatabase) ''
+ if ! test -e "${cfg.stateDir}/db-created"; then
+ echo "CREATE ROLE ${cfg.database.user}
+ WITH ENCRYPTED PASSWORD '$(head -n1 ${cfg.database.passwordFile})'
+ NOCREATEDB NOCREATEROLE LOGIN" |
+ ${pkgs.sudo}/bin/sudo -u ${pg.superUser} ${pg.package}/bin/psql
+ ${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.stateDir}/db-created"
+ fi
+ '' + ''
+ chown ${cfg.user} -R ${cfg.stateDir}
'';
serviceConfig = {
Type = "simple";
User = cfg.user;
WorkingDirectory = cfg.stateDir;
+ PermissionsStartOnly = true;
ExecStart = "${pkgs.gitea.bin}/bin/gitea web";
Restart = "always";
};
@@ -253,6 +304,7 @@ in
description = "Gitea Service";
home = cfg.stateDir;
createHome = true;
+ useDefaultShell = true;
};
};
diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index 44880ebeda14..94a98e0335df 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -17,7 +17,7 @@ let
gititSh = hsPkgs: extras: with pkgs; let
env = gititWithPkgs hsPkgs extras;
in writeScript "gitit" ''
- #!${stdenv.shell}
+ #!${runtimeShell}
cd $HOME
export NIX_GHC="${env}/bin/ghc"
export NIX_GHCPKG="${env}/bin/ghc-pkg"
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 7b2b40e59232..20d7ec90dcc9 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -29,8 +29,12 @@ let
gitalyToml = pkgs.writeText "gitaly.toml" ''
socket_path = "${lib.escape ["\""] gitalySocket}"
+ bin_dir = "${cfg.packages.gitaly}/bin"
prometheus_listen_addr = "localhost:9236"
+ [git]
+ bin_path = "${pkgs.git}/bin/git"
+
[gitaly-ruby]
dir = "${cfg.packages.gitaly.ruby}"
@@ -70,7 +74,7 @@ let
secret_key_base: ${cfg.secrets.secret}
otp_key_base: ${cfg.secrets.otp}
db_key_base: ${cfg.secrets.db}
- jws_private_key: ${builtins.toJSON cfg.secrets.jws}
+ openid_connect_signing_key: ${builtins.toJSON cfg.secrets.jws}
'';
gitlabConfig = {
@@ -104,6 +108,7 @@ let
ldap.enabled = false;
omniauth.enabled = false;
shared.path = "${cfg.statePath}/shared";
+ gitaly.client_path = "${cfg.packages.gitaly}/bin";
backup.path = "${cfg.backupPath}";
gitlab_shell = {
path = "${cfg.packages.gitlab-shell}";
@@ -117,8 +122,6 @@ let
};
git = {
bin_path = "git";
- max_size = 20971520; # 20MB
- timeout = 10;
};
monitoring = {
ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
@@ -140,6 +143,7 @@ let
GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
GITLAB_STATE_PATH = "${cfg.statePath}";
GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
+ SCHEMA = "${cfg.statePath}/db/schema.rb";
GITLAB_LOG_PATH = "${cfg.statePath}/log";
GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}";
GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
@@ -248,7 +252,6 @@ in {
databasePassword = mkOption {
type = types.str;
- default = "";
description = "Gitlab database user password.";
};
@@ -440,12 +443,6 @@ in {
environment.systemPackages = [ pkgs.git gitlab-rake cfg.packages.gitlab-shell ];
- assertions = [
- { assertion = cfg.databasePassword != "";
- message = "databasePassword must be set";
- }
- ];
-
# Redis is required for the sidekiq queue runner.
services.redis.enable = mkDefault true;
# We use postgres as the main data store.
@@ -496,13 +493,15 @@ in {
after = [ "network.target" "gitlab.service" ];
wantedBy = [ "multi-user.target" ];
environment.HOME = gitlabEnv.HOME;
- path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ];
+ environment.GEM_HOME = "${cfg.packages.gitaly.rubyEnv}/${ruby.gemPath}";
+ environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
+ path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ];
serviceConfig = {
#PermissionsStartOnly = true; # preStart must be run as root
Type = "simple";
User = cfg.user;
Group = cfg.group;
- TimeoutSec = "300";
+ TimeoutSec = "infinity";
Restart = "on-failure";
WorkingDirectory = gitlabEnv.HOME;
ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}";
@@ -568,6 +567,7 @@ in {
mkdir -p ${cfg.statePath}/tmp/pids
mkdir -p ${cfg.statePath}/tmp/sockets
mkdir -p ${cfg.statePath}/shell
+ mkdir -p ${cfg.statePath}/db
rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
mkdir -p ${cfg.statePath}/config
@@ -582,6 +582,7 @@ in {
ln -sf ${cfg.statePath}/log /run/gitlab/log
ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
+ ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
chown -R ${cfg.user}:${cfg.group} /run/gitlab
# Prepare home directory
@@ -589,6 +590,7 @@ in {
touch ${gitlabEnv.HOME}/.ssh/authorized_keys
chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/
+ cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
${optionalString cfg.smtp.enable ''
ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index f395b9558b5a..6e60316d000c 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -207,7 +207,7 @@ in
gitolite setup -pk ${pubkeyFile}
fi
if [ -n "${hooks}" ]; then
- cp ${hooks} .gitolite/hooks/common/
+ cp -f ${hooks} .gitolite/hooks/common/
chmod +x .gitolite/hooks/common/*
fi
gitolite setup # Upgrade if needed
diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix
index 81fb024f9094..0888221ab62f 100644
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixos/modules/services/misc/gollum.nix
@@ -32,6 +32,24 @@ in
description = "Content of the configuration file";
};
+ mathjax = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable support for math rendering using MathJax";
+ };
+
+ allowUploads = mkOption {
+ type = types.nullOr (types.enum [ "dir" "page" ]);
+ default = null;
+ description = "Enable uploads of external files";
+ };
+
+ emoji = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Parse and interpret emoji tags";
+ };
+
branch = mkOption {
type = types.str;
default = "master";
@@ -84,6 +102,9 @@ in
--host ${cfg.address} \
--config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \
--ref ${cfg.branch} \
+ ${optionalString cfg.mathjax "--mathjax"} \
+ ${optionalString cfg.emoji "--emoji"} \
+ ${optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \
${cfg.stateDir}
'';
};
diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
new file mode 100644
index 000000000000..ac37c11106ef
--- /dev/null
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -0,0 +1,144 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.home-assistant;
+
+ configFile = pkgs.writeText "configuration.yaml" (builtins.toJSON cfg.config);
+
+ availableComponents = pkgs.home-assistant.availableComponents;
+
+ # Given component "parentConfig.platform", returns whether config.parentConfig
+ # is a list containing a set with set.platform == "platform".
+ #
+ # For example, the component sensor.luftdaten is used as follows:
+ # config.sensor = [ {
+ # platform = "luftdaten";
+ # ...
+ # } ];
+ useComponentPlatform = component:
+ let
+ path = splitString "." component;
+ parentConfig = attrByPath (init path) null cfg.config;
+ platform = last path;
+ in isList parentConfig && any
+ (item: item.platform or null == platform)
+ parentConfig;
+
+ # Returns whether component is used in config
+ useComponent = component:
+ hasAttrByPath (splitString "." component) cfg.config
+ || useComponentPlatform component;
+
+ # List of components used in config
+ extraComponents = filter useComponent availableComponents;
+
+ package = if cfg.autoExtraComponents
+ then (cfg.package.override { inherit extraComponents; })
+ else cfg.package;
+
+in {
+ meta.maintainers = with maintainers; [ dotlambda ];
+
+ options.services.home-assistant = {
+ enable = mkEnableOption "Home Assistant";
+
+ configDir = mkOption {
+ default = "/var/lib/hass";
+ type = types.path;
+ description = "The config directory, where your configuration.yaml is located.";
+ };
+
+ config = mkOption {
+ default = null;
+ type = with types; nullOr attrs;
+ example = literalExample ''
+ {
+ homeassistant = {
+ name = "Home";
+ time_zone = "UTC";
+ };
+ frontend = { };
+ http = { };
+ feedreader.urls = [ "https://nixos.org/blogs.xml" ];
+ }
+ '';
+ description = ''
+ Your configuration.yaml as a Nix attribute set.
+ Beware that setting this option will delete your previous configuration.yaml.
+ '';
+ };
+
+ package = mkOption {
+ default = pkgs.home-assistant;
+ defaultText = "pkgs.home-assistant";
+ type = types.package;
+ example = literalExample ''
+ pkgs.home-assistant.override {
+ extraPackages = ps: with ps; [ colorlog ];
+ }
+ '';
+ description = ''
+ Home Assistant package to use.
+ Override extraPackages in order to add additional dependencies.
+ '';
+ };
+
+ autoExtraComponents = mkOption {
+ default = true;
+ type = types.bool;
+ description = ''
+ If set to true, the components used in config
+ are set as the specified package's extraComponents.
+ This in turn adds all packaged dependencies to the derivation.
+ You might still see import errors in your log.
+ In this case, you will need to package the necessary dependencies yourself
+ or ask for someone else to package them.
+ If a dependency is packaged but not automatically added to this list,
+ you might need to specify it in extraPackages.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.home-assistant = {
+ description = "Home Assistant";
+ after = [ "network.target" ];
+ preStart = lib.optionalString (cfg.config != null) ''
+ rm -f ${cfg.configDir}/configuration.yaml
+ ln -s ${configFile} ${cfg.configDir}/configuration.yaml
+ '';
+ serviceConfig = {
+ ExecStart = ''
+ ${package}/bin/hass --config "${cfg.configDir}"
+ '';
+ User = "hass";
+ Group = "hass";
+ Restart = "on-failure";
+ ProtectSystem = "strict";
+ ReadWritePaths = "${cfg.configDir}";
+ PrivateTmp = true;
+ };
+ path = [
+ "/run/wrappers" # needed for ping
+ ];
+ };
+
+ systemd.targets.home-assistant = rec {
+ description = "Home Assistant";
+ wantedBy = [ "multi-user.target" ];
+ wants = [ "home-assistant.service" ];
+ after = wants;
+ };
+
+ users.extraUsers.hass = {
+ home = cfg.configDir;
+ createHome = true;
+ group = "hass";
+ uid = config.ids.uids.hass;
+ };
+
+ users.extraGroups.hass.gid = config.ids.gids.hass;
+ };
+}
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index e07a4a44613a..6da9cc8c47e6 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -55,7 +55,7 @@ in
serviceConfig = {
User = config.users.extraUsers.ihaskell.name;
Group = config.users.extraGroups.ihaskell.name;
- ExecStart = "${pkgs.stdenv.shell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\"";
+ ExecStart = "${pkgs.runtimeShell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\"";
};
};
};
diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix
index 6051c884465d..df0b3ae24c90 100644
--- a/nixos/modules/services/misc/logkeys.nix
+++ b/nixos/modules/services/misc/logkeys.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
with lib;
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 11463cf4500a..7e880ad09b89 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -4,6 +4,8 @@ with lib;
let
cfg = config.services.matrix-synapse;
+ pg = config.services.postgresql;
+ usePostgresql = cfg.database_type == "psycopg2";
logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig;
mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}'';
mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}'';
@@ -38,7 +40,7 @@ database: {
name: "${cfg.database_type}",
args: {
${concatStringsSep ",\n " (
- mapAttrsToList (n: v: "\"${n}\": ${v}") cfg.database_args
+ mapAttrsToList (n: v: "\"${n}\": ${builtins.toJSON v}") cfg.database_args
)}
}
}
@@ -155,7 +157,7 @@ in {
tls_certificate_path = mkOption {
type = types.nullOr types.str;
default = null;
- example = "/var/lib/matrix-synapse/homeserver.tls.crt";
+ example = "${cfg.dataDir}/homeserver.tls.crt";
description = ''
PEM encoded X509 certificate for TLS.
You can replace the self-signed certificate that synapse
@@ -167,7 +169,7 @@ in {
tls_private_key_path = mkOption {
type = types.nullOr types.str;
default = null;
- example = "/var/lib/matrix-synapse/homeserver.tls.key";
+ example = "${cfg.dataDir}/homeserver.tls.key";
description = ''
PEM encoded private key for TLS. Specify null if synapse is not
speaking TLS directly.
@@ -176,7 +178,7 @@ in {
tls_dh_params_path = mkOption {
type = types.nullOr types.str;
default = null;
- example = "/var/lib/matrix-synapse/homeserver.tls.dh";
+ example = "${cfg.dataDir}/homeserver.tls.dh";
description = ''
PEM dh parameters for ephemeral keys
'';
@@ -184,6 +186,7 @@ in {
server_name = mkOption {
type = types.str;
example = "example.com";
+ default = config.networking.hostName;
description = ''
The domain name of the server, with optional explicit port.
This is used by remote servers to connect to this server,
@@ -339,16 +342,39 @@ in {
};
database_type = mkOption {
type = types.enum [ "sqlite3" "psycopg2" ];
- default = "sqlite3";
+ default = if versionAtLeast config.system.stateVersion "18.03"
+ then "psycopg2"
+ else "sqlite3";
description = ''
The database engine name. Can be sqlite or psycopg2.
'';
};
+ create_local_database = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to create a local database automatically.
+ '';
+ };
+ database_name = mkOption {
+ type = types.str;
+ default = "matrix-synapse";
+ description = "Database name.";
+ };
+ database_user = mkOption {
+ type = types.str;
+ default = "matrix-synapse";
+ description = "Database user name.";
+ };
database_args = mkOption {
type = types.attrs;
default = {
- database = "${cfg.dataDir}/homeserver.db";
- };
+ sqlite3 = { database = "${cfg.dataDir}/homeserver.db"; };
+ psycopg2 = {
+ user = cfg.database_user;
+ database = cfg.database_name;
+ };
+ }."${cfg.database_type}";
description = ''
Arguments to pass to the engine.
'';
@@ -578,6 +604,18 @@ in {
Extra config options for matrix-synapse.
'';
};
+ extraConfigFiles = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ description = ''
+ Extra config files to include.
+
+ The configuration files will be included based on the command line
+ argument --config-path. This allows to configure secrets without
+ having to go through the Nix store, e.g. based on deployment keys if
+ NixOPS is in use.
+ '';
+ };
logConfig = mkOption {
type = types.lines;
default = readFile ./matrix-synapse-log_config.yaml;
@@ -611,15 +649,36 @@ in {
gid = config.ids.gids.matrix-synapse;
} ];
+ services.postgresql.enable = mkIf usePostgresql (mkDefault true);
+
systemd.services.matrix-synapse = {
description = "Synapse Matrix homeserver";
- after = [ "network.target" ];
+ after = [ "network.target" "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 = "simple";
@@ -627,7 +686,11 @@ in {
Group = "matrix-synapse";
WorkingDirectory = cfg.dataDir;
PermissionsStartOnly = true;
- ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory ${cfg.dataDir}";
+ ExecStart = ''
+ ${cfg.package}/bin/homeserver \
+ ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
+ --keys-directory ${cfg.dataDir}
+ '';
Restart = "on-failure";
};
};
diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix
index 972d8b572d36..50f6f80ad00c 100644
--- a/nixos/modules/services/misc/mbpfan.nix
+++ b/nixos/modules/services/misc/mbpfan.nix
@@ -8,13 +8,7 @@ let
in {
options.services.mbpfan = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Whether to enable the mbpfan daemon.
- '';
- };
+ enable = mkEnableOption "mbpfan, fan controller daemon for Apple Macs and MacBooks";
package = mkOption {
type = types.package;
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
index 47be10274d3b..12485141e219 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -188,7 +188,7 @@ in {
description = "Mesos Slave";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- path = [ pkgs.stdenv.shellPackage ];
+ path = [ pkgs.runtimeShellPackage ];
serviceConfig = {
ExecStart = ''
${pkgs.mesos}/bin/mesos-slave \
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index beca820d2d60..ea964fd68e43 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -8,7 +8,7 @@ let
nix = cfg.package.out;
- isNix112 = versionAtLeast (getVersion nix) "1.12pre";
+ isNix20 = versionAtLeast (getVersion nix) "2.0pre";
makeNixBuildUser = nr:
{ name = "nixbld${toString nr}";
@@ -26,32 +26,40 @@ let
nixConf =
let
- # If we're using sandbox for builds, then provide /bin/sh in
- # the sandbox as a bind-mount to bash. This means we also need to
- # include the entire closure of bash.
- sh = pkgs.stdenv.shell;
+ # In Nix < 2.0, If we're using sandbox for builds, then provide
+ # /bin/sh in the sandbox as a bind-mount to bash. This means we
+ # also need to include the entire closure of bash. Nix >= 2.0
+ # provides a /bin/sh by default.
+ sh = pkgs.runtimeShell;
binshDeps = pkgs.writeReferencesToFile sh;
in
- pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
- extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
+ pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } ''
+ ${optionalString (!isNix20) ''
+ extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
+ ''}
cat > $out <",
+ "pool_password" : "minername",
+ "pool_weight" : 1,
+ },
+ ],
+ '';
+ description = ''
+ Verbatim xmr-stak config.txt. If empty, the -c
+ parameter will not be added to the xmr-stak command.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.xmr-stak = {
+ wantedBy = [ "multi-user.target" ];
+ bindsTo = [ "network-online.target" ];
+ after = [ "network-online.target" ];
+ environment = mkIf cfg.cudaSupport {
+ LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib";
+ };
+ script = ''
+ exec ${pkg}/bin/xmr-stak ${xmrConfArg} ${concatStringsSep " " cfg.extraArgs}
+ '';
+ serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in {
+ # xmr-stak generates cpu and/or gpu configuration files
+ WorkingDirectory = "/tmp";
+ PrivateTmp = true;
+ DynamicUser = !rootRequired;
+ LimitMEMLOCK = toString (1024*1024);
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix
index d85b5e4ec507..91539592511c 100644
--- a/nixos/modules/services/misc/zookeeper.nix
+++ b/nixos/modules/services/misc/zookeeper.nix
@@ -106,10 +106,19 @@ in {
'';
};
+ package = mkOption {
+ description = "The zookeeper package to use";
+ default = pkgs.zookeeper;
+ defaultText = "pkgs.zookeeper";
+ type = types.package;
+ };
+
};
config = mkIf cfg.enable {
+ environment.systemPackages = [cfg.package];
+
systemd.services.zookeeper = {
description = "Zookeeper Daemon";
wantedBy = [ "multi-user.target" ];
@@ -118,7 +127,7 @@ in {
serviceConfig = {
ExecStart = ''
${pkgs.jre}/bin/java \
- -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \
+ -cp "${cfg.package}/lib/*:${cfg.package}/${cfg.package.name}.jar:${configDir}" \
${escapeShellArgs cfg.extraCmdLineOptions} \
-Dzookeeper.datadir.autocreate=false \
${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 9abd6e9ab641..839116de6265 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -38,7 +38,7 @@ let
];
shellCmdsForEventScript = eventname: commands: ''
- echo "#!${pkgs.stdenv.shell}" > "$out/${eventname}"
+ echo "#!${pkgs.runtimeShell}" > "$out/${eventname}"
echo '${commands}' >> "$out/${eventname}"
chmod a+x "$out/${eventname}"
'';
diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix
index 1c00f3c299e9..c3b869e00880 100644
--- a/nixos/modules/services/monitoring/fusion-inventory.nix
+++ b/nixos/modules/services/monitoring/fusion-inventory.nix
@@ -55,9 +55,6 @@ in {
description = "Fusion Inventory Agent";
wantedBy = [ "multi-user.target" ];
- environment = {
- OPTIONS = "--no-category=software";
- };
serviceConfig = {
ExecStart = "${pkgs.fusionInventory}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork";
};
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 4fbacef788f9..a5b6dbab1577 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -25,6 +25,7 @@ let
DATABASE_USER = cfg.database.user;
DATABASE_PASSWORD = cfg.database.password;
DATABASE_PATH = cfg.database.path;
+ DATABASE_CONN_MAX_LIFETIME = cfg.database.connMaxLifetime;
SECURITY_ADMIN_USER = cfg.security.adminUser;
SECURITY_ADMIN_PASSWORD = cfg.security.adminPassword;
@@ -111,7 +112,7 @@ in {
type = mkOption {
description = "Database type.";
default = "sqlite3";
- type = types.enum ["mysql" "sqlite3" "postgresql"];
+ type = types.enum ["mysql" "sqlite3" "postgres"];
};
host = mkOption {
@@ -143,6 +144,15 @@ in {
default = "${cfg.dataDir}/data/grafana.db";
type = types.path;
};
+
+ connMaxLifetime = mkOption {
+ description = ''
+ Sets the maximum amount of time (in seconds) a connection may be reused.
+ For MySQL this setting should be shorter than the `wait_timeout' variable.
+ '';
+ default = 14400;
+ type = types.int;
+ };
};
security = {
@@ -241,7 +251,9 @@ in {
description = "Grafana Service Daemon";
wantedBy = ["multi-user.target"];
after = ["networking.target"];
- environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
+ environment = {
+ QT_QPA_PLATFORM = "offscreen";
+ } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
serviceConfig = {
ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}";
WorkingDirectory = cfg.dataDir;
@@ -249,7 +261,7 @@ in {
};
preStart = ''
ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir}
- ln -fs ${cfg.package}/share/grafana/vendor ${cfg.dataDir}
+ ln -fs ${cfg.package}/share/grafana/tools ${cfg.dataDir}
'';
};
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index cc6d51f0ef1b..358ffd431dd4 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -17,40 +17,6 @@ let
nodeCfg = config.services.munin-node;
cronCfg = config.services.munin-cron;
- muninPlugins = pkgs.stdenv.mkDerivation {
- name = "munin-available-plugins";
- buildCommand = ''
- mkdir -p $out
-
- cp --preserve=mode ${pkgs.munin}/lib/plugins/* $out/
-
- for file in $out/*; do
- case "$file" in
- */plugin.sh|*/plugins.history)
- chmod +x "$file"
- continue;;
- esac
-
- # read magic makers from the file
- family=$(sed -nr 's/.*#%#\s+family\s*=\s*(\S+)\s*/\1/p' $file)
- cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file)
-
- wrapProgram $file \
- --set PATH "/run/wrappers/bin:/run/current-system/sw/bin" \
- --set MUNIN_LIBDIR "${pkgs.munin}/lib" \
- --set MUNIN_PLUGSTATE "/var/run/munin"
-
- # munin uses markers to tell munin-node-configure what a plugin can do
- echo "#%# family=$family" >> $file
- echo "#%# capabilities=$cap" >> $file
- done
-
- # NOTE: we disable disktstats because plugin seems to fail and it hangs html generation (100% CPU + memory leak)
- rm -f $out/diskstats
- '';
- buildInputs = [ pkgs.makeWrapper ];
- };
-
muninConf = pkgs.writeText "munin.conf"
''
dbdir /var/lib/munin
@@ -83,6 +49,29 @@ let
${nodeCfg.extraConfig}
'';
+
+ pluginConf = pkgs.writeText "munin-plugin-conf"
+ ''
+ [hddtemp_smartctl]
+ user root
+ group root
+
+ [meminfo]
+ user root
+ group root
+
+ [ipmi*]
+ user root
+ group root
+ '';
+
+ pluginConfDir = pkgs.stdenv.mkDerivation {
+ name = "munin-plugin-conf.d";
+ buildCommand = ''
+ mkdir $out
+ ln -s ${pluginConf} $out/nixos-config
+ '';
+ };
in
{
@@ -179,17 +168,22 @@ in
description = "Munin Node";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- path = [ pkgs.munin ];
+ path = with pkgs; [ munin smartmontools "/run/current-system/sw" "/run/wrappers" ];
+ environment.MUNIN_LIBDIR = "${pkgs.munin}/lib";
environment.MUNIN_PLUGSTATE = "/var/run/munin";
+ environment.MUNIN_LOGDIR = "/var/log/munin";
preStart = ''
echo "updating munin plugins..."
mkdir -p /etc/munin/plugins
rm -rf /etc/munin/plugins/*
- PATH="/run/wrappers/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash
+ ${pkgs.munin}/bin/munin-node-configure --suggest --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${pkgs.munin}/lib/plugins --servicedir=/etc/munin/plugins --sconfdir=${pluginConfDir} 2>/dev/null | ${pkgs.bash}/bin/bash
+
+ # NOTE: we disable disktstats because plugin seems to fail and it hangs html generation (100% CPU + memory leak)
+ rm /etc/munin/plugins/diskstats || true
'';
serviceConfig = {
- ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/";
+ ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/ --sconfdir=${pluginConfDir}";
};
};
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index e1fde4fc9500..d23b329eeb25 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -5,18 +5,25 @@ with lib;
let
cfg = config.services.netdata;
- configFile = pkgs.writeText "netdata.conf" cfg.configText;
+ wrappedPlugins = pkgs.runCommand "wrapped-plugins" {} ''
+ mkdir -p $out/libexec/netdata/plugins.d
+ ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin
+ '';
+
+ localConfig = {
+ global = {
+ "plugins directory" = "${wrappedPlugins}/libexec/netdata/plugins.d ${pkgs.netdata}/libexec/netdata/plugins.d";
+ };
+ };
+ mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config);
+ configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig);
defaultUser = "netdata";
in {
options = {
services.netdata = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = "Whether to enable netdata monitoring.";
- };
+ enable = mkEnableOption "netdata";
user = mkOption {
type = types.str;
@@ -31,9 +38,9 @@ in {
};
configText = mkOption {
- type = types.lines;
- default = "";
- description = "netdata.conf configuration.";
+ type = types.nullOr types.lines;
+ description = "Verbatim netdata.conf, cannot be combined with config.";
+ default = null;
example = ''
[global]
debug log = syslog
@@ -42,11 +49,29 @@ in {
'';
};
+ config = mkOption {
+ type = types.attrsOf types.attrs;
+ default = {};
+ description = "netdata.conf configuration as nix attributes. cannot be combined with configText.";
+ example = literalExample ''
+ global = {
+ "debug log" = "syslog";
+ "access log" = "syslog";
+ "error log" = "syslog";
+ };
+ '';
+ };
+ };
};
- };
config = mkIf cfg.enable {
+ assertions =
+ [ { assertion = cfg.config != {} -> cfg.configText == null ;
+ message = "Cannot specify both config and configText";
+ }
+ ];
systemd.services.netdata = {
+ path = with pkgs; [ gawk curl ];
description = "Real time performance monitoring";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
@@ -66,6 +91,15 @@ in {
};
};
+ security.wrappers."apps.plugin" = {
+ source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin";
+ capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";
+ owner = cfg.user;
+ group = cfg.group;
+ permissions = "u+rx,g+rx,o-rwx";
+ };
+
+
users.extraUsers = optional (cfg.user == defaultUser) {
name = defaultUser;
};
diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index cf761edad926..8a47c9f1e7d8 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -111,11 +111,11 @@ in {
after = [ "network.target" ];
script = ''
${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \
- -config.file ${alertmanagerYml} \
- -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
- -log.level ${cfg.logLevel} \
- ${optionalString (cfg.webExternalUrl != null) ''-web.external-url ${cfg.webExternalUrl} \''}
- ${optionalString (cfg.logFormat != null) "-log.format ${cfg.logFormat}"}
+ --config.file ${alertmanagerYml} \
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ --log.level ${cfg.logLevel} \
+ ${optionalString (cfg.webExternalUrl != null) ''--web.external-url ${cfg.webExternalUrl} \''}
+ ${optionalString (cfg.logFormat != null) "--log.format ${cfg.logFormat}"}
'';
serviceConfig = {
diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
deleted file mode 100644
index ce2e1cf2d74b..000000000000
--- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.prometheus.blackboxExporter;
-in {
- options = {
- services.prometheus.blackboxExporter = {
- enable = mkEnableOption "prometheus blackbox exporter";
-
- configFile = mkOption {
- type = types.path;
- description = ''
- Path to configuration file.
- '';
- };
-
- port = mkOption {
- type = types.int;
- default = 9115;
- description = ''
- Port to listen on.
- '';
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching the blackbox exporter.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open port in firewall for incoming connections.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
- systemd.services.prometheus-blackbox-exporter = {
- description = "Prometheus exporter for blackbox probes";
- unitConfig.Documentation = "https://github.com/prometheus/blackbox_exporter";
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- User = "nobody";
- Restart = "always";
- PrivateTmp = true;
- WorkingDirectory = /tmp;
- AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes
- ExecStart = ''
- ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
- --web.listen-address :${toString cfg.port} \
- --config.file ${cfg.configFile} \
- ${concatStringsSep " \\\n " cfg.extraFlags}
- '';
- ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
- };
- };
- };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix b/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix
deleted file mode 100644
index f8a5b9576a11..000000000000
--- a/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix
+++ /dev/null
@@ -1,128 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.prometheus.collectdExporter;
-
- collectSettingsArgs = if (cfg.collectdBinary.enable) then ''
- -collectd.listen-address ${optionalString (cfg.collectdBinary.listenAddress != null) cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
- -collectd.security-level ${cfg.collectdBinary.securityLevel} \
- '' else "";
-
-in {
- options = {
- services.prometheus.collectdExporter = {
- enable = mkEnableOption "prometheus collectd exporter";
-
- port = mkOption {
- type = types.int;
- default = 9103;
- description = ''
- Port to listen on.
- This is used for scraping as well as the to receive collectd data via the write_http plugin.
- '';
- };
-
- listenAddress = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "0.0.0.0";
- description = ''
- Address to listen on for web interface, telemetry and collectd JSON data.
- '';
- };
-
- collectdBinary = {
- enable = mkEnableOption "collectd binary protocol receiver";
-
- authFile = mkOption {
- default = null;
- type = types.nullOr types.path;
- description = "File mapping user names to pre-shared keys (passwords).";
- };
-
- port = mkOption {
- type = types.int;
- default = 25826;
- description = ''Network address on which to accept collectd binary network packets.'';
- };
-
- listenAddress = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "0.0.0.0";
- description = ''
- Address to listen on for binary network packets.
- '';
- };
-
- securityLevel = mkOption {
- type = types.enum ["None" "Sign" "Encrypt"];
- default = "None";
- description = ''
- Minimum required security level for accepted packets.
- '';
- };
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching the collectd exporter.
- '';
- };
-
- logFormat = mkOption {
- type = types.str;
- default = "logger:stderr";
- example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true";
- description = ''
- Set the log target and format.
- '';
- };
-
- logLevel = mkOption {
- type = types.enum ["debug" "info" "warn" "error" "fatal"];
- default = "info";
- description = ''
- Only log messages with the given severity or above.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open port in firewall for incoming connections.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = (optional cfg.openFirewall cfg.port) ++
- (optional (cfg.openFirewall && cfg.collectdBinary.enable) cfg.collectdBinary.port);
-
- systemd.services.prometheus-collectd-exporter = {
- description = "Prometheus exporter for Collectd metrics";
- unitConfig.Documentation = "https://github.com/prometheus/collectd_exporter";
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- DynamicUser = true;
- Restart = "always";
- PrivateTmp = true;
- WorkingDirectory = /tmp;
- ExecStart = ''
- ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \
- -log.format ${cfg.logFormat} \
- -log.level ${cfg.logLevel} \
- -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \
- ${collectSettingsArgs} \
- ${concatStringsSep " " cfg.extraFlags}
- '';
- };
- };
- };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
new file mode 100644
index 000000000000..8d6ca1e40a19
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -0,0 +1,172 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters;
+
+ # each attribute in `exporterOpts` is expected to have specified:
+ # - port (types.int): port on which the exporter listens
+ # - serviceOpts (types.attrs): config that is merged with the
+ # default definition of the exporter's
+ # systemd service
+ # - extraOpts (types.attrs): extra configuration options to
+ # configure the exporter with, which
+ # are appended to the default options
+ #
+ # Note that `extraOpts` is optional, but a script for the exporter's
+ # systemd service must be provided by specifying either
+ # `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart`
+ exporterOpts = {
+ blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; };
+ collectd = import ./exporters/collectd.nix { inherit config lib pkgs; };
+ fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; };
+ json = import ./exporters/json.nix { inherit config lib pkgs; };
+ minio = import ./exporters/minio.nix { inherit config lib pkgs; };
+ nginx = import ./exporters/nginx.nix { inherit config lib pkgs; };
+ node = import ./exporters/node.nix { inherit config lib pkgs; };
+ postfix = import ./exporters/postfix.nix { inherit config lib pkgs; };
+ snmp = import ./exporters/snmp.nix { inherit config lib pkgs; };
+ unifi = import ./exporters/unifi.nix { inherit config lib pkgs; };
+ varnish = import ./exporters/varnish.nix { inherit config lib pkgs; };
+ };
+
+ mkExporterOpts = ({ name, port }: {
+ enable = mkEnableOption "the prometheus ${name} exporter";
+ port = mkOption {
+ type = types.int;
+ default = port;
+ description = ''
+ Port to listen on.
+ '';
+ };
+ listenAddress = mkOption {
+ type = types.str;
+ default = "0.0.0.0";
+ description = ''
+ Address to listen on.
+ '';
+ };
+ extraFlags = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Extra commandline options to pass to the ${name} exporter.
+ '';
+ };
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Open port in firewall for incoming connections.
+ '';
+ };
+ firewallFilter = mkOption {
+ type = types.str;
+ default = "-p tcp -m tcp --dport ${toString port}";
+ example = literalExample ''
+ "-i eth0 -p tcp -m tcp --dport ${toString port}"
+ '';
+ description = ''
+ Specify a filter for iptables to use when
+
+ is true. It is used as `ip46tables -I INPUT -j ACCEPT`.
+ '';
+ };
+ user = mkOption {
+ type = types.str;
+ default = "nobody";
+ description = ''
+ User name under which the ${name} exporter shall be run.
+ Has no effect when is true.
+ '';
+ };
+ group = mkOption {
+ type = types.str;
+ default = "nobody";
+ description = ''
+ Group under which the ${name} exporter shall be run.
+ Has no effect when is true.
+ '';
+ };
+ });
+
+ mkSubModule = { name, port, extraOpts, serviceOpts }: {
+ ${name} = mkOption {
+ type = types.submodule {
+ options = (mkExporterOpts {
+ inherit name port;
+ } // extraOpts);
+ };
+ internal = true;
+ default = {};
+ };
+ };
+
+ mkSubModules = (foldl' (a: b: a//b) {}
+ (mapAttrsToList (name: opts: mkSubModule {
+ inherit name;
+ inherit (opts) port serviceOpts;
+ extraOpts = opts.extraOpts or {};
+ }) exporterOpts)
+ );
+
+ mkExporterConf = { name, conf, serviceOpts }:
+ mkIf conf.enable {
+ networking.firewall.extraCommands = mkIf conf.openFirewall ''
+ ip46tables -I INPUT ${conf.firewallFilter} -j ACCEPT
+ '';
+ systemd.services."prometheus-${name}-exporter" = mkMerge ([{
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+ serviceConfig = {
+ Restart = mkDefault "always";
+ PrivateTmp = mkDefault true;
+ WorkingDirectory = mkDefault /tmp;
+ } // mkIf (!(serviceOpts.serviceConfig.DynamicUser or false)) {
+ User = conf.user;
+ Group = conf.group;
+ };
+ } serviceOpts ]);
+ };
+in
+{
+ options.services.prometheus.exporters = mkOption {
+ type = types.submodule {
+ options = (mkSubModules);
+ };
+ description = "Prometheus exporter configuration";
+ default = {};
+ example = literalExample ''
+ {
+ node = {
+ enable = true;
+ enabledCollectors = [ "systemd" ];
+ };
+ varnish.enable = true;
+ }
+ '';
+ };
+
+ config = mkMerge ([{
+ assertions = [{
+ assertion = (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null);
+ message = ''
+ Please ensure you have either `services.prometheus.exporters.snmp.configuration'
+ or `services.prometheus.exporters.snmp.configurationPath' set!
+ '';
+ }];
+ }] ++ [(mkIf config.services.minio.enable {
+ services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000";
+ services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey;
+ services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey;
+ })] ++ (mapAttrsToList (name: conf:
+ mkExporterConf {
+ inherit name;
+ inherit (conf) serviceOpts;
+ conf = cfg.${name};
+ }) exporterOpts)
+ );
+
+ meta.doc = ./exporters.xml;
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml
new file mode 100644
index 000000000000..4f0bcb298106
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters.xml
@@ -0,0 +1,135 @@
+
+
+Prometheus exporters
+
+Prometheus exporters provide metrics for the prometheus monitoring system.
+
+Configuration
+ One of the most common exporters is the node exporter, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows:
+
+ services.promtheus.exporters.node = {
+ enable = true;
+ enabledCollectors = [
+ "logind"
+ "systemd"
+ ];
+ disabledCollectors = [
+ "textfile"
+ ];
+ openFirewall = true;
+ firewallFilter = "-i br0 -p tcp -m tcp --dport 9100";
+ };
+
+It should now serve all metrics from the collectors
+that are explicitly enabled and the ones that are
+enabled by default, via http under /metrics. In this example the firewall should just
+allow incoming connections to the exporter's port on the bridge interface br0
+(this would have to be configured seperately of course).
+For more information about configuration see man configuration.nix or
+search through the available options.
+
+
+Adding a new exporter
+ To add a new exporter, it has to be packaged first (see nixpkgs/pkgs/servers/monitoring/prometheus/ for examples), then a module can be added. The postfix exporter is used in this example:
+
+
+
+ Some default options for all exporters are provided by
+ nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix:
+
+
+
+
+ enable
+ port
+ listenAddress
+ extraFlags
+ openFirewall
+ firewallFilter
+ user
+ group
+
+
+
+ As there is already a package available, the module can now be added.
+ This is accomplished by adding a new file to the
+ nixos/modules/services/monitoring/prometheus/exporters/ directory,
+ which will be called postfix.nix and contains all exporter specific options
+ and configuration:
+
+ # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix
+ { config, lib, pkgs }:
+
+ with lib;
+
+ let
+ # for convenience we define cfg here
+ cfg = config.services.prometheus.exporters.postfix;
+ in
+ {
+ port = 9154; # The postfix exporter listens on this port by default
+
+ # `extraOpts` is an attribute set which contains additional options
+ # (and optional overrides for default options).
+ # Note that this attribute is optional.
+ extraOpts = {
+ telemetryPath = mkOption {
+ type = types.str;
+ default = "/metrics";
+ description = ''
+ Path under which to expose metrics.
+ '';
+ };
+ logfilePath = mkOption {
+ type = types.path;
+ default = /var/log/postfix_exporter_input.log;
+ example = /var/log/mail.log;
+ description = ''
+ Path where Postfix writes log entries.
+ This file will be truncated by this exporter!
+ '';
+ };
+ showqPath = mkOption {
+ type = types.path;
+ default = /var/spool/postfix/public/showq;
+ example = /var/lib/postfix/queue/public/showq;
+ description = ''
+ Path at which Postfix places its showq socket.
+ '';
+ };
+ };
+
+ # `serviceOpts` is an attribute set which contains configuration
+ # for the exporter's systemd service. One of
+ # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart`
+ # has to be specified here. This will be merged with the default
+ # service confiuration.
+ serviceOpts = {
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ --web.telemetry-path ${cfg.telemetryPath} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+ }
+
+
+
+
+
+ This should already be enough for the postfix exporter. Additionally one could
+ now add assertions and conditional default values. This can be done in the
+ 'meta-module' that combines all exporter definitions and generates the submodules:
+ nixpkgs/nixos/modules/services/prometheus/exporters.nix
+
+
+
+
+
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
new file mode 100644
index 000000000000..d09d1c4f3663
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.blackbox;
+in
+{
+ port = 9115;
+ extraOpts = {
+ configFile = mkOption {
+ type = types.path;
+ description = ''
+ Path to configuration file.
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes
+ DynamicUser = true;
+ ExecStart = ''
+ ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ --config.file ${cfg.configFile} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
new file mode 100644
index 000000000000..0eba3527162d
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
@@ -0,0 +1,78 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.collectd;
+in
+{
+ port = 9103;
+ extraOpts = {
+ collectdBinary = {
+ enable = mkEnableOption "collectd binary protocol receiver";
+
+ authFile = mkOption {
+ default = null;
+ type = types.nullOr types.path;
+ description = "File mapping user names to pre-shared keys (passwords).";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 25826;
+ description = ''Network address on which to accept collectd binary network packets.'';
+ };
+
+ listenAddress = mkOption {
+ type = types.str;
+ default = "0.0.0.0";
+ description = ''
+ Address to listen on for binary network packets.
+ '';
+ };
+
+ securityLevel = mkOption {
+ type = types.enum ["None" "Sign" "Encrypt"];
+ default = "None";
+ description = ''
+ Minimum required security level for accepted packets.
+ '';
+ };
+ };
+
+ logFormat = mkOption {
+ type = types.str;
+ default = "logger:stderr";
+ example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true";
+ description = ''
+ Set the log target and format.
+ '';
+ };
+
+ logLevel = mkOption {
+ type = types.enum ["debug" "info" "warn" "error" "fatal"];
+ default = "info";
+ description = ''
+ Only log messages with the given severity or above.
+ '';
+ };
+ };
+ serviceOpts = let
+ collectSettingsArgs = if (cfg.collectdBinary.enable) then ''
+ -collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
+ -collectd.security-level ${cfg.collectdBinary.securityLevel} \
+ '' else "";
+ in {
+ serviceConfig = {
+ DynamicUser = true;
+ ExecStart = ''
+ ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \
+ -log.format ${cfg.logFormat} \
+ -log.level ${cfg.logLevel} \
+ -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ ${collectSettingsArgs} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix
new file mode 100644
index 000000000000..a3f1d9d31323
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix
@@ -0,0 +1,39 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.fritzbox;
+in
+{
+ port = 9133;
+ extraOpts = {
+ gatewayAddress = mkOption {
+ type = types.str;
+ default = "fritz.box";
+ description = ''
+ The hostname or IP of the FRITZ!Box.
+ '';
+ };
+
+ gatewayPort = mkOption {
+ type = types.int;
+ default = 49000;
+ description = ''
+ The port of the FRITZ!Box UPnP service.
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ DynamicUser = true;
+ ExecStart = ''
+ ${pkgs.prometheus-fritzbox-exporter}/bin/fritzbox_exporter \
+ -listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ -gateway-address ${cfg.gatewayAddress} \
+ -gateway-port ${toString cfg.gatewayPort} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixos/modules/services/monitoring/prometheus/exporters/json.nix
new file mode 100644
index 000000000000..a5494e85e016
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/json.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.json;
+in
+{
+ port = 7979;
+ extraOpts = {
+ url = mkOption {
+ type = types.str;
+ description = ''
+ URL to scrape JSON from.
+ '';
+ };
+ configFile = mkOption {
+ type = types.path;
+ description = ''
+ Path to configuration file.
+ '';
+ };
+ listenAddress = {}; # not used
+ };
+ serviceOpts = {
+ serviceConfig = {
+ DynamicUser = true;
+ ExecStart = ''
+ ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \
+ --port ${toString cfg.port} \
+ ${cfg.url} ${cfg.configFile} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
new file mode 100644
index 000000000000..3cc4ffdbc8fd
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
@@ -0,0 +1,65 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.minio;
+in
+{
+ port = 9290;
+ extraOpts = {
+ minioAddress = mkOption {
+ type = types.str;
+ example = "https://10.0.0.1:9000";
+ description = ''
+ The URL of the minio server.
+ Use HTTPS if Minio accepts secure connections only.
+ By default this connects to the local minio server if enabled.
+ '';
+ };
+
+ minioAccessKey = mkOption {
+ type = types.str;
+ example = "yourMinioAccessKey";
+ description = ''
+ The value of the Minio access key.
+ It is required in order to connect to the server.
+ By default this uses the one from the local minio server if enabled
+ and config.services.minio.accessKey.
+ '';
+ };
+
+ minioAccessSecret = mkOption {
+ type = types.str;
+ description = ''
+ The value of the Minio access secret.
+ It is required in order to connect to the server.
+ By default this uses the one from the local minio server if enabled
+ and config.services.minio.secretKey.
+ '';
+ };
+
+ minioBucketStats = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Collect statistics about the buckets and files in buckets.
+ It requires more computation, use it carefully in case of large buckets..
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ DynamicUser = true;
+ ExecStart = ''
+ ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \
+ -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ -minio.server ${cfg.minioAddress} \
+ -minio.access-key ${cfg.minioAccessKey} \
+ -minio.access-secret ${cfg.minioAccessSecret} \
+ ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
new file mode 100644
index 000000000000..6a3ba2d0457c
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.nginx;
+in
+{
+ port = 9113;
+ extraOpts = {
+ scrapeUri = mkOption {
+ type = types.string;
+ default = "http://localhost/nginx_status";
+ description = ''
+ Address to access the nginx status page.
+ Can be enabled with services.nginx.statusPage = true.
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ DynamicUser = true;
+ ExecStart = ''
+ ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \
+ -nginx.scrape_uri '${cfg.scrapeUri}' \
+ -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
new file mode 100644
index 000000000000..c85f5f9cfb2d
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -0,0 +1,39 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.node;
+in
+{
+ port = 9100;
+ extraOpts = {
+ enabledCollectors = mkOption {
+ type = types.listOf types.string;
+ default = [];
+ example = ''[ "systemd" ]'';
+ description = ''
+ Collectors to enable. The collectors listed here are enabled in addition to the default ones.
+ '';
+ };
+ disabledCollectors = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = ''[ "timex" ]'';
+ description = ''
+ Collectors to disable which are enabled by default.
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.prometheus-node-exporter}/bin/node_exporter \
+ ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \
+ ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
new file mode 100644
index 000000000000..1e909aa27d83
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.postfix;
+in
+{
+ port = 9154;
+ extraOpts = {
+ telemetryPath = mkOption {
+ type = types.str;
+ default = "/metrics";
+ description = ''
+ Path under which to expose metrics.
+ '';
+ };
+ logfilePath = mkOption {
+ type = types.path;
+ default = "/var/log/postfix_exporter_input.log";
+ example = "/var/log/mail.log";
+ description = ''
+ Path where Postfix writes log entries.
+ This file will be truncated by this exporter!
+ '';
+ };
+ showqPath = mkOption {
+ type = types.path;
+ default = "/var/spool/postfix/public/showq";
+ example = "/var/lib/postfix/queue/public/showq";
+ description = ''
+ Path where Postfix places it's showq socket.
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ --web.telemetry-path ${cfg.telemetryPath} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
new file mode 100644
index 000000000000..404cd0a1896b
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
@@ -0,0 +1,71 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.snmp;
+in
+{
+ port = 9116;
+ extraOpts = {
+ configurationPath = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option.
+ '';
+ example = "./snmp.yml";
+ };
+
+ configuration = mkOption {
+ type = types.nullOr types.attrs;
+ default = {};
+ description = ''
+ Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option.
+ '';
+ example = ''
+ {
+ "default" = {
+ "version" = 2;
+ "auth" = {
+ "community" = "public";
+ };
+ };
+ };
+ '';
+ };
+
+ logFormat = mkOption {
+ type = types.str;
+ default = "logger:stderr";
+ description = ''
+ Set the log target and format.
+ '';
+ };
+
+ logLevel = mkOption {
+ type = types.enum ["debug" "info" "warn" "error" "fatal"];
+ default = "info";
+ description = ''
+ Only log messages with the given severity or above.
+ '';
+ };
+ };
+ serviceOpts = let
+ configFile = if cfg.configurationPath != null
+ then cfg.configurationPath
+ else "${pkgs.writeText "snmp-eporter-conf.yml" (builtins.toJSON cfg.configuration)}";
+ in {
+ serviceConfig = {
+ DynamicUser = true;
+ ExecStart = ''
+ ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
+ -config.file ${configFile} \
+ -log.format ${cfg.logFormat} \
+ -log.level ${cfg.logLevel} \
+ -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
new file mode 100644
index 000000000000..011dcbe208e4
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
@@ -0,0 +1,67 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.unifi;
+in
+{
+ port = 9130;
+ extraOpts = {
+ unifiAddress = mkOption {
+ type = types.str;
+ example = "https://10.0.0.1:8443";
+ description = ''
+ URL of the UniFi Controller API.
+ '';
+ };
+
+ unifiInsecure = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If enabled skip the verification of the TLS certificate of the UniFi Controller API.
+ Use with caution.
+ '';
+ };
+
+ unifiUsername = mkOption {
+ type = types.str;
+ example = "ReadOnlyUser";
+ description = ''
+ username for authentication against UniFi Controller API.
+ '';
+ };
+
+ unifiPassword = mkOption {
+ type = types.str;
+ description = ''
+ Password for authentication against UniFi Controller API.
+ '';
+ };
+
+ unifiTimeout = mkOption {
+ type = types.str;
+ default = "5s";
+ example = "2m";
+ description = ''
+ Timeout including unit for UniFi Controller API requests.
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ DynamicUser = true;
+ ExecStart = ''
+ ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \
+ -telemetry.addr ${cfg.listenAddress}:${toString cfg.port} \
+ -unifi.addr ${cfg.unifiAddress} \
+ -unifi.username ${cfg.unifiUsername} \
+ -unifi.password ${cfg.unifiPassword} \
+ -unifi.timeout ${cfg.unifiTimeout} \
+ ${optionalString cfg.unifiInsecure "-unifi.insecure" } \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
new file mode 100644
index 000000000000..b439a83e7aa2
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
@@ -0,0 +1,21 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.varnish;
+in
+{
+ port = 9131;
+ serviceOpts = {
+ path = [ pkgs.varnish ];
+ serviceConfig = {
+ DynamicUser = true;
+ ExecStart = ''
+ ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \
+ -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix
deleted file mode 100644
index 6da39b6519cb..000000000000
--- a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.prometheus.fritzboxExporter;
-in {
- options = {
- services.prometheus.fritzboxExporter = {
- enable = mkEnableOption "prometheus fritzbox exporter";
-
- port = mkOption {
- type = types.int;
- default = 9133;
- description = ''
- Port to listen on.
- '';
- };
-
- gatewayAddress = mkOption {
- type = types.str;
- default = "fritz.box";
- description = ''
- The hostname or IP of the FRITZ!Box.
- '';
- };
-
- gatewayPort = mkOption {
- type = types.int;
- default = 49000;
- description = ''
- The port of the FRITZ!Box UPnP service.
- '';
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching the fritzbox exporter.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open port in firewall for incoming connections.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
- systemd.services.prometheus-fritzbox-exporter = {
- description = "Prometheus exporter for FRITZ!Box via UPnP";
- unitConfig.Documentation = "https://github.com/ndecker/fritzbox_exporter";
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- User = "nobody";
- Restart = "always";
- PrivateTmp = true;
- WorkingDirectory = /tmp;
- ExecStart = ''
- ${pkgs.prometheus-fritzbox-exporter}/bin/fritzbox_exporter \
- -listen-address :${toString cfg.port} \
- -gateway-address ${cfg.gatewayAddress} \
- -gateway-port ${toString cfg.gatewayPort} \
- ${concatStringsSep " \\\n " cfg.extraFlags}
- '';
- };
- };
- };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/json-exporter.nix b/nixos/modules/services/monitoring/prometheus/json-exporter.nix
deleted file mode 100644
index 6bc56df9834b..000000000000
--- a/nixos/modules/services/monitoring/prometheus/json-exporter.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.prometheus.jsonExporter;
-in {
- options = {
- services.prometheus.jsonExporter = {
- enable = mkEnableOption "prometheus JSON exporter";
-
- url = mkOption {
- type = types.str;
- description = ''
- URL to scrape JSON from.
- '';
- };
-
- configFile = mkOption {
- type = types.path;
- description = ''
- Path to configuration file.
- '';
- };
-
- port = mkOption {
- type = types.int;
- default = 7979;
- description = ''
- Port to listen on.
- '';
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching the JSON exporter.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open port in firewall for incoming connections.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
- systemd.services.prometheus-json-exporter = {
- description = "Prometheus exporter for JSON over HTTP";
- unitConfig.Documentation = "https://github.com/kawamuray/prometheus-json-exporter";
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- User = "nobody";
- Restart = "always";
- PrivateTmp = true;
- WorkingDirectory = /tmp;
- ExecStart = ''
- ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \
- --port ${toString cfg.port} \
- ${cfg.url} ${cfg.configFile} \
- ${concatStringsSep " \\\n " cfg.extraFlags}
- '';
- ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
- };
- };
- };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix
deleted file mode 100644
index 4314671523cf..000000000000
--- a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.prometheus.minioExporter;
-in {
- options = {
- services.prometheus.minioExporter = {
- enable = mkEnableOption "prometheus minio exporter";
-
- port = mkOption {
- type = types.int;
- default = 9290;
- description = ''
- Port to listen on.
- '';
- };
-
- listenAddress = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "0.0.0.0";
- description = ''
- Address to listen on for web interface and telemetry.
- '';
- };
-
- minioAddress = mkOption {
- type = types.str;
- example = "https://10.0.0.1:9000";
- default = if config.services.minio.enable then "http://localhost:9000" else null;
- description = ''
- The URL of the minio server.
- Use HTTPS if Minio accepts secure connections only.
- By default this connects to the local minio server if enabled.
- '';
- };
-
- minioAccessKey = mkOption ({
- type = types.str;
- example = "BKIKJAA5BMMU2RHO6IBB";
- description = ''
- The value of the Minio access key.
- It is required in order to connect to the server.
- By default this uses the one from the local minio server if enabled
- and config.services.minio.accessKey.
- '';
- } // optionalAttrs (config.services.minio.enable && config.services.minio.accessKey != "") {
- default = config.services.minio.accessKey;
- });
-
- minioAccessSecret = mkOption ({
- type = types.str;
- description = ''
- The calue of the Minio access secret.
- It is required in order to connect to the server.
- By default this uses the one from the local minio server if enabled
- and config.services.minio.secretKey.
- '';
- } // optionalAttrs (config.services.minio.enable && config.services.minio.secretKey != "") {
- default = config.services.minio.secretKey;
- });
-
- minioBucketStats = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Collect statistics about the buckets and files in buckets.
- It requires more computation, use it carefully in case of large buckets..
- '';
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching the minio exporter.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open port in firewall for incoming connections.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
- systemd.services.prometheus-minio-exporter = {
- description = "Prometheus exporter for Minio server metrics";
- unitConfig.Documentation = "https://github.com/joe-pll/minio-exporter";
- wantedBy = [ "multi-user.target" ];
- after = optional config.services.minio.enable "minio.service";
- serviceConfig = {
- DynamicUser = true;
- Restart = "always";
- PrivateTmp = true;
- WorkingDirectory = /tmp;
- ExecStart = ''
- ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \
- -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \
- -minio.server ${cfg.minioAddress} \
- -minio.access-key ${cfg.minioAccessKey} \
- -minio.access-secret ${cfg.minioAccessSecret} \
- ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \
- ${concatStringsSep " \\\n " cfg.extraFlags}
- '';
- };
- };
- };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
deleted file mode 100644
index 1ccafee3b18b..000000000000
--- a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.prometheus.nginxExporter;
-in {
- options = {
- services.prometheus.nginxExporter = {
- enable = mkEnableOption "prometheus nginx exporter";
-
- port = mkOption {
- type = types.int;
- default = 9113;
- description = ''
- Port to listen on.
- '';
- };
-
- listenAddress = mkOption {
- type = types.string;
- default = "0.0.0.0";
- description = ''
- Address to listen on.
- '';
- };
-
- scrapeUri = mkOption {
- type = types.string;
- default = "http://localhost/nginx_status";
- description = ''
- Address to access the nginx status page.
- Can be enabled with services.nginx.statusPage = true.
- '';
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching the nginx exporter.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open port in firewall for incoming connections.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
- systemd.services.prometheus-nginx-exporter = {
- after = [ "network.target" "nginx.service" ];
- description = "Prometheus exporter for nginx metrics";
- unitConfig.Documentation = "https://github.com/discordianfish/nginx_exporter";
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- User = "nobody";
- Restart = "always";
- PrivateTmp = true;
- WorkingDirectory = /tmp;
- ExecStart = ''
- ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \
- -nginx.scrape_uri '${cfg.scrapeUri}' \
- -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
- ${concatStringsSep " \\\n " cfg.extraFlags}
- '';
- ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
- };
- };
- };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix
deleted file mode 100644
index bad4389ce799..000000000000
--- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.prometheus.nodeExporter;
-in {
- options = {
- services.prometheus.nodeExporter = {
- enable = mkEnableOption "prometheus node exporter";
-
- port = mkOption {
- type = types.int;
- default = 9100;
- description = ''
- Port to listen on.
- '';
- };
-
- listenAddress = mkOption {
- type = types.string;
- default = "0.0.0.0";
- description = ''
- Address to listen on.
- '';
- };
-
- enabledCollectors = mkOption {
- type = types.listOf types.string;
- default = [];
- example = ''[ "systemd" ]'';
- description = ''
- Collectors to enable. The collectors listed here are enabled in addition to the default ones.
- '';
- };
-
- disabledCollectors = mkOption {
- type = types.listOf types.str;
- default = [];
- example = ''[ "timex" ]'';
- description = ''
- Collectors to disable which are enabled by default.
- '';
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching the node exporter.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open port in firewall for incoming connections.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
- systemd.services.prometheus-node-exporter = {
- description = "Prometheus exporter for machine metrics";
- unitConfig.Documentation = "https://github.com/prometheus/node_exporter";
- wantedBy = [ "multi-user.target" ];
- script = ''
- exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \
- ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \
- ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
- --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
- ${concatStringsSep " \\\n " cfg.extraFlags}
- '';
- serviceConfig = {
- User = "nobody";
- Restart = "always";
- PrivateTmp = true;
- WorkingDirectory = /tmp;
- ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
- };
- };
- };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix b/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix
deleted file mode 100644
index fe33f8c1f04d..000000000000
--- a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.prometheus.snmpExporter;
- mkConfigFile = pkgs.writeText "snmp.yml" (if cfg.configurationPath == null then builtins.toJSON cfg.configuration else builtins.readFile cfg.configurationPath);
-in {
- options = {
- services.prometheus.snmpExporter = {
- enable = mkEnableOption "Prometheus snmp exporter";
-
- user = mkOption {
- type = types.str;
- default = "nobody";
- description = ''
- User name under which snmp exporter shall be run.
- '';
- };
-
- group = mkOption {
- type = types.str;
- default = "nogroup";
- description = ''
- Group under which snmp exporter shall be run.
- '';
- };
-
- port = mkOption {
- type = types.int;
- default = 9116;
- description = ''
- Port to listen on.
- '';
- };
-
- listenAddress = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- Address to listen on for web interface and telemetry.
- '';
- };
-
- configurationPath = mkOption {
- type = types.nullOr types.path;
- default = null;
- description = ''
- Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option.
- '';
- example = "./snmp.yml";
- };
-
- configuration = mkOption {
- type = types.nullOr types.attrs;
- default = {};
- description = ''
- Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option.
- '';
- example = ''
- {
- "default" = {
- "version" = 2;
- "auth" = {
- "community" = "public";
- };
- };
- };
- '';
- };
-
- logFormat = mkOption {
- type = types.str;
- default = "logger:stderr";
- description = ''
- Set the log target and format.
- '';
- };
-
- logLevel = mkOption {
- type = types.enum ["debug" "info" "warn" "error" "fatal"];
- default = "info";
- description = ''
- Only log messages with the given severity or above.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open port in firewall for incoming connections.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
- assertions = singleton
- {
- assertion = (cfg.configurationPath == null) != (cfg.configuration == null);
- message = "Please ensure you have either 'configuration' or 'configurationPath' set!";
- };
-
- systemd.services.prometheus-snmp-exporter = {
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
- script = ''
- ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
- -config.file ${mkConfigFile} \
- -log.format ${cfg.logFormat} \
- -log.level ${cfg.logLevel} \
- -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port}
- '';
-
- serviceConfig = {
- User = cfg.user;
- Group = cfg.group;
- Restart = "always";
- PrivateTmp = true;
- WorkingDirectory = "/tmp";
- };
- };
- };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
deleted file mode 100644
index 0a56d6ae95a5..000000000000
--- a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.prometheus.unifiExporter;
-in {
- options = {
- services.prometheus.unifiExporter = {
- enable = mkEnableOption "prometheus unifi exporter";
-
- port = mkOption {
- type = types.int;
- default = 9130;
- description = ''
- Port to listen on.
- '';
- };
-
- unifiAddress = mkOption {
- type = types.str;
- example = "https://10.0.0.1:8443";
- description = ''
- URL of the UniFi Controller API.
- '';
- };
-
- unifiInsecure = mkOption {
- type = types.bool;
- default = false;
- description = ''
- If enabled skip the verification of the TLS certificate of the UniFi Controller API.
- Use with caution.
- '';
- };
-
- unifiUsername = mkOption {
- type = types.str;
- example = "ReadOnlyUser";
- description = ''
- username for authentication against UniFi Controller API.
- '';
- };
-
- unifiPassword = mkOption {
- type = types.str;
- description = ''
- Password for authentication against UniFi Controller API.
- '';
- };
-
- unifiTimeout = mkOption {
- type = types.str;
- default = "5s";
- example = "2m";
- description = ''
- Timeout including unit for UniFi Controller API requests.
- '';
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching the unifi exporter.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open port in firewall for incoming connections.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
- systemd.services.prometheus-unifi-exporter = {
- description = "Prometheus exporter for UniFi Controller metrics";
- unitConfig.Documentation = "https://github.com/mdlayher/unifi_exporter";
- wantedBy = [ "multi-user.target" ];
- after = optional config.services.unifi.enable "unifi.service";
- serviceConfig = {
- User = "nobody";
- Restart = "always";
- PrivateTmp = true;
- WorkingDirectory = /tmp;
- ExecStart = ''
- ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \
- -telemetry.addr :${toString cfg.port} \
- -unifi.addr ${cfg.unifiAddress} \
- -unifi.username ${cfg.unifiUsername} \
- -unifi.password ${cfg.unifiPassword} \
- -unifi.timeout ${cfg.unifiTimeout} \
- ${optionalString cfg.unifiInsecure "-unifi.insecure" } \
- ${concatStringsSep " \\\n " cfg.extraFlags}
- '';
- };
- };
- };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix
deleted file mode 100644
index 143ebb62aeac..000000000000
--- a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-# Shamelessly cribbed from nginx-exporter.nix. ~ C.
-with lib;
-
-let
- cfg = config.services.prometheus.varnishExporter;
-in {
- options = {
- services.prometheus.varnishExporter = {
- enable = mkEnableOption "prometheus Varnish exporter";
-
- port = mkOption {
- type = types.int;
- default = 9131;
- description = ''
- Port to listen on.
- '';
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching the Varnish exporter.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open port in firewall for incoming connections.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
- systemd.services.prometheus-varnish-exporter = {
- description = "Prometheus exporter for Varnish metrics";
- unitConfig.Documentation = "https://github.com/jonnenauha/prometheus_varnish_exporter";
- wantedBy = [ "multi-user.target" ];
- path = [ pkgs.varnish ];
- script = ''
- exec ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \
- -web.listen-address :${toString cfg.port} \
- ${concatStringsSep " \\\n " cfg.extraFlags}
- '';
- serviceConfig = {
- User = "nobody";
- Restart = "always";
- PrivateTmp = true;
- WorkingDirectory = /tmp;
- ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
- };
- };
- };
-}
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index 1d6940c516a9..fecae4ca1b36 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -14,7 +14,7 @@ let
nx = cfg.notifications.x11;
smartdNotify = pkgs.writeScript "smartd-notify.sh" ''
- #! ${pkgs.stdenv.shell}
+ #! ${pkgs.runtimeShell}
${optionalString nm.enable ''
{
${pkgs.coreutils}/bin/cat << EOF
@@ -64,7 +64,7 @@ let
"DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"}
'';
- smartdOpts = { name, ... }: {
+ smartdDeviceOpts = { name, ... }: {
options = {
@@ -108,6 +108,18 @@ in
'';
};
+ extraOptions = mkOption {
+ default = [];
+ type = types.listOf types.str;
+ example = ["-A /var/log/smartd/" "--interval=3600"];
+ description = ''
+ Extra command-line options passed to the smartd
+ daemon on startup.
+
+ (See man 8 smartd.)
+ '';
+ };
+
notifications = {
mail = {
@@ -197,7 +209,7 @@ in
devices = mkOption {
default = [];
example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];
- type = with types; listOf (submodule smartdOpts);
+ type = with types; listOf (submodule smartdDeviceOpts);
description = "List of devices to monitor.";
};
@@ -222,7 +234,7 @@ in
path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd
- serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork --configfile=${smartdConf}";
+ serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}";
};
};
diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index df2adb9f2766..7b0e9981cbb1 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -9,6 +9,12 @@ let
isBuiltinBackend = name:
builtins.elem name [ "graphite" "console" "repeater" ];
+ backendsToPackages = let
+ mkMap = list: name:
+ if isBuiltinBackend name then list
+ else list ++ [ pkgs.nodePackages.${name} ];
+ in foldl mkMap [];
+
configFile = pkgs.writeText "statsd.conf" ''
{
address: "${cfg.listenAddress}",
@@ -27,13 +33,21 @@ let
prettyprint: false
},
log: {
- backend: "syslog"
+ backend: "stdout"
},
automaticConfigReload: false${optionalString (cfg.extraConfig != null) ","}
${cfg.extraConfig}
}
'';
+ deps = pkgs.buildEnv {
+ name = "statsd-runtime-deps";
+ pathsToLink = [ "/lib" ];
+ ignoreCollisions = true;
+
+ paths = backendsToPackages cfg.backends;
+ };
+
in
{
@@ -42,11 +56,7 @@ in
options.services.statsd = {
- enable = mkOption {
- description = "Whether to enable statsd stats aggregation service";
- default = false;
- type = types.bool;
- };
+ enable = mkEnableOption "statsd";
listenAddress = mkOption {
description = "Address that statsd listens on over UDP";
@@ -110,6 +120,11 @@ in
config = mkIf cfg.enable {
+ assertions = map (backend: {
+ assertion = !isBuiltinBackend backend -> hasAttrByPath [ backend ] pkgs.nodePackages;
+ message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!";
+ }) cfg.backends;
+
users.extraUsers = singleton {
name = "statsd";
uid = config.ids.uids.statsd;
@@ -120,9 +135,7 @@ in
description = "Statsd Server";
wantedBy = [ "multi-user.target" ];
environment = {
- NODE_PATH=concatMapStringsSep ":"
- (pkg: "${builtins.getAttr pkg pkgs.statsd.nodePackages}/lib/node_modules")
- (filter (name: !isBuiltinBackend name) cfg.backends);
+ NODE_PATH = "${deps}/lib/node_modules";
};
serviceConfig = {
ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}";
diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
new file mode 100644
index 000000000000..a6a2ec6cbc36
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/beegfs.nix
@@ -0,0 +1,343 @@
+{ config, lib, pkgs, ...} :
+
+with lib;
+
+let
+ cfg = config.services.beegfs;
+
+ # functions for the generations of config files
+
+ configMgmtd = name: cfg: pkgs.writeText "mgmt-${name}.conf" ''
+ storeMgmtdDirectory = ${cfg.mgmtd.storeDir}
+ storeAllowFirstRunInit = false
+ connAuthFile = ${cfg.connAuthFile}
+ connPortShift = ${toString cfg.connPortShift}
+
+ ${cfg.mgmtd.extraConfig}
+ '';
+
+ configAdmon = name: cfg: pkgs.writeText "admon-${name}.conf" ''
+ sysMgmtdHost = ${cfg.mgmtdHost}
+ connAuthFile = ${cfg.connAuthFile}
+ connPortShift = ${toString cfg.connPortShift}
+
+ ${cfg.admon.extraConfig}
+ '';
+
+ configMeta = name: cfg: pkgs.writeText "meta-${name}.conf" ''
+ storeMetaDirectory = ${cfg.meta.storeDir}
+ sysMgmtdHost = ${cfg.mgmtdHost}
+ connAuthFile = ${cfg.connAuthFile}
+ connPortShift = ${toString cfg.connPortShift}
+ storeAllowFirstRunInit = false
+
+ ${cfg.mgmtd.extraConfig}
+ '';
+
+ configStorage = name: cfg: pkgs.writeText "storage-${name}.conf" ''
+ storeStorageDirectory = ${cfg.storage.storeDir}
+ sysMgmtdHost = ${cfg.mgmtdHost}
+ connAuthFile = ${cfg.connAuthFile}
+ connPortShift = ${toString cfg.connPortShift}
+ storeAllowFirstRunInit = false
+
+ ${cfg.storage.extraConfig}
+ '';
+
+ configHelperd = name: cfg: pkgs.writeText "helperd-${name}.conf" ''
+ connAuthFile = ${cfg.connAuthFile}
+ ${cfg.helperd.extraConfig}
+ '';
+
+ configClientFilename = name : "/etc/beegfs/client-${name}.conf";
+
+ configClient = name: cfg: ''
+ sysMgmtdHost = ${cfg.mgmtdHost}
+ connAuthFile = ${cfg.connAuthFile}
+ connPortShift = ${toString cfg.connPortShift}
+
+ ${cfg.client.extraConfig}
+ '';
+
+ serviceList = [
+ { service = "admon"; cfgFile = configAdmon; }
+ { service = "meta"; cfgFile = configMeta; }
+ { service = "mgmtd"; cfgFile = configMgmtd; }
+ { service = "storage"; cfgFile = configStorage; }
+ ];
+
+ # functions to generate systemd.service entries
+
+ systemdEntry = service: cfgFile: (mapAttrs' ( name: cfg:
+ (nameValuePair "beegfs-${service}-${name}" (mkIf cfg."${service}".enable {
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "network-online.target" ];
+ after = [ "network-online.target" ];
+ serviceConfig = rec {
+ ExecStart = ''
+ ${pkgs.beegfs}/bin/beegfs-${service} \
+ cfgFile=${cfgFile name cfg} \
+ pidFile=${PIDFile}
+ '';
+ PIDFile = "/run/beegfs-${service}-${name}.pid";
+ TimeoutStopSec = "300";
+ };
+ }))) cfg);
+
+ systemdHelperd = mapAttrs' ( name: cfg:
+ (nameValuePair "beegfs-helperd-${name}" (mkIf cfg.client.enable {
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "network-online.target" ];
+ after = [ "network-online.target" ];
+ serviceConfig = rec {
+ ExecStart = ''
+ ${pkgs.beegfs}/bin/beegfs-helperd \
+ cfgFile=${configHelperd name cfg} \
+ pidFile=${PIDFile}
+ '';
+ PIDFile = "/run/beegfs-helperd-${name}.pid";
+ TimeoutStopSec = "300";
+ };
+ }))) cfg;
+
+ # wrappers to beegfs tools. Avoid typing path of config files
+ utilWrappers = mapAttrsToList ( name: cfg:
+ ( pkgs.runCommand "beegfs-utils-${name}" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+ mkdir -p $out/bin
+
+ makeWrapper ${pkgs.beegfs}/bin/beegfs-check-servers \
+ $out/bin/beegfs-check-servers-${name} \
+ --add-flags "-c ${configClientFilename name}" \
+ --prefix PATH : ${lib.makeBinPath [ pkgs.beegfs ]}
+
+ makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \
+ $out/bin/beegfs-ctl-${name} \
+ --add-flags "--cfgFile=${configClientFilename name}"
+
+ makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \
+ $out/bin/beegfs-df-${name} \
+ --add-flags "--cfgFile=${configClientFilename name}" \
+ --add-flags --listtargets \
+ --add-flags --hidenodeid \
+ --add-flags --pools \
+ --add-flags --spaceinfo
+
+ makeWrapper ${pkgs.beegfs}/bin/beegfs-fsck \
+ $out/bin/beegfs-fsck-${name} \
+ --add-flags "--cfgFile=${configClientFilename name}"
+ ''
+ )) cfg;
+in
+{
+ ###### interface
+
+ options = {
+ services.beegfsEnable = mkEnableOption "BeeGFS";
+
+ services.beegfs = mkOption {
+ default = {};
+ description = ''
+ BeeGFS configurations. Every mount point requires a separate configuration.
+ '';
+ type = with types; attrsOf (submodule ({ config, ... } : {
+ options = {
+ mgmtdHost = mkOption {
+ type = types.str;
+ default = null;
+ example = "master";
+ description = ''Hostname of managament host.'';
+ };
+
+ connAuthFile = mkOption {
+ type = types.str;
+ default = "";
+ example = "/etc/my.key";
+ description = "File containing shared secret authentication.";
+ };
+
+ connPortShift = mkOption {
+ type = types.int;
+ default = 0;
+ example = 5;
+ description = ''
+ For each additional beegfs configuration shift all
+ service TCP/UDP ports by at least 5.
+ '';
+ };
+
+ client = {
+ enable = mkEnableOption "BeeGFS client";
+
+ mount = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Create fstab entry automatically";
+ };
+
+ mountPoint = mkOption {
+ type = types.str;
+ default = "/run/beegfs";
+ description = ''
+ Mount point under which the beegfs filesytem should be mounted.
+ If mounted manually the mount option specifing the config file is needed:
+ cfgFile=/etc/beegfs/beegfs-client-<name>.conf
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional lines for beegfs-client.conf.
+ See documentation for further details.
+ '';
+ };
+ };
+
+ helperd = {
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional lines for beegfs-helperd.conf. See documentation
+ for further details.
+ '';
+ };
+ };
+
+ mgmtd = {
+ enable = mkEnableOption "BeeGFS mgmtd daemon";
+
+ storeDir = mkOption {
+ type = types.path;
+ default = null;
+ example = "/data/beegfs-mgmtd";
+ description = ''
+ Data directory for mgmtd.
+ Must not be shared with other beegfs daemons.
+ This directory must exist and it must be initialized
+ with beegfs-setup-mgmtd, e.g. "beegfs-setup-mgmtd -C -p <storeDir>"
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional lines for beegfs-mgmtd.conf. See documentation
+ for further details.
+ '';
+ };
+ };
+
+ admon = {
+ enable = mkEnableOption "BeeGFS admon daemon";
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional lines for beegfs-admon.conf. See documentation
+ for further details.
+ '';
+ };
+ };
+
+ meta = {
+ enable = mkEnableOption "BeeGFS meta data daemon";
+
+ storeDir = mkOption {
+ type = types.path;
+ default = null;
+ example = "/data/beegfs-meta";
+ description = ''
+ Data directory for meta data service.
+ Must not be shared with other beegfs daemons.
+ The underlying filesystem must be mounted with xattr turned on.
+ This directory must exist and it must be initialized
+ with beegfs-setup-meta, e.g.
+ "beegfs-setup-meta -C -s <serviceID> -p <storeDir>"
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Additional lines for beegfs-meta.conf. See documentation
+ for further details.
+ '';
+ };
+ };
+
+ storage = {
+ enable = mkEnableOption "BeeGFS storage daemon";
+
+ storeDir = mkOption {
+ type = types.path;
+ default = null;
+ example = "/data/beegfs-storage";
+ description = ''
+ Data directories for storage service.
+ Must not be shared with other beegfs daemons.
+ The underlying filesystem must be mounted with xattr turned on.
+ This directory must exist and it must be initialized
+ with beegfs-setup-storage, e.g.
+ "beegfs-setup-storage -C -s <serviceID> -i <storageTargetID> -p <storeDir>"
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Addional lines for beegfs-storage.conf. See documentation
+ for further details.
+ '';
+ };
+ };
+ };
+ }));
+ };
+ };
+
+ ###### implementation
+
+ config =
+ mkIf config.services.beegfsEnable {
+
+ environment.systemPackages = utilWrappers;
+
+ # Put the client.conf files in /etc since they are needed
+ # by the commandline tools
+ environment.etc = mapAttrs' ( name: cfg:
+ (nameValuePair "beegfs/client-${name}.conf" (mkIf (cfg.client.enable)
+ {
+ enable = true;
+ text = configClient name cfg;
+ }))) cfg;
+
+ # Kernel module, we need it only once per host.
+ boot = mkIf (
+ foldr (a: b: a || b) false
+ (map (x: x.client.enable) (collect (x: x ? client) cfg)))
+ {
+ kernelModules = [ "beegfs" ];
+ extraModulePackages = [ pkgs.linuxPackages.beegfs-module ];
+ };
+
+ # generate fstab entries
+ fileSystems = mapAttrs' (name: cfg:
+ (nameValuePair cfg.client.mountPoint (optionalAttrs cfg.client.mount (mkIf cfg.client.enable {
+ device = "beegfs_nodev";
+ fsType = "beegfs";
+ mountPoint = cfg.client.mountPoint;
+ options = [ "cfgFile=${configClientFilename name}" "_netdev" ];
+ })))) cfg;
+
+ # generate systemd services
+ systemd.services = systemdHelperd //
+ foldr (a: b: a // b) {}
+ (map (x: systemdEntry x.service x.cfgFile) serviceList);
+ };
+}
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
new file mode 100644
index 000000000000..5de8ae79a246
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -0,0 +1,371 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ ceph = pkgs.ceph;
+ cfg = config.services.ceph;
+ # function that translates "camelCaseOptions" to "camel case options", credits to tilpner in #nixos@freenode
+ translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars);
+ generateDaemonList = (daemonType: daemons: extraServiceConfig:
+ mkMerge (
+ map (daemon:
+ { "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; }
+ ) daemons
+ )
+ );
+ generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: {
+ enable = true;
+ description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}";
+ after = [ "network-online.target" "local-fs.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
+ wants = [ "network-online.target" "local-fs.target" "time-sync.target" ];
+ partOf = [ "ceph-${daemonType}.target" ];
+ wantedBy = [ "ceph-${daemonType}.target" ];
+
+ serviceConfig = {
+ LimitNOFILE = 1048576;
+ LimitNPROC = 1048576;
+ Environment = "CLUSTER=${clusterName}";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ PrivateDevices = "yes";
+ PrivateTmp = "true";
+ ProtectHome = "true";
+ ProtectSystem = "full";
+ Restart = "on-failure";
+ StartLimitBurst = "5";
+ StartLimitInterval = "30min";
+ ExecStart = "${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} -f --cluster ${clusterName} --id ${if daemonType == "rgw" then "client.${daemonId}" else daemonId} --setuser ceph --setgroup ceph";
+ } // extraServiceConfig
+ // optionalAttrs (daemonType == "osd") { ExecStartPre = "${ceph.out}/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 ]; }
+ );
+ generateTargetFile = (daemonType:
+ {
+ "ceph-${daemonType}" = {
+ description = "Ceph target allowing to start/stop all ceph-${daemonType} services at once";
+ partOf = [ "ceph.target" ];
+ before = [ "ceph.target" ];
+ };
+ }
+ );
+in
+{
+ options.services.ceph = {
+ # Ceph has a monolithic configuration file but different sections for
+ # each daemon, a separate client section and a global section
+ enable = mkEnableOption "Ceph global configuration";
+
+ global = {
+ fsid = mkOption {
+ type = types.str;
+ example = ''
+ 433a2193-4f8a-47a0-95d2-209d7ca2cca5
+ '';
+ description = ''
+ Filesystem ID, a generated uuid, its must be generated and set before
+ attempting to start a cluster
+ '';
+ };
+
+ clusterName = mkOption {
+ type = types.str;
+ default = "ceph";
+ description = ''
+ Name of cluster
+ '';
+ };
+
+ monInitialMembers = mkOption {
+ type = with types; nullOr commas;
+ default = null;
+ example = ''
+ node0, node1, node2
+ '';
+ description = ''
+ List of hosts that will be used as monitors at startup.
+ '';
+ };
+
+ monHost = mkOption {
+ type = with types; nullOr commas;
+ default = null;
+ example = ''
+ 10.10.0.1, 10.10.0.2, 10.10.0.3
+ '';
+ description = ''
+ List of hostname shortnames/IP addresses of the initial monitors.
+ '';
+ };
+
+ maxOpenFiles = mkOption {
+ type = types.int;
+ default = 131072;
+ description = ''
+ Max open files for each OSD daemon.
+ '';
+ };
+
+ authClusterRequired = mkOption {
+ type = types.enum [ "cephx" "none" ];
+ default = "cephx";
+ description = ''
+ Enables requiring daemons to authenticate with eachother in the cluster.
+ '';
+ };
+
+ authServiceRequired = mkOption {
+ type = types.enum [ "cephx" "none" ];
+ default = "cephx";
+ description = ''
+ Enables requiring clients to authenticate with the cluster to access services in the cluster (e.g. radosgw, mds or osd).
+ '';
+ };
+
+ authClientRequired = mkOption {
+ type = types.enum [ "cephx" "none" ];
+ default = "cephx";
+ description = ''
+ Enables requiring the cluster to authenticate itself to the client.
+ '';
+ };
+
+ publicNetwork = mkOption {
+ type = with types; nullOr commas;
+ default = null;
+ example = ''
+ 10.20.0.0/24, 192.168.1.0/24
+ '';
+ description = ''
+ A comma-separated list of subnets that will be used as public networks in the cluster.
+ '';
+ };
+
+ clusterNetwork = mkOption {
+ type = with types; nullOr commas;
+ default = null;
+ example = ''
+ 10.10.0.0/24, 192.168.0.0/24
+ '';
+ description = ''
+ A comma-separated list of subnets that will be used as cluster networks in the cluster.
+ '';
+ };
+ };
+
+ mgr = {
+ enable = mkEnableOption "Ceph MGR daemon";
+ daemons = mkOption {
+ type = with types; listOf str;
+ default = [];
+ example = ''
+ [ "name1" "name2" ];
+ '';
+ description = ''
+ A list of names for manager daemons that should have a service created. The names correspond
+ to the id part in ceph i.e. [ "name1" ] would result in mgr.name1
+ '';
+ };
+ extraConfig = mkOption {
+ type = with types; attrsOf str;
+ default = {};
+ description = ''
+ Extra configuration to add to the global section for manager daemons.
+ '';
+ };
+ };
+
+ mon = {
+ enable = mkEnableOption "Ceph MON daemon";
+ daemons = mkOption {
+ type = with types; listOf str;
+ default = [];
+ example = ''
+ [ "name1" "name2" ];
+ '';
+ description = ''
+ A list of monitor daemons that should have a service created. The names correspond
+ to the id part in ceph i.e. [ "name1" ] would result in mon.name1
+ '';
+ };
+ extraConfig = mkOption {
+ type = with types; attrsOf str;
+ default = {};
+ description = ''
+ Extra configuration to add to the monitor section.
+ '';
+ };
+ };
+
+ osd = {
+ enable = mkEnableOption "Ceph OSD daemon";
+ daemons = mkOption {
+ type = with types; listOf str;
+ default = [];
+ example = ''
+ [ "name1" "name2" ];
+ '';
+ description = ''
+ A list of OSD daemons that should have a service created. The names correspond
+ to the id part in ceph i.e. [ "name1" ] would result in osd.name1
+ '';
+ };
+ extraConfig = mkOption {
+ type = with types; attrsOf str;
+ default = {
+ "osd journal size" = "10000";
+ "osd pool default size" = "3";
+ "osd pool default min size" = "2";
+ "osd pool default pg num" = "200";
+ "osd pool default pgp num" = "200";
+ "osd crush chooseleaf type" = "1";
+ };
+ description = ''
+ Extra configuration to add to the OSD section.
+ '';
+ };
+ };
+
+ mds = {
+ enable = mkEnableOption "Ceph MDS daemon";
+ daemons = mkOption {
+ type = with types; listOf str;
+ default = [];
+ example = ''
+ [ "name1" "name2" ];
+ '';
+ description = ''
+ A list of metadata service daemons that should have a service created. The names correspond
+ to the id part in ceph i.e. [ "name1" ] would result in mds.name1
+ '';
+ };
+ extraConfig = mkOption {
+ type = with types; attrsOf str;
+ default = {};
+ description = ''
+ Extra configuration to add to the MDS section.
+ '';
+ };
+ };
+
+ rgw = {
+ enable = mkEnableOption "Ceph RadosGW daemon";
+ daemons = mkOption {
+ type = with types; listOf str;
+ default = [];
+ example = ''
+ [ "name1" "name2" ];
+ '';
+ description = ''
+ A list of rados gateway daemons that should have a service created. The names correspond
+ to the id part in ceph i.e. [ "name1" ] would result in client.name1, radosgw daemons
+ aren't daemons to cluster in the sense that OSD, MGR or MON daemons are. They are simply
+ daemons, from ceph, that uses the cluster as a backend.
+ '';
+ };
+ };
+
+ client = {
+ enable = mkEnableOption "Ceph client configuration";
+ extraConfig = mkOption {
+ type = with types; attrsOf str;
+ default = {};
+ example = ''
+ {
+ # This would create a section for a radosgw daemon named node0 and related
+ # configuration for it
+ "client.radosgw.node0" = { "some config option" = "true"; };
+ };
+ '';
+ description = ''
+ Extra configuration to add to the client section. Configuration for rados gateways
+ would be added here, with their own sections, see example.
+ '';
+ };
+ };
+ };
+
+ config = mkIf config.services.ceph.enable {
+ assertions = [
+ { assertion = cfg.global.fsid != "";
+ message = "fsid has to be set to a valid uuid for the cluster to function";
+ }
+ { assertion = cfg.mgr.enable == true;
+ message = "ceph 12.x requires atleast 1 MGR daemon enabled for the cluster to function";
+ }
+ { assertion = cfg.mon.enable == true -> cfg.mon.daemons != [];
+ message = "have to set id of atleast one MON if you're going to enable Monitor";
+ }
+ { assertion = cfg.mds.enable == true -> cfg.mds.daemons != [];
+ message = "have to set id of atleast one MDS if you're going to enable Metadata Service";
+ }
+ { assertion = cfg.osd.enable == true -> cfg.osd.daemons != [];
+ message = "have to set id of atleast one OSD if you're going to enable OSD";
+ }
+ { assertion = cfg.mgr.enable == true -> cfg.mgr.daemons != [];
+ message = "have to set id of atleast one MGR if you're going to enable MGR";
+ }
+ ];
+
+ warnings = optional (cfg.global.monInitialMembers == null)
+ ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function'';
+
+ environment.etc."ceph/ceph.conf".text = let
+ # Translate camelCaseOptions to the expected camel case option for ceph.conf
+ translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global;
+ # Merge the extraConfig set for mgr daemons, as mgr don't have their own section
+ globalAndMgrConfig = translatedGlobalConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig;
+ # Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf
+ globalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) (filterAttrs (name: value: value != null) globalAndMgrConfig);
+ totalConfig = {
+ "global" = globalConfig;
+ } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { "mon" = cfg.mon.extraConfig; }
+ // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { "mds" = cfg.mds.extraConfig; }
+ // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { "osd" = cfg.osd.extraConfig; }
+ // optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig;
+ in
+ generators.toINI {} totalConfig;
+
+ users.extraUsers = singleton {
+ name = "ceph";
+ uid = config.ids.uids.ceph;
+ description = "Ceph daemon user";
+ };
+
+ users.extraGroups = singleton {
+ name = "ceph";
+ gid = config.ids.gids.ceph;
+ };
+
+ systemd.services = let
+ services = []
+ ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; })
+ ++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; })
+ ++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; })
+ ++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { })
+ ++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; });
+ in
+ mkMerge services;
+
+ systemd.targets = let
+ targets = [
+ { "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; }; }
+ ] ++ optional cfg.mon.enable (generateTargetFile "mon")
+ ++ optional cfg.mds.enable (generateTargetFile "mds")
+ ++ optional cfg.osd.enable (generateTargetFile "osd")
+ ++ optional cfg.rgw.enable (generateTargetFile "rgw")
+ ++ optional cfg.mgr.enable (generateTargetFile "mgr");
+ in
+ mkMerge targets;
+
+ systemd.tmpfiles.rules = [
+ "d /run/ceph 0770 ceph ceph -"
+ ];
+ };
+}
diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix
new file mode 100644
index 000000000000..6b2a770100c5
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/davfs2.nix
@@ -0,0 +1,74 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.davfs2;
+ cfgFile = pkgs.writeText "davfs2.conf" ''
+ dav_user ${cfg.davUser}
+ dav_group ${cfg.davGroup}
+ ${cfg.extraConfig}
+ '';
+in
+{
+ options.services.davfs2 = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable davfs2.
+ '';
+ };
+
+ davUser = mkOption {
+ type = types.string;
+ default = "davfs2";
+ description = ''
+ When invoked by root the mount.davfs daemon will run as this user.
+ Value must be given as name, not as numerical id.
+ '';
+ };
+
+ davGroup = mkOption {
+ type = types.string;
+ default = "davfs2";
+ description = ''
+ The group of the running mount.davfs daemon. Ordinary users must be
+ member of this group in order to mount a davfs2 file system. Value must
+ be given as name, not as numerical id.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ kernel_fs coda
+ proxy foo.bar:8080
+ use_locks 0
+ '';
+ description = ''
+ Extra lines appended to the configuration of davfs2.
+ '' ;
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.davfs2 ];
+ environment.etc."davfs2/davfs2.conf".source = cfgFile;
+
+ users.extraGroups = optionalAttrs (cfg.davGroup == "davfs2") (singleton {
+ name = "davfs2";
+ gid = config.ids.gids.davfs2;
+ });
+
+ users.extraUsers = optionalAttrs (cfg.davUser == "davfs2") (singleton {
+ name = "davfs2";
+ createHome = false;
+ group = cfg.davGroup;
+ uid = config.ids.uids.davfs2;
+ description = "davfs2 user";
+ });
+ };
+
+}
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index d4a695ef5880..39a4fd6beff8 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -39,8 +39,6 @@ let
# NB: migration must be performed prior to pre-start, else we get the failure message!
preStart = ''
ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214)
- ipfs --local config Addresses.API ${cfg.apiAddress}
- ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
'' + optionalString cfg.autoMount ''
ipfs --local config Mounts.FuseAllowOther --json true
ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}
@@ -56,7 +54,11 @@ let
EOF
ipfs --local config --json "${concatStringsSep "." path}" "$value"
'')
- cfg.extraConfig)
+ ({ Addresses.API = cfg.apiAddress;
+ Addresses.Gateway = cfg.gatewayAddress;
+ Addresses.Swarm = cfg.swarmAddress;
+ } //
+ cfg.extraConfig))
);
serviceConfig = {
ExecStart = "${wrapped}/bin/ipfs daemon ${ipfsFlags}";
@@ -140,6 +142,12 @@ in {
description = "Where IPFS exposes its API to";
};
+ swarmAddress = mkOption {
+ type = types.listOf types.str;
+ default = [ "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" ];
+ description = "Where IPFS listens for incoming p2p connections";
+ };
+
enableGC = mkOption {
type = types.bool;
default = false;
diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
deleted file mode 100644
index 0946e379e796..000000000000
--- a/nixos/modules/services/network-filesystems/openafs-client/default.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
- inherit (lib) mkOption mkIf;
-
- cfg = config.services.openafsClient;
-
- cellServDB = pkgs.fetchurl {
- url = http://dl.central.org/dl/cellservdb/CellServDB.2017-03-14;
- sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc";
- };
-
- afsConfig = pkgs.runCommand "afsconfig" {} ''
- mkdir -p $out
- echo ${cfg.cellName} > $out/ThisCell
- cp ${cellServDB} $out/CellServDB
- echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo
- '';
-
- openafsPkgs = config.boot.kernelPackages.openafsClient;
-in
-{
- ###### interface
-
- options = {
-
- services.openafsClient = {
-
- enable = mkOption {
- default = false;
- description = "Whether to enable the OpenAFS client.";
- };
-
- cellName = mkOption {
- default = "grand.central.org";
- description = "Cell name.";
- };
-
- cacheSize = mkOption {
- default = "100000";
- description = "Cache size.";
- };
-
- cacheDirectory = mkOption {
- default = "/var/cache/openafs";
- description = "Cache directory.";
- };
-
- crypt = mkOption {
- default = false;
- description = "Whether to enable (weak) protocol encryption.";
- };
-
- sparse = mkOption {
- default = false;
- description = "Minimal cell list in /afs.";
- };
-
- };
- };
-
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- environment.systemPackages = [ openafsPkgs ];
-
- environment.etc = [
- { source = afsConfig;
- target = "openafs";
- }
- ];
-
- systemd.services.afsd = {
- description = "AFS client";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
- serviceConfig = { RemainAfterExit = true; };
-
- preStart = ''
- mkdir -p -m 0755 /afs
- mkdir -m 0700 -p ${cfg.cacheDirectory}
- ${pkgs.kmod}/bin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true
- ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb
- ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"}
- '';
-
- # Doing this in preStop, because after these commands AFS is basically
- # stopped, so systemd has nothing to do, just noticing it. If done in
- # postStop, then we get a hang + kernel oops, because AFS can't be
- # stopped simply by sending signals to processes.
- preStop = ''
- ${pkgs.utillinux}/bin/umount /afs
- ${openafsPkgs}/sbin/afsd -shutdown
- '';
- };
- };
-}
diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix
new file mode 100644
index 000000000000..3826fe3edfd0
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/openafs/client.nix
@@ -0,0 +1,239 @@
+{ config, pkgs, lib, ... }:
+
+with import ./lib.nix { inherit lib; };
+
+let
+ inherit (lib) getBin mkOption mkIf optionalString singleton types;
+
+ cfg = config.services.openafsClient;
+
+ cellServDB = pkgs.fetchurl {
+ url = http://dl.central.org/dl/cellservdb/CellServDB.2017-03-14;
+ sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc";
+ };
+
+ clientServDB = pkgs.writeText "client-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.cellServDB);
+
+ afsConfig = pkgs.runCommand "afsconfig" {} ''
+ mkdir -p $out
+ echo ${cfg.cellName} > $out/ThisCell
+ cat ${cellServDB} ${clientServDB} > $out/CellServDB
+ echo "${cfg.mountPoint}:${cfg.cache.directory}:${toString cfg.cache.blocks}" > $out/cacheinfo
+ '';
+
+ openafsMod = config.boot.kernelPackages.openafs;
+ openafsBin = lib.getBin pkgs.openafs;
+in
+{
+ ###### interface
+
+ options = {
+
+ services.openafsClient = {
+
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Whether to enable the OpenAFS client.";
+ };
+
+ afsdb = mkOption {
+ default = true;
+ type = types.bool;
+ description = "Resolve cells via AFSDB DNS records.";
+ };
+
+ cellName = mkOption {
+ default = "";
+ type = types.str;
+ description = "Cell name.";
+ example = "grand.central.org";
+ };
+
+ cellServDB = mkOption {
+ default = [];
+ type = with types; listOf (submodule { options = cellServDBConfig; });
+ description = ''
+ This cell's database server records, added to the global
+ CellServDB. See CellServDB(5) man page for syntax. Ignored when
+ afsdb is set to true.
+ '';
+ example = ''
+ [ { ip = "1.2.3.4"; dnsname = "first.afsdb.server.dns.fqdn.org"; }
+ { ip = "2.3.4.5"; dnsname = "second.afsdb.server.dns.fqdn.org"; }
+ ]
+ '';
+ };
+
+ cache = {
+ blocks = mkOption {
+ default = 100000;
+ type = types.int;
+ description = "Cache size in 1KB blocks.";
+ };
+
+ chunksize = mkOption {
+ default = 0;
+ type = types.ints.between 0 30;
+ description = ''
+ Size of each cache chunk given in powers of
+ 2. 0 resets the chunk size to its default
+ values (13 (8 KB) for memcache, 18-20 (256 KB to 1 MB) for
+ diskcache). Maximum value is 30. Important performance
+ parameter. Set to higher values when dealing with large files.
+ '';
+ };
+
+ directory = mkOption {
+ default = "/var/cache/openafs";
+ type = types.str;
+ description = "Cache directory.";
+ };
+
+ diskless = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Use in-memory cache for diskless machines. Has no real
+ performance benefit anymore.
+ '';
+ };
+ };
+
+ crypt = mkOption {
+ default = true;
+ type = types.bool;
+ description = "Whether to enable (weak) protocol encryption.";
+ };
+
+ daemons = mkOption {
+ default = 2;
+ type = types.int;
+ description = ''
+ Number of daemons to serve user requests. Numbers higher than 6
+ usually do no increase performance. Default is sufficient for up
+ to five concurrent users.
+ '';
+ };
+
+ fakestat = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Return fake data on stat() calls. If true,
+ always do so. If false, only do so for
+ cross-cell mounts (as these are potentially expensive).
+ '';
+ };
+
+ inumcalc = mkOption {
+ default = "compat";
+ type = types.strMatching "compat|md5";
+ description = ''
+ Inode calculation method. compat is
+ computationally less expensive, but md5 greatly
+ reduces the likelihood of inode collisions in larger scenarios
+ involving multiple cells mounted into one AFS space.
+ '';
+ };
+
+ mountPoint = mkOption {
+ default = "/afs";
+ type = types.str;
+ description = ''
+ Mountpoint of the AFS file tree, conventionally
+ /afs. When set to a different value, only
+ cross-cells that use the same value can be accessed.
+ '';
+ };
+
+ sparse = mkOption {
+ default = true;
+ type = types.bool;
+ description = "Minimal cell list in /afs.";
+ };
+
+ startDisconnected = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Start up in disconnected mode. You need to execute
+ fs disco online (as root) to switch to
+ connected mode. Useful for roaming devices.
+ '';
+ };
+
+ };
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ assertions = [
+ { assertion = cfg.afsdb || cfg.cellServDB != [];
+ message = "You should specify all cell-local database servers in config.services.openafsClient.cellServDB or set config.services.openafsClient.afsdb.";
+ }
+ { assertion = cfg.cellName != "";
+ message = "You must specify the local cell name in config.services.openafsClient.cellName.";
+ }
+ ];
+
+ environment.systemPackages = [ pkgs.openafs ];
+
+ environment.etc = {
+ clientCellServDB = {
+ source = pkgs.runCommand "CellServDB" {} ''
+ cat ${cellServDB} ${clientServDB} > $out
+ '';
+ target = "openafs/CellServDB";
+ mode = "0644";
+ };
+ clientCell = {
+ text = ''
+ ${cfg.cellName}
+ '';
+ target = "openafs/ThisCell";
+ mode = "0644";
+ };
+ };
+
+ systemd.services.afsd = {
+ description = "AFS client";
+ wantedBy = [ "multi-user.target" ];
+ after = singleton (if cfg.startDisconnected then "network.target" else "network-online.target");
+ serviceConfig = { RemainAfterExit = true; };
+ restartIfChanged = false;
+
+ preStart = ''
+ mkdir -p -m 0755 ${cfg.mountPoint}
+ mkdir -m 0700 -p ${cfg.cache.directory}
+ ${pkgs.kmod}/bin/insmod ${openafsMod}/lib/modules/*/extra/openafs/libafs.ko.xz
+ ${openafsBin}/sbin/afsd \
+ -mountdir ${cfg.mountPoint} \
+ -confdir ${afsConfig} \
+ ${optionalString (!cfg.cache.diskless) "-cachedir ${cfg.cache.directory}"} \
+ -blocks ${toString cfg.cache.blocks} \
+ -chunksize ${toString cfg.cache.chunksize} \
+ ${optionalString cfg.cache.diskless "-memcache"} \
+ -inumcalc ${cfg.inumcalc} \
+ ${if cfg.fakestat then "-fakestat-all" else "-fakestat"} \
+ ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} \
+ ${optionalString cfg.afsdb "-afsdb"}
+ ${openafsBin}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"}
+ ${optionalString cfg.startDisconnected "${openafsBin}/bin/fs discon offline"}
+ '';
+
+ # Doing this in preStop, because after these commands AFS is basically
+ # stopped, so systemd has nothing to do, just noticing it. If done in
+ # postStop, then we get a hang + kernel oops, because AFS can't be
+ # stopped simply by sending signals to processes.
+ preStop = ''
+ ${pkgs.utillinux}/bin/umount ${cfg.mountPoint}
+ ${openafsBin}/sbin/afsd -shutdown
+ ${pkgs.kmod}/sbin/rmmod libafs
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix
new file mode 100644
index 000000000000..ecfc72d2eaf9
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/openafs/lib.nix
@@ -0,0 +1,28 @@
+{ lib, ...}:
+
+let
+ inherit (lib) concatStringsSep mkOption types;
+
+in rec {
+
+ mkCellServDB = cellName: db: ''
+ >${cellName}
+ '' + (concatStringsSep "\n" (map (dbm: if (dbm.ip != "" && dbm.dnsname != "") then dbm.ip + " #" + dbm.dnsname else "")
+ db));
+
+ # CellServDB configuration type
+ cellServDBConfig = {
+ ip = mkOption {
+ type = types.str;
+ default = "";
+ example = "1.2.3.4";
+ description = "IP Address of a database server";
+ };
+ dnsname = mkOption {
+ type = types.str;
+ default = "";
+ example = "afs.example.org";
+ description = "DNS full-qualified domain name of a database server";
+ };
+ };
+}
diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix
new file mode 100644
index 000000000000..429eb945ac9e
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/openafs/server.nix
@@ -0,0 +1,260 @@
+{ config, pkgs, lib, ... }:
+
+with import ./lib.nix { inherit lib; };
+
+let
+ inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types;
+
+ bosConfig = pkgs.writeText "BosConfig" (''
+ restrictmode 1
+ restarttime 16 0 0 0 0
+ checkbintime 3 0 5 0 0
+ '' + (optionalString cfg.roles.database.enable ''
+ bnode simple vlserver 1
+ parm ${openafsBin}/libexec/openafs/vlserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.vlserverArgs}
+ end
+ bnode simple ptserver 1
+ parm ${openafsBin}/libexec/openafs/ptserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.ptserverArgs}
+ end
+ '') + (optionalString cfg.roles.fileserver.enable ''
+ bnode dafs dafs 1
+ parm ${openafsBin}/libexec/openafs/dafileserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.fileserverArgs}
+ parm ${openafsBin}/libexec/openafs/davolserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.volserverArgs}
+ parm ${openafsBin}/libexec/openafs/salvageserver ${cfg.roles.fileserver.salvageserverArgs}
+ parm ${openafsBin}/libexec/openafs/dasalvager ${cfg.roles.fileserver.salvagerArgs}
+ end
+ '') + (optionalString (cfg.roles.database.enable && cfg.roles.backup.enable) ''
+ bnode simple buserver 1
+ parm ${openafsBin}/libexec/openafs/buserver ${cfg.roles.backup.buserverArgs} ${optionalString (cfg.roles.backup.cellServDB != []) "-cellservdb /etc/openafs/backup/"}
+ end
+ ''));
+
+ netInfo = if (cfg.advertisedAddresses != []) then
+ pkgs.writeText "NetInfo" ((concatStringsSep "\nf " cfg.advertisedAddresses) + "\n")
+ else null;
+
+ buCellServDB = pkgs.writeText "backup-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.roles.backup.cellServDB);
+
+ cfg = config.services.openafsServer;
+
+ udpSizeStr = toString cfg.udpPacketSize;
+
+ openafsBin = lib.getBin pkgs.openafs;
+
+in {
+
+ options = {
+
+ services.openafsServer = {
+
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Whether to enable the OpenAFS server. An OpenAFS server needs a
+ complex setup. So, be aware that enabling this service and setting
+ some options does not give you a turn-key-ready solution. You need
+ at least a running Kerberos 5 setup, as OpenAFS relies on it for
+ authentication. See the Guide "QuickStartUnix" coming with
+ pkgs.openafs.doc for complete setup
+ instructions.
+ '';
+ };
+
+ advertisedAddresses = mkOption {
+ default = [];
+ description = "List of IP addresses this server is advertised under. See NetInfo(5)";
+ };
+
+ cellName = mkOption {
+ default = "";
+ type = types.str;
+ description = "Cell name, this server will serve.";
+ example = "grand.central.org";
+ };
+
+ cellServDB = mkOption {
+ default = [];
+ type = with types; listOf (submodule [ { options = cellServDBConfig;} ]);
+ description = "Definition of all cell-local database server machines.";
+ };
+
+ roles = {
+ fileserver = {
+ enable = mkOption {
+ default = true;
+ type = types.bool;
+ description = "Fileserver role, serves files and volumes from its local storage.";
+ };
+
+ fileserverArgs = mkOption {
+ default = "-vattachpar 128 -vhashsize 11 -L -rxpck 400 -cb 1000000";
+ type = types.str;
+ description = "Arguments to the dafileserver process. See its man page.";
+ };
+
+ volserverArgs = mkOption {
+ default = "";
+ type = types.str;
+ description = "Arguments to the davolserver process. See its man page.";
+ example = "-sync never";
+ };
+
+ salvageserverArgs = mkOption {
+ default = "";
+ type = types.str;
+ description = "Arguments to the salvageserver process. See its man page.";
+ example = "-showlog";
+ };
+
+ salvagerArgs = mkOption {
+ default = "";
+ type = types.str;
+ description = "Arguments to the dasalvager process. See its man page.";
+ example = "-showlog -showmounts";
+ };
+ };
+
+ database = {
+ enable = mkOption {
+ default = true;
+ type = types.bool;
+ description = ''
+ Database server role, maintains the Volume Location Database,
+ Protection Database (and Backup Database, see
+ backup role). There can be multiple
+ servers in the database role for replication, which then need
+ reliable network connection to each other.
+
+ Servers in this role appear in AFSDB DNS records or the
+ CellServDB.
+ '';
+ };
+
+ vlserverArgs = mkOption {
+ default = "";
+ type = types.str;
+ description = "Arguments to the vlserver process. See its man page.";
+ example = "-rxbind";
+ };
+
+ ptserverArgs = mkOption {
+ default = "";
+ type = types.str;
+ description = "Arguments to the ptserver process. See its man page.";
+ example = "-restricted -default_access S---- S-M---";
+ };
+ };
+
+ backup = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Backup server role. Use in conjunction with the
+ database role to maintain the Backup
+ Database. Normally only used in conjunction with tape storage
+ or IBM's Tivoli Storage Manager.
+ '';
+ };
+
+ buserverArgs = mkOption {
+ default = "";
+ type = types.str;
+ description = "Arguments to the buserver process. See its man page.";
+ example = "-p 8";
+ };
+
+ cellServDB = mkOption {
+ default = [];
+ type = with types; listOf (submodule [ { options = cellServDBConfig;} ]);
+ description = ''
+ Definition of all cell-local backup database server machines.
+ Use this when your cell uses less backup database servers than
+ other database server machines.
+ '';
+ };
+ };
+ };
+
+ dottedPrincipals= mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ If enabled, allow principal names containing (.) dots. Enabling
+ this has security implications!
+ '';
+ };
+
+ udpPacketSize = mkOption {
+ default = 1310720;
+ type = types.int;
+ description = ''
+ UDP packet size to use in Bytes. Higher values can speed up
+ communications. The default of 1 MB is a sufficient in most
+ cases. Make sure to increase the kernel's UDP buffer size
+ accordingly via net.core(w|r|opt)mem_max
+ sysctl.
+ '';
+ };
+
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ assertions = [
+ { assertion = cfg.cellServDB != [];
+ message = "You must specify all cell-local database servers in config.services.openafsServer.cellServDB.";
+ }
+ { assertion = cfg.cellName != "";
+ message = "You must specify the local cell name in config.services.openafsServer.cellName.";
+ }
+ ];
+
+ environment.systemPackages = [ pkgs.openafs ];
+
+ environment.etc = {
+ bosConfig = {
+ source = bosConfig;
+ target = "openafs/BosConfig";
+ mode = "0644";
+ };
+ cellServDB = {
+ text = mkCellServDB cfg.cellName cfg.cellServDB;
+ target = "openafs/server/CellServDB";
+ mode = "0644";
+ };
+ thisCell = {
+ text = cfg.cellName;
+ target = "openafs/server/ThisCell";
+ mode = "0644";
+ };
+ buCellServDB = {
+ enable = (cfg.roles.backup.cellServDB != []);
+ text = mkCellServDB cfg.cellName cfg.roles.backup.cellServDB;
+ target = "openafs/backup/CellServDB";
+ };
+ };
+
+ systemd.services = {
+ openafs-server = {
+ description = "OpenAFS server";
+ after = [ "syslog.target" "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ restartIfChanged = false;
+ unitConfig.ConditionPathExists = [ "/etc/openafs/server/rxkad.keytab" ];
+ preStart = ''
+ mkdir -m 0755 -p /var/openafs
+ ${optionalString (netInfo != null) "cp ${netInfo} /var/openafs/netInfo"}
+ ${optionalString (cfg.roles.backup.cellServDB != []) "cp ${buCellServDB}"}
+ '';
+ serviceConfig = {
+ ExecStart = "${openafsBin}/bin/bosserver -nofork";
+ ExecStop = "${openafsBin}/bin/bos shutdown localhost -wait -localauth";
+ };
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 9b9c91a4f167..b23266e8d43a 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -54,9 +54,12 @@ let
};
serviceConfig = {
- ExecStart = "${samba}/sbin/${appName} ${args}";
+ ExecStart = "${samba}/sbin/${appName} --foreground --no-process-group ${args}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ LimitNOFILE = 16384;
+ PIDFile = "/run/${appName}.pid";
Type = "notify";
+ NotifyAccess = "all"; #may not do anything...
};
restartTriggers = [ configFile ];
@@ -230,11 +233,12 @@ in
after = [ "samba-setup.service" "network.target" ];
wantedBy = [ "multi-user.target" ];
};
-
+ # Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd
+ # for correct use with systemd
services = {
- "samba-smbd" = daemonService "smbd" "-F";
- "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "-F");
- "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "-F");
+ "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;
diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix
index 0c6714563d8a..95d7641e8b53 100644
--- a/nixos/modules/services/network-filesystems/xtreemfs.nix
+++ b/nixos/modules/services/network-filesystems/xtreemfs.nix
@@ -11,7 +11,7 @@ let
home = cfg.homeDir;
startupScript = class: configPath: pkgs.writeScript "xtreemfs-osd.sh" ''
- #! ${pkgs.stdenv.shell}
+ #! ${pkgs.runtimeShell}
JAVA_HOME="${pkgs.jdk}"
JAVADIR="${xtreemfs}/share/java"
JAVA_CALL="$JAVA_HOME/bin/java -ea -cp $JAVADIR/XtreemFS.jar:$JAVADIR/BabuDB.jar:$JAVADIR/Flease.jar:$JAVADIR/protobuf-java-2.5.0.jar:$JAVADIR/Foundation.jar:$JAVADIR/jdmkrt.jar:$JAVADIR/jdmktk.jar:$JAVADIR/commons-codec-1.3.jar"
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix
index 4de206641331..44b0edf62018 100644
--- a/nixos/modules/services/network-filesystems/yandex-disk.nix
+++ b/nixos/modules/services/network-filesystems/yandex-disk.nix
@@ -99,10 +99,10 @@ in
exit 1
fi
- ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \
+ ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${u} \
-c '${pkgs.yandex-disk}/bin/yandex-disk token -p ${cfg.password} ${cfg.username} ${dir}/token'
- ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \
+ ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${u} \
-c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory} --exclude-dirs=${cfg.excludes}'
'';
diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix
index fc7d56a24fa7..9898f164c5cf 100644
--- a/nixos/modules/services/networking/amuled.nix
+++ b/nixos/modules/services/networking/amuled.nix
@@ -68,7 +68,7 @@ in
'';
script = ''
- ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \
+ ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \
-c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled'
'';
};
diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
index ad4ac9bf45e3..df9c92db2e54 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixos/modules/services/networking/aria2.nix
@@ -10,9 +10,9 @@ let
settingsDir = "${homeDir}";
sessionFile = "${homeDir}/aria2.session";
downloadDir = "${homeDir}/Downloads";
-
+
rangesToStringList = map (x: builtins.toString x.from +"-"+ builtins.toString x.to);
-
+
settingsFile = pkgs.writeText "aria2.conf"
''
dir=${cfg.downloadDir}
@@ -110,12 +110,12 @@ in
mkdir -m 0770 -p "${homeDir}"
chown aria2:aria2 "${homeDir}"
if [[ ! -d "${config.services.aria2.downloadDir}" ]]
- then
+ then
mkdir -m 0770 -p "${config.services.aria2.downloadDir}"
chown aria2:aria2 "${config.services.aria2.downloadDir}"
fi
if [[ ! -e "${sessionFile}" ]]
- then
+ then
touch "${sessionFile}"
chown aria2:aria2 "${sessionFile}"
fi
@@ -132,4 +132,4 @@ in
};
};
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix
index 1a7a1e24b702..c25bd0fdc541 100644
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@@ -7,21 +7,27 @@ let
let
cfg = config.services.${variant};
pkg = pkgs.${variant};
+ birdBin = if variant == "bird6" then "bird6" else "bird";
birdc = if variant == "bird6" then "birdc6" else "birdc";
+ descr =
+ { bird = "1.9.x with IPv4 suport";
+ bird6 = "1.9.x with IPv6 suport";
+ bird2 = "2.x";
+ }.${variant};
configFile = pkgs.stdenv.mkDerivation {
name = "${variant}.conf";
text = cfg.config;
preferLocalBuild = true;
buildCommand = ''
echo -n "$text" > $out
- ${pkg}/bin/${variant} -d -p -c $out
+ ${pkg}/bin/${birdBin} -d -p -c $out
'';
};
in {
###### interface
options = {
services.${variant} = {
- enable = mkEnableOption "BIRD Internet Routing Daemon";
+ enable = mkEnableOption "BIRD Internet Routing Daemon (${descr})";
config = mkOption {
type = types.lines;
description = ''
@@ -36,12 +42,12 @@ let
config = mkIf cfg.enable {
environment.systemPackages = [ pkg ];
systemd.services.${variant} = {
- description = "BIRD Internet Routing Daemon";
+ description = "BIRD Internet Routing Daemon (${descr})";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "forking";
Restart = "on-failure";
- ExecStart = "${pkg}/bin/${variant} -c ${configFile} -u ${variant} -g ${variant}";
+ ExecStart = "${pkg}/bin/${birdBin} -c ${configFile} -u ${variant} -g ${variant}";
ExecReload = "${pkg}/bin/${birdc} configure";
ExecStop = "${pkg}/bin/${birdc} down";
CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID"
@@ -56,14 +62,15 @@ let
users = {
extraUsers.${variant} = {
description = "BIRD Internet Routing Daemon user";
- group = "${variant}";
+ group = variant;
};
extraGroups.${variant} = {};
};
};
};
- inherit (config.services) bird bird6;
-in {
- imports = [(generic "bird") (generic "bird6")];
+in
+
+{
+ imports = map generic [ "bird" "bird6" "bird2" ];
}
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index 546d27069232..c3ca6fbe725e 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -52,6 +52,15 @@ in {
'';
};
+ extraFlags = mkOption {
+ type = with types; listOf string;
+ default = [ ];
+ example = [ "--nodnsproxy" ];
+ description = ''
+ Extra flags to pass to connmand
+ '';
+ };
+
};
};
@@ -81,7 +90,7 @@ in {
Type = "dbus";
BusName = "net.connman";
Restart = "on-failure";
- ExecStart = "${pkgs.connman}/sbin/connmand --config=${configFile} --nodaemon";
+ ExecStart = "${pkgs.connman}/sbin/connmand --config=${configFile} --nodaemon ${toString cfg.extraFlags}";
StandardOutput = "null";
};
};
diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix
index a9a77f3412af..32acce51e692 100644
--- a/nixos/modules/services/networking/dante.nix
+++ b/nixos/modules/services/networking/dante.nix
@@ -47,7 +47,7 @@ in
systemd.services.dante = {
description = "Dante SOCKS v4 and v5 compatible proxy server";
- after = [ "network.target" ];
+ after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index d283c7624335..de0aa1a2c2c3 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -16,7 +16,7 @@ let
# Don't start dhcpcd on explicitly configured interfaces or on
# interfaces that are part of a bridge, bond or sit device.
ignoredInterfaces =
- map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ip4 != [ ] || i.ipAddress != null) interfaces)
+ map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces)
++ mapAttrsToList (i: _: i) config.networking.sits
++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.vswitches))
@@ -156,11 +156,11 @@ in
systemd.services.dhcpcd = let
cfgN = config.networking;
hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "")
- || (cfgN.defaultGateway6 != null && cfgN.defaultGateway6.address != "");
+ && (!cfgN.enableIPv6 || (cfgN.defaultGateway6 != null && cfgN.defaultGateway6.address != ""));
in
{ description = "DHCP Client";
- wantedBy = optional (!hasDefaultGatewaySet) "network-online.target";
+ wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target";
after = [ "network.target" ];
wants = [ "network.target" ];
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index ed658258c7f9..857657eea4db 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -10,7 +10,7 @@ let
# This is somewhat more flexible than preloading the key as an
# embedded string.
upstreamResolverListPubKey = pkgs.fetchurl {
- url = https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/minisign.pub;
+ url = https://raw.githubusercontent.com/dyne/dnscrypt-proxy/master/minisign.pub;
sha256 = "18lnp8qr6ghfc2sd46nn1rhcpr324fqlvgsp4zaigw396cd7vnnh";
};
@@ -258,9 +258,9 @@ in
domain=raw.githubusercontent.com
get="curl -fSs --resolve $domain:443:$(hostip -r 8.8.8.8 $domain | head -1)"
$get -o dnscrypt-resolvers.csv.tmp \
- https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv
+ https://$domain/dyne/dnscrypt-proxy/master/dnscrypt-resolvers.csv
$get -o dnscrypt-resolvers.csv.minisig.tmp \
- https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig
+ https://$domain/dyne/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig
mv dnscrypt-resolvers.csv.minisig{.tmp,}
if ! minisign -q -V -p ${upstreamResolverListPubKey} \
-m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig ; then
diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix
index 23cc92946e41..bf13d5c6f5fe 100644
--- a/nixos/modules/services/networking/dnscrypt-wrapper.nix
+++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix
@@ -145,6 +145,16 @@ in {
};
users.groups.dnscrypt-wrapper = { };
+ security.polkit.extraConfig = ''
+ // Allow dnscrypt-wrapper user to restart dnscrypt-wrapper.service
+ polkit.addRule(function(action, subject) {
+ if (action.id == "org.freedesktop.systemd1.manage-units" &&
+ action.lookup("unit") == "dnscrypt-wrapper.service" &&
+ subject.user == "dnscrypt-wrapper") {
+ return polkit.Result.YES;
+ }
+ });
+ '';
systemd.services.dnscrypt-wrapper = {
description = "dnscrypt-wrapper daemon";
diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix
index a9f3fd65d76b..97d223a56cab 100644
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ b/nixos/modules/services/networking/firefox/sync-server.nix
@@ -33,6 +33,8 @@ let
in
{
+ meta.maintainers = with lib.maintainers; [ nadrieril ];
+
options = {
services.firefox.syncserver = {
enable = mkOption {
@@ -70,18 +72,6 @@ in
'';
};
- user = mkOption {
- type = types.str;
- default = "syncserver";
- description = "User account under which syncserver runs.";
- };
-
- group = mkOption {
- type = types.str;
- default = "syncserver";
- description = "Group account under which syncserver runs.";
- };
-
publicUrl = mkOption {
type = types.str;
default = "http://localhost:5000/";
@@ -137,7 +127,9 @@ in
config = mkIf cfg.enable {
systemd.services.syncserver = let
- syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]);
+ syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript requests ]);
+ user = "syncserver";
+ group = "syncserver";
in {
after = [ "network.target" ];
description = "Firefox Sync Server";
@@ -145,43 +137,43 @@ in
path = [ pkgs.coreutils syncServerEnv ];
serviceConfig = {
- User = cfg.user;
- Group = cfg.group;
+ User = user;
+ Group = group;
PermissionsStartOnly = true;
};
preStart = ''
if ! test -e ${cfg.privateConfig}; then
- mkdir -m 700 -p $(dirname ${cfg.privateConfig})
+ mkdir -p $(dirname ${cfg.privateConfig})
echo > ${cfg.privateConfig} '[syncserver]'
+ chmod 600 ${cfg.privateConfig}
echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
fi
- chown ${cfg.user}:${cfg.group} ${cfg.privateConfig}
+ chmod 600 ${cfg.privateConfig}
+ chmod 755 $(dirname ${cfg.privateConfig})
+ chown ${user}:${group} ${cfg.privateConfig}
+
'' + optionalString (cfg.sqlUri == defaultSqlUri) ''
if ! test -e $(dirname ${defaultDbLocation}); then
mkdir -m 700 -p $(dirname ${defaultDbLocation})
- chown ${cfg.user}:${cfg.group} $(dirname ${defaultDbLocation})
+ chown ${user}:${group} $(dirname ${defaultDbLocation})
fi
+
# Move previous database file if it exists
oldDb="/var/db/firefox-sync-server.db"
if test -f $oldDb; then
mv $oldDb ${defaultDbLocation}
- chown ${cfg.user}:${cfg.group} ${defaultDbLocation}
+ chown ${user}:${group} ${defaultDbLocation}
fi
'';
serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}";
};
- users.extraUsers = optionalAttrs (cfg.user == "syncserver")
- (singleton {
- name = "syncserver";
- group = cfg.group;
- isSystemUser = true;
- });
+ users.users.syncserver = {
+ group = "syncserver";
+ isSystemUser = true;
+ };
- users.extraGroups = optionalAttrs (cfg.group == "syncserver")
- (singleton {
- name = "syncserver";
- });
+ users.groups.syncserver = {};
};
}
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 9bd88ca1707b..20c0b0acf165 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -54,7 +54,7 @@ let
'';
writeShScript = name: text: let dir = pkgs.writeScriptBin name ''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
${text}
''; in "${dir}/bin/${name}";
@@ -125,6 +125,9 @@ let
ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true
ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN
+ # Allows this host to act as a DHCP4 client without first having to use APIPA
+ iptables -t raw -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN
+
# Allows this host to act as a DHCPv4 server
iptables -t raw -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN
diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix
index 5ba85178179b..5b83ce131389 100644
--- a/nixos/modules/services/networking/flashpolicyd.nix
+++ b/nixos/modules/services/networking/flashpolicyd.nix
@@ -22,7 +22,7 @@ let
flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd"
''
- #! ${pkgs.stdenv.shell}
+ #! ${pkgs.runtimeShell}
exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \
--file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \
2> /dev/null
diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix
new file mode 100644
index 000000000000..45cba1ce2770
--- /dev/null
+++ b/nixos/modules/services/networking/freeradius.nix
@@ -0,0 +1,72 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.freeradius;
+
+ freeradiusService = cfg:
+ {
+ description = "FreeRadius server";
+ wantedBy = ["multi-user.target"];
+ after = ["network-online.target"];
+ wants = ["network-online.target"];
+ preStart = ''
+ ${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout
+ '';
+
+ serviceConfig = {
+ ExecStart = "${pkgs.freeradius}/bin/radiusd -f -d ${cfg.configDir} -l stdout -xx";
+ ExecReload = [
+ "${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout"
+ "${pkgs.coreutils}/bin/kill -HUP $MAINPID"
+ ];
+ User = "radius";
+ ProtectSystem = "full";
+ ProtectHome = "on";
+ Restart = "on-failure";
+ RestartSec = 2;
+ };
+ };
+
+ freeradiusConfig = {
+ enable = mkEnableOption "the freeradius server";
+
+ configDir = mkOption {
+ type = types.path;
+ default = "/etc/raddb";
+ description = ''
+ The path of the freeradius server configuration directory.
+ '';
+ };
+
+ };
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+ services.freeradius = freeradiusConfig;
+ };
+
+
+ ###### implementation
+
+ config = mkIf (cfg.enable) {
+
+ users = {
+ extraUsers.radius = {
+ /*uid = config.ids.uids.radius;*/
+ description = "Radius daemon user";
+ };
+ };
+
+ systemd.services.freeradius = freeradiusService cfg;
+
+ };
+
+}
diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix
index 03ee54af4334..02cd53c6fa38 100644
--- a/nixos/modules/services/networking/gnunet.nix
+++ b/nixos/modules/services/networking/gnunet.nix
@@ -137,6 +137,8 @@ in
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.gnunet pkgs.miniupnpc ];
+ environment.TMPDIR = "/tmp";
+ serviceConfig.PrivateTemp = true;
serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}";
serviceConfig.User = "gnunet";
serviceConfig.UMask = "0007";
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index ca2e2a065dcf..8f5aeee4a16b 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -126,6 +126,7 @@ let
[${tun.name}]
type = client
destination = ${tun.destination}
+ destinationport = ${toString tun.destinationPort}
keys = ${tun.keys}
address = ${tun.address}
port = ${toString tun.port}
@@ -137,15 +138,15 @@ let
'')
}
${flip concatMapStrings
- (collect (tun: tun ? port && tun ? host) cfg.inTunnels)
- (tun: let portStr = toString tun.port; in ''
+ (collect (tun: tun ? port && tun ? address) cfg.inTunnels)
+ (tun: ''
[${tun.name}]
type = server
destination = ${tun.destination}
keys = ${tun.keys}
host = ${tun.address}
- port = ${tun.port}
- inport = ${tun.inPort}
+ port = ${toString tun.port}
+ inport = ${toString tun.inPort}
accesslist = ${builtins.concatStringsSep "," tun.accessList}
'')
}
@@ -405,7 +406,13 @@ in
default = {};
type = with types; loaOf (submodule (
{ name, config, ... }: {
- options = commonTunOpts name;
+ options = {
+ destinationPort = mkOption {
+ type = types.int;
+ default = 0;
+ description = "Connect to particular port at destination.";
+ };
+ } // commonTunOpts name;
config = {
name = mkDefault name;
};
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 18e2ab9aebf1..aac02b811d71 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -43,7 +43,16 @@ in
type = with types; listOf str;
default = [ "::1" "127.0.0.1" ];
description = ''
- What addresses the server should listen on.
+ What addresses the server should listen on. (UDP+TCP 53)
+ '';
+ };
+ listenTLS = mkOption {
+ type = with types; listOf str;
+ default = [];
+ example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ];
+ description = ''
+ Addresses on which kresd should provide DNS over TLS (see RFC 7858).
+ For detailed syntax see ListenStream in man systemd.socket.
'';
};
# TODO: perhaps options for more common stuff like cache size or forwarding
@@ -72,6 +81,19 @@ in
(iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53")
cfg.interfaces;
socketConfig.ListenDatagram = listenStreams;
+ socketConfig.FreeBind = true;
+ };
+
+ systemd.sockets.kresd-tls = mkIf (cfg.listenTLS != []) rec {
+ wantedBy = [ "sockets.target" ];
+ before = wantedBy;
+ partOf = [ "kresd.socket" ];
+ listenStreams = cfg.listenTLS;
+ socketConfig = {
+ FileDescriptorName = "tls";
+ FreeBind = true;
+ Service = "kresd.service";
+ };
};
systemd.sockets.kresd-control = rec {
@@ -82,20 +104,11 @@ in
socketConfig = {
FileDescriptorName = "control";
Service = "kresd.service";
- SocketMode = "0660"; # only root user/group may connect
+ SocketMode = "0660"; # only root user/group may connect and control kresd
};
};
- # Create the cacheDir; tmpfiles don't work on nixos-rebuild switch.
- systemd.services.kresd-cachedir = {
- serviceConfig.Type = "oneshot";
- script = ''
- if [ ! -d '${cfg.cacheDir}' ]; then
- mkdir -p '${cfg.cacheDir}'
- chown kresd:kresd '${cfg.cacheDir}'
- fi
- '';
- };
+ systemd.tmpfiles.rules = [ "d '${cfg.cacheDir}' 0770 kresd kresd - -" ];
systemd.services.kresd = {
description = "Knot-resolver daemon";
@@ -104,16 +117,17 @@ in
User = "kresd";
Type = "notify";
WorkingDirectory = cfg.cacheDir;
+ Restart = "on-failure";
+ Sockets = [ "kresd.socket" "kresd-control.socket" ]
+ ++ optional (cfg.listenTLS != []) "kresd-tls.socket";
};
+ # Trust anchor goes from dns-root-data by default.
script = ''
- exec '${package}/bin/kresd' --config '${configFile}' \
- -k '${cfg.cacheDir}/root.key'
+ exec '${package}/bin/kresd' --config '${configFile}' --forks=1
'';
- after = [ "kresd-cachedir.service" ];
- requires = [ "kresd.socket" "kresd-cachedir.service" ];
- wantedBy = [ "sockets.target" ];
+ requires = [ "kresd.socket" ];
};
};
}
diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix
index ba4e1b1542fe..db1534edfd7c 100644
--- a/nixos/modules/services/networking/lldpd.nix
+++ b/nixos/modules/services/networking/lldpd.nix
@@ -24,6 +24,7 @@ in
description = "lldpd user";
group = "_lldpd";
home = "/var/run/lldpd";
+ isSystemUser = true;
};
users.extraGroups._lldpd = {};
diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix
new file mode 100644
index 000000000000..31379189f5de
--- /dev/null
+++ b/nixos/modules/services/networking/monero.nix
@@ -0,0 +1,238 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.monero;
+ dataDir = "/var/lib/monero";
+
+ listToConf = option: list:
+ concatMapStrings (value: "${option}=${value}\n") list;
+
+ login = (cfg.rpc.user != null && cfg.rpc.password != null);
+
+ configFile = with cfg; pkgs.writeText "monero.conf" ''
+ log-file=/dev/stdout
+ data-dir=${dataDir}
+
+ ${optionalString mining.enable ''
+ start-mining=${mining.address}
+ mining-threads=${toString mining.threads}
+ ''}
+
+ rpc-bind-ip=${rpc.address}
+ rpc-bind-port=${toString rpc.port}
+ ${optionalString login ''
+ rpc-login=${rpc.user}:${rpc.password}
+ ''}
+ ${optionalString rpc.restricted ''
+ restrict-rpc=1
+ ''}
+
+ limit-rate-up=${toString limits.upload}
+ limit-rate-down=${toString limits.download}
+ max-concurrency=${toString limits.threads}
+ block-sync-size=${toString limits.syncSize}
+
+ ${listToConf "add-peer" extraNodes}
+ ${listToConf "add-priority-node" priorityNodes}
+ ${listToConf "add-exclusive-node" exclusiveNodes}
+
+ ${extraConfig}
+ '';
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.monero = {
+
+ enable = mkEnableOption "Monero node daemon.";
+
+ mining.enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to mine moneroj.
+ '';
+ };
+
+ mining.address = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Monero address where to send mining rewards.
+ '';
+ };
+
+ mining.threads = mkOption {
+ type = types.addCheck types.int (x: x>=0);
+ default = 0;
+ description = ''
+ Number of threads used for mining.
+ Set to 0 to use all available.
+ '';
+ };
+
+ rpc.user = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ User name for RPC connections.
+ '';
+ };
+
+ rpc.password = mkOption {
+ type = types.str;
+ default = null;
+ description = ''
+ Password for RPC connections.
+ '';
+ };
+
+ rpc.address = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = ''
+ IP address the RPC server will bind to.
+ '';
+ };
+
+ rpc.port = mkOption {
+ type = types.int;
+ default = 18081;
+ description = ''
+ Port the RPC server will bind to.
+ '';
+ };
+
+ rpc.restricted = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to restrict RPC to view only commands.
+ '';
+ };
+
+ limits.upload = mkOption {
+ type = types.addCheck types.int (x: x>=-1);
+ default = -1;
+ description = ''
+ Limit of the upload rate in kB/s.
+ Set to -1 to leave unlimited.
+ '';
+ };
+
+ limits.download = mkOption {
+ type = types.addCheck types.int (x: x>=-1);
+ default = -1;
+ description = ''
+ Limit of the download rate in kB/s.
+ Set to -1 to leave unlimited.
+ '';
+ };
+
+ limits.threads = mkOption {
+ type = types.addCheck types.int (x: x>=0);
+ default = 0;
+ description = ''
+ Maximum number of threads used for a parallel job.
+ Set to 0 to leave unlimited.
+ '';
+ };
+
+ limits.syncSize = mkOption {
+ type = types.addCheck types.int (x: x>=0);
+ default = 0;
+ description = ''
+ Maximum number of blocks to sync at once.
+ Set to 0 for adaptive.
+ '';
+ };
+
+ extraNodes = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ description = ''
+ List of additional peer IP addresses to add to the local list.
+ '';
+ };
+
+ priorityNodes = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ description = ''
+ List of peer IP addresses to connect to and
+ attempt to keep the connection open.
+ '';
+ };
+
+ exclusiveNodes = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ description = ''
+ List of peer IP addresses to connect to *only*.
+ If given the other peer options will be ignored.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Extra lines to be added verbatim to monerod configuration.
+ '';
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ users.extraUsers = singleton {
+ name = "monero";
+ uid = config.ids.uids.monero;
+ description = "Monero daemon user";
+ home = dataDir;
+ createHome = true;
+ };
+
+ users.extraGroups = singleton {
+ name = "monero";
+ gid = config.ids.gids.monero;
+ };
+
+ systemd.services.monero = {
+ description = "monero daemon";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ User = "monero";
+ Group = "monero";
+ ExecStart = "${pkgs.monero}/bin/monerod --config-file=${configFile} --non-interactive";
+ Restart = "always";
+ SuccessExitStatus = [ 0 1 ];
+ };
+ };
+
+ 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.
+ '';
+ };
+
+ };
+
+}
+
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 81915b5a2ef8..d8135f4d0ffa 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -12,6 +12,10 @@ let
keyfile ${cfg.ssl.keyfile}
'';
+ passwordConf = optionalString cfg.checkPasswords ''
+ password_file ${cfg.dataDir}/passwd
+ '';
+
mosquittoConf = pkgs.writeText "mosquitto.conf" ''
pid_file /run/mosquitto/pid
acl_file ${aclFile}
@@ -19,6 +23,7 @@ let
allow_anonymous ${boolToString cfg.allowAnonymous}
bind_address ${cfg.host}
port ${toString cfg.port}
+ ${passwordConf}
${listenerConf}
${cfg.extraConf}
'';
@@ -153,6 +158,15 @@ in
'';
};
+ checkPasswords = mkOption {
+ default = false;
+ example = true;
+ type = types.bool;
+ description = ''
+ Refuse connection when clients provide incorrect passwords.
+ '';
+ };
+
extraConf = mkOption {
default = "";
type = types.lines;
@@ -198,7 +212,7 @@ in
'' + concatStringsSep "\n" (
mapAttrsToList (n: c:
if c.hashedPassword != null then
- "echo '${n}:${c.hashedPassword}' > ${cfg.dataDir}/passwd"
+ "echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd"
else optionalString (c.password != null)
"${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} ${c.password}"
) cfg.users);
diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 366bb2ed7a80..da3827c35e63 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -19,6 +19,8 @@ let
iptables -w -t nat -D POSTROUTING -j nixos-nat-post 2>/dev/null || true
iptables -w -t nat -F nixos-nat-post 2>/dev/null || true
iptables -w -t nat -X nixos-nat-post 2>/dev/null || true
+
+ ${cfg.extraStopCommands}
'';
setupNat = ''
@@ -51,8 +53,40 @@ let
-i ${cfg.externalInterface} -p ${fwd.proto} \
--dport ${builtins.toString fwd.sourcePort} \
-j DNAT --to-destination ${fwd.destination}
+
+ ${concatMapStrings (loopbackip:
+ let
+ m = builtins.match "([0-9.]+):([0-9-]+)" fwd.destination;
+ destinationIP = if (m == null) then throw "bad ip:ports `${fwd.destination}'" else elemAt m 0;
+ destinationPorts = if (m == null) then throw "bad ip:ports `${fwd.destination}'" else elemAt m 1;
+ in ''
+ # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from the host itself
+ iptables -w -t nat -A OUTPUT \
+ -d ${loopbackip} -p ${fwd.proto} \
+ --dport ${builtins.toString fwd.sourcePort} \
+ -j DNAT --to-destination ${fwd.destination}
+
+ # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from other hosts behind NAT
+ iptables -w -t nat -A nixos-nat-pre \
+ -d ${loopbackip} -p ${fwd.proto} \
+ --dport ${builtins.toString fwd.sourcePort} \
+ -j DNAT --to-destination ${fwd.destination}
+
+ iptables -w -t nat -A nixos-nat-post \
+ -d ${destinationIP} -p ${fwd.proto} \
+ --dport ${destinationPorts} \
+ -j SNAT --to-source ${loopbackip}
+ '') fwd.loopbackIPs}
'') cfg.forwardPorts}
+ ${optionalString (cfg.dmzHost != null) ''
+ iptables -w -t nat -A nixos-nat-pre \
+ -i ${cfg.externalInterface} -j DNAT \
+ --to-destination ${cfg.dmzHost}
+ ''}
+
+ ${cfg.extraCommands}
+
# Append our chains to the nat tables
iptables -w -t nat -A PREROUTING -j nixos-nat-pre
iptables -w -t nat -A POSTROUTING -j nixos-nat-post
@@ -125,15 +159,15 @@ in
type = with types; listOf (submodule {
options = {
sourcePort = mkOption {
- type = types.int;
+ type = types.either types.int (types.strMatching "[[:digit:]]+:[[:digit:]]+");
example = 8080;
- description = "Source port of the external interface";
+ description = "Source port of the external interface; to specify a port range, use a string with a colon (e.g. \"60000:61000\")";
};
destination = mkOption {
type = types.str;
example = "10.0.0.1:80";
- description = "Forward connection to destination ip:port";
+ description = "Forward connection to destination ip:port; to specify a port range, use ip:start-end";
};
proto = mkOption {
@@ -142,6 +176,13 @@ in
example = "udp";
description = "Protocol of forwarded connection";
};
+
+ loopbackIPs = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = literalExample ''[ "55.1.2.3" ]'';
+ description = "Public IPs for NAT reflection; for connections to `loopbackip:sourcePort' from the host itself and from other hosts behind NAT";
+ };
};
});
default = [];
@@ -153,6 +194,39 @@ in
'';
};
+ networking.nat.dmzHost = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "10.0.0.1";
+ description =
+ ''
+ The local IP address to which all traffic that does not match any
+ forwarding rule is forwarded.
+ '';
+ };
+
+ networking.nat.extraCommands = mkOption {
+ type = types.lines;
+ default = "";
+ example = "iptables -A INPUT -p icmp -j ACCEPT";
+ description =
+ ''
+ Additional shell commands executed as part of the nat
+ initialisation script.
+ '';
+ };
+
+ networking.nat.extraStopCommands = mkOption {
+ type = types.lines;
+ default = "";
+ example = "iptables -D INPUT -p icmp -j ACCEPT || true";
+ description =
+ ''
+ Additional shell commands executed as part of the nat
+ teardown script.
+ '';
+ };
+
};
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 6bdae32f72bb..f83fb7a6d5dc 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -133,10 +133,10 @@ in {
basePackages = mkOption {
type = types.attrsOf types.package;
default = { inherit networkmanager modemmanager wpa_supplicant
- networkmanager_openvpn networkmanager_vpnc
- networkmanager_openconnect networkmanager_fortisslvpn
- networkmanager_pptp networkmanager_l2tp
- networkmanager_iodine; };
+ networkmanager-openvpn networkmanager-vpnc
+ networkmanager-openconnect networkmanager-fortisslvpn
+ networkmanager-pptp networkmanager-l2tp
+ networkmanager-iodine; };
internal = true;
};
@@ -241,6 +241,19 @@ in {
A list of scripts which will be executed in response to network events.
'';
};
+
+ enableStrongSwan = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the StrongSwan plugin.
+
+ If you enable this option the
+ networkmanager_strongswan plugin will be added to
+ the option
+ so you don't need to to that yourself.
+ '';
+ };
};
};
@@ -260,28 +273,28 @@ in {
{ source = configFile;
target = "NetworkManager/NetworkManager.conf";
}
- { source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
+ { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
target = "NetworkManager/VPN/nm-openvpn-service.name";
}
- { source = "${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
+ { source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
target = "NetworkManager/VPN/nm-vpnc-service.name";
}
- { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
+ { source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
target = "NetworkManager/VPN/nm-openconnect-service.name";
}
- { source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
+ { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
}
- { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
+ { source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
target = "NetworkManager/VPN/nm-pptp-service.name";
}
- { source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
+ { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
target = "NetworkManager/VPN/nm-l2tp-service.name";
}
{ source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";
target = "NetworkManager/VPN/nm-strongswan-service.name";
}
- { source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
+ { source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
target = "NetworkManager/VPN/nm-iodine-service.name";
}
] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])
@@ -322,6 +335,7 @@ in {
preStart = ''
mkdir -m 700 -p /etc/NetworkManager/system-connections
+ mkdir -m 700 -p /etc/ipsec.d
mkdir -m 755 -p ${stateDirs}
'';
};
@@ -333,13 +347,13 @@ in {
wireless.enable = lib.mkDefault false;
};
- powerManagement.resumeCommands = ''
- ${config.systemd.package}/bin/systemctl restart network-manager
- '';
-
security.polkit.extraConfig = polkitConf;
- services.dbus.packages = cfg.packages;
+ networking.networkmanager.packages =
+ mkIf cfg.enableStrongSwan [ pkgs.networkmanager_strongswan ];
+
+ services.dbus.packages =
+ optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages;
services.udev.packages = cfg.packages;
};
diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix
index 56b942054140..ad7c013a5449 100644
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixos/modules/services/networking/nftables.nix
@@ -116,7 +116,7 @@ in
include "${cfg.rulesetFile}"
'';
checkScript = pkgs.writeScript "nftables-check" ''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
if $(${pkgs.kmod}/bin/lsmod | grep -q ip_tables); then
echo "Unload ip_tables before using nftables!" 1>&2
exit 1
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index 3e865e3b76a8..8499e7c0f7c4 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -55,6 +55,8 @@ in
environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;
serviceConfig = {
+ Restart = "always";
+ RestartSec = "5s";
ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
"--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
User = "nix-serve";
diff --git a/nixos/modules/services/networking/nixops-dns.nix b/nixos/modules/services/networking/nixops-dns.nix
new file mode 100644
index 000000000000..2bb1263b7fa2
--- /dev/null
+++ b/nixos/modules/services/networking/nixops-dns.nix
@@ -0,0 +1,79 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ pkg = pkgs.nixops-dns;
+ cfg = config.services.nixops-dns;
+in
+
+{
+ options = {
+ services.nixops-dns = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable the nixops-dns resolution
+ of NixOps virtual machines via dnsmasq and fake domain name.
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ description = ''
+ The user the nixops-dns daemon should run as.
+ This should be the user, which is also used for nixops and
+ have the .nixops directory in its home.
+ '';
+ };
+
+ domain = mkOption {
+ type = types.str;
+ description = ''
+ Fake domain name to resolve to NixOps virtual machines.
+
+ For example "ops" will resolve "vm.ops".
+ '';
+ example = "ops";
+ default = "ops";
+ };
+
+ dnsmasq = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Enable dnsmasq forwarding to nixops-dns. This allows to use
+ nixops-dns for `services.nixops-dns.domain` resolution
+ while forwarding the rest of the queries to original resolvers.
+ '';
+ };
+
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.nixops-dns = {
+ description = "nixops-dns: DNS server for resolving NixOps machines";
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ Type = "simple";
+ User = cfg.user;
+ ExecStart="${pkg}/bin/nixops-dns --domain=.${cfg.domain}";
+ };
+ };
+
+ services.dnsmasq = mkIf cfg.dnsmasq {
+ enable = true;
+ resolveLocalQueries = true;
+ servers = [
+ "/${cfg.domain}/127.0.0.1#5300"
+ ];
+ extraConfig = ''
+ bind-interfaces
+ listen-address=127.0.0.1
+ '';
+ };
+
+ };
+}
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index c8b8ed547ebb..4241e6fcceab 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -11,6 +11,8 @@ let
# build nsd with the options needed for the given config
nsdPkg = pkgs.nsd.override {
+ configFile = "${configFile}/nsd.conf";
+
bind8Stats = cfg.bind8Stats;
ipv6 = cfg.ipv6;
ratelimit = cfg.ratelimit.enable;
@@ -788,6 +790,8 @@ in
config = mkIf cfg.enable {
+ environment.systemPackages = [ nsdPkg ];
+
users.extraGroups = singleton {
name = username;
gid = config.ids.gids.nsd;
@@ -845,4 +849,6 @@ in
};
};
+
+ meta.maintainers = with lib.maintainers; [ hrdinka ];
}
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 3fbf5a9f0227..7a96b673c51e 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -50,6 +50,11 @@ let
"up ${pkgs.writeScript "openvpn-${name}-up" upScript}"}
${optionalString (cfg.down != "" || cfg.updateResolvConf)
"down ${pkgs.writeScript "openvpn-${name}-down" downScript}"}
+ ${optionalString (cfg.authUserPass != null)
+ "auth-user-pass ${pkgs.writeText "openvpn-credentials-${name}" ''
+ ${cfg.authUserPass.username}
+ ${cfg.authUserPass.password}
+ ''}"}
'';
in {
@@ -161,6 +166,29 @@ in
'';
};
+ authUserPass = mkOption {
+ default = null;
+ description = ''
+ This option can be used to store the username / password credentials
+ with the "auth-user-pass" authentication method.
+
+ WARNING: Using this option will put the credentials WORLD-READABLE in the Nix store!
+ '';
+ type = types.nullOr (types.submodule {
+
+ options = {
+ username = mkOption {
+ description = "The username to store inside the credentials file.";
+ type = types.string;
+ };
+
+ password = mkOption {
+ description = "The password to store inside the credentials file.";
+ type = types.string;
+ };
+ };
+ });
+ };
};
});
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index fb9c9dc67f24..d57ebb61f636 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -10,98 +10,229 @@ let
options = {
- # TODO: require attribute
key = mkOption {
- type = types.str;
- description = "Path to the key file";
+ type = types.path;
+ description = "Path to the key file.";
};
- # TODO: require attribute
+ # TODO: rename to certificate to match the prosody config
cert = mkOption {
- type = types.str;
- description = "Path to the certificate file";
+ type = types.path;
+ description = "Path to the certificate file.";
};
+
+ extraOptions = mkOption {
+ type = types.attrs;
+ default = {};
+ description = "Extra SSL configuration options.";
+ };
+
};
};
moduleOpts = {
-
+ # Generally required
roster = mkOption {
+ type = types.bool;
default = true;
description = "Allow users to have a roster";
};
saslauth = mkOption {
+ type = types.bool;
default = true;
description = "Authentication for clients and servers. Recommended if you want to log in.";
};
tls = mkOption {
+ type = types.bool;
default = true;
description = "Add support for secure TLS on c2s/s2s connections";
};
dialback = mkOption {
+ type = types.bool;
default = true;
description = "s2s dialback support";
};
disco = mkOption {
+ type = types.bool;
default = true;
description = "Service discovery";
};
- legacyauth = mkOption {
+ # Not essential, but recommended
+ carbons = mkOption {
+ type = types.bool;
default = true;
- description = "Legacy authentication. Only used by some old clients and bots";
+ description = "Keep multiple clients in sync";
};
+ pep = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Enables users to publish their mood, activity, playing music and more";
+ };
+
+ private = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Private XML storage (for room bookmarks, etc.)";
+ };
+
+ blocklist = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Allow users to block communications with other users";
+ };
+
+ vcard = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Allow users to set vCards";
+ };
+
+ # Nice to have
version = mkOption {
+ type = types.bool;
default = true;
description = "Replies to server version requests";
};
uptime = mkOption {
+ type = types.bool;
default = true;
description = "Report how long server has been running";
};
time = mkOption {
+ type = types.bool;
default = true;
description = "Let others know the time here on this server";
};
ping = mkOption {
+ type = types.bool;
default = true;
description = "Replies to XMPP pings with pongs";
};
- console = mkOption {
- default = false;
- description = "telnet to port 5582";
+ register = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Allow users to register on this server using a client and change passwords";
};
+ mam = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Store messages in an archive and allow users to access it";
+ };
+
+ # Admin interfaces
+ admin_adhoc = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Allows administration via an XMPP client that supports ad-hoc commands";
+ };
+
+ admin_telnet = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Opens telnet console interface on localhost port 5582";
+ };
+
+ # HTTP modules
bosh = mkOption {
+ type = types.bool;
default = false;
description = "Enable BOSH clients, aka 'Jabber over HTTP'";
};
- httpserver = mkOption {
- default = false;
- description = "Serve static files from a directory over HTTP";
- };
-
websocket = mkOption {
+ type = types.bool;
default = false;
description = "Enable WebSocket support";
};
+ http_files = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Serve static files from a directory over HTTP";
+ };
+
+ # Other specific functionality
+ limits = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable bandwidth limiting for XMPP connections";
+ };
+
+ groups = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Shared roster support";
+ };
+
+ server_contact_info = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Publish contact information for this service";
+ };
+
+ announce = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Send announcement to all online users";
+ };
+
+ welcome = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Welcome users who register accounts";
+ };
+
+ watchregistrations = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Alert admins of registrations";
+ };
+
+ motd = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Send a message to users when they log in";
+ };
+
+ legacyauth = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Legacy authentication. Only used by some old clients and bots";
+ };
+
+ proxy65 = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enables a file transfer proxy service which clients behind NAT can use";
+ };
+
};
- createSSLOptsStr = o:
- if o ? key && o ? cert then
- ''ssl = { key = "${o.key}"; certificate = "${o.cert}"; };''
- else "";
+ toLua = x:
+ if builtins.isString x then ''"${x}"''
+ else if builtins.isBool x then (if x == true then "true" else "false")
+ else if builtins.isInt x then toString x
+ else if builtins.isList x then ''{ ${lib.concatStringsSep ", " (map (n: toLua n) x) } }''
+ else throw "Invalid Lua value";
+
+ createSSLOptsStr = o: ''
+ ssl = {
+ key = "${o.key}";
+ certificate = "${o.cert}";
+ ${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)}
+ };
+ '';
vHostOpts = { ... }: {
@@ -114,18 +245,20 @@ let
};
enabled = mkOption {
+ type = types.bool;
default = false;
description = "Whether to enable the virtual host";
};
ssl = mkOption {
- description = "Paths to SSL files";
+ type = types.nullOr (types.submodule sslOpts);
default = null;
- options = [ sslOpts ];
+ description = "Paths to SSL files";
};
extraConfig = mkOption {
- default = '''';
+ type = types.lines;
+ default = "";
description = "Additional virtual host specific configuration";
};
@@ -144,20 +277,95 @@ in
services.prosody = {
enable = mkOption {
+ type = types.bool;
default = false;
description = "Whether to enable the prosody server";
};
+ package = mkOption {
+ type = types.package;
+ description = "Prosody package to use";
+ default = pkgs.prosody;
+ defaultText = "pkgs.prosody";
+ example = literalExample ''
+ pkgs.prosody.override {
+ withExtraLibs = [ pkgs.luaPackages.lpty ];
+ withCommunityModules = [ "auth_external" ];
+ };
+ '';
+ };
+
allowRegistration = mkOption {
+ type = types.bool;
default = false;
description = "Allow account creation";
};
+ c2sRequireEncryption = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Force clients to use encrypted connections? This option will
+ prevent clients from authenticating unless they are using encryption.
+ '';
+ };
+
+ s2sRequireEncryption = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Force servers to use encrypted connections? This option will
+ prevent servers from authenticating unless they are using encryption.
+ Note that this is different from authentication.
+ '';
+ };
+
+ s2sSecureAuth = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Force certificate authentication for server-to-server connections?
+ This provides ideal security, but requires servers you communicate
+ with to support encryption AND present valid, trusted certificates.
+ For more information see https://prosody.im/doc/s2s#security
+ '';
+ };
+
+ s2sInsecureDomains = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "insecure.example.com" ];
+ description = ''
+ Some servers have invalid or self-signed certificates. You can list
+ remote domains here that will not be required to authenticate using
+ certificates. They will be authenticated using DNS instead, even
+ when s2s_secure_auth is enabled.
+ '';
+ };
+
+ s2sSecureDomains = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "jabber.org" ];
+ description = ''
+ Even if you leave s2s_secure_auth disabled, you can still require valid
+ certificates for some domains by specifying a list here.
+ '';
+ };
+
+
modules = moduleOpts;
extraModules = mkOption {
- description = "Enable custom modules";
+ type = types.listOf types.str;
default = [];
+ description = "Enable custom modules";
+ };
+
+ extraPluginPaths = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ description = "Addtional path in which to look find plugins/modules";
};
virtualHosts = mkOption {
@@ -183,20 +391,21 @@ in
};
ssl = mkOption {
- description = "Paths to SSL files";
+ type = types.nullOr (types.submodule sslOpts);
default = null;
- options = [ sslOpts ];
+ description = "Paths to SSL files";
};
admins = mkOption {
- description = "List of administrators of the current host";
- example = [ "admin1@example.com" "admin2@example.com" ];
+ type = types.listOf types.str;
default = [];
+ example = [ "admin1@example.com" "admin2@example.com" ];
+ description = "List of administrators of the current host";
};
extraConfig = mkOption {
type = types.lines;
- default = '''';
+ default = "";
description = "Additional prosody configuration";
};
@@ -208,38 +417,48 @@ in
config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs.prosody ];
+ environment.systemPackages = [ cfg.package ];
environment.etc."prosody/prosody.cfg.lua".text = ''
pidfile = "/var/lib/prosody/prosody.pid"
-
log = "*syslog"
data_path = "/var/lib/prosody"
-
- allow_registration = ${boolToString cfg.allowRegistration};
-
- ${ optionalString cfg.modules.console "console_enabled = true;" }
+ plugin_paths = {
+ ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.extraPluginPaths) }
+ }
${ optionalString (cfg.ssl != null) (createSSLOptsStr cfg.ssl) }
- admins = { ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.admins) } };
+ admins = ${toLua cfg.admins}
+
+ -- we already build with libevent, so we can just enable it for a more performant server
+ use_libevent = true
modules_enabled = {
${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList
- (name: val: optionalString val ''"${name}";'')
+ (name: val: optionalString val "${toLua name};")
cfg.modules) }
-
- ${ optionalString cfg.allowRegistration "\"register\"\;" }
-
- ${ lib.concatStringsSep "\n" (map (x: "\"${x}\";") cfg.extraModules)}
-
- "posix";
+ ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}
+ ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.extraModules)}
};
+ allow_registration = ${toLua cfg.allowRegistration}
+
+ c2s_require_encryption = ${toLua cfg.c2sRequireEncryption}
+
+ s2s_require_encryption = ${toLua cfg.s2sRequireEncryption}
+
+ s2s_secure_auth = ${toLua cfg.s2sSecureAuth}
+
+ s2s_insecure_domains = ${toLua cfg.s2sInsecureDomains}
+
+ s2s_secure_domains = ${toLua cfg.s2sSecureDomains}
+
+
${ cfg.extraConfig }
${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: ''
@@ -263,17 +482,17 @@ in
};
systemd.services.prosody = {
-
description = "Prosody XMPP server";
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
+ restartTriggers = [ config.environment.etc."prosody/prosody.cfg.lua".source ];
serviceConfig = {
User = "prosody";
+ Type = "forking";
PIDFile = "/var/lib/prosody/prosody.pid";
- ExecStart = "${pkgs.prosody}/bin/prosodyctl start";
+ ExecStart = "${cfg.package}/bin/prosodyctl start";
};
-
};
};
diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix
index 0199502163a3..85d7f9e4a41b 100644
--- a/nixos/modules/services/networking/radvd.nix
+++ b/nixos/modules/services/networking/radvd.nix
@@ -59,24 +59,11 @@ in
systemd.services.radvd =
{ description = "IPv6 Router Advertisement Daemon";
-
wantedBy = [ "multi-user.target" ];
-
after = [ "network.target" ];
-
- path = [ pkgs.radvd ];
-
- preStart = ''
- mkdir -m 755 -p /run/radvd
- chown radvd /run/radvd
- '';
-
serviceConfig =
- { ExecStart = "@${pkgs.radvd}/sbin/radvd radvd"
- + " -p /run/radvd/radvd.pid -m syslog -u radvd -C ${confFile}";
+ { ExecStart = "@${pkgs.radvd}/bin/radvd radvd -n -u radvd -C ${confFile}";
Restart = "always";
- Type = "forking";
- PIDFile = "/run/radvd/radvd.pid";
};
};
diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix
index 95833d31e99d..a102242eae71 100644
--- a/nixos/modules/services/networking/rdnssd.nix
+++ b/nixos/modules/services/networking/rdnssd.nix
@@ -6,7 +6,7 @@
with lib;
let
mergeHook = pkgs.writeScript "rdnssd-merge-hook" ''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
${pkgs.openresolv}/bin/resolvconf -u
'';
in
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index 6d2b7bdbca1b..2956a5ecbc04 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -17,7 +17,7 @@ let
search_lan = entry.searchLAN;
use_sync_trash = entry.useSyncTrash;
- known_hosts = knownHosts;
+ known_hosts = entry.knownHosts;
}) cfg.sharedFolders;
configFile = pkgs.writeText "config.json" (builtins.toJSON ({
@@ -50,12 +50,7 @@ in
description = ''
If enabled, start the Resilio Sync daemon. Once enabled, you can
interact with the service through the Web UI, or configure it in your
- NixOS configuration. Enabling the resilio service
- also installs a systemd user unit which can be used to start
- user-specific copies of the daemon. Once installed, you can use
- systemctl --user start resilio as your user to start
- the daemon using the configuration file located at
- $HOME/.config/resilio-sync/config.json.
+ NixOS configuration.
'';
};
diff --git a/nixos/modules/services/networking/rxe.nix b/nixos/modules/services/networking/rxe.nix
new file mode 100644
index 000000000000..a6a069ec50c0
--- /dev/null
+++ b/nixos/modules/services/networking/rxe.nix
@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.networking.rxe;
+
+ runRxeCmd = cmd: ifcs:
+ concatStrings ( map (x: "${pkgs.rdma-core}/bin/rxe_cfg -n ${cmd} ${x};") ifcs);
+
+ startScript = pkgs.writeShellScriptBin "rxe-start" ''
+ ${pkgs.rdma-core}/bin/rxe_cfg -n start
+ ${runRxeCmd "add" cfg.interfaces}
+ ${pkgs.rdma-core}/bin/rxe_cfg
+ '';
+
+ stopScript = pkgs.writeShellScriptBin "rxe-stop" ''
+ ${runRxeCmd "remove" cfg.interfaces }
+ ${pkgs.rdma-core}/bin/rxe_cfg -n stop
+ '';
+
+in {
+ ###### interface
+
+ options = {
+ networking.rxe = {
+ enable = mkEnableOption "RDMA over converged ethernet";
+ interfaces = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "eth0" ];
+ description = ''
+ Enable RDMA on the listed interfaces. The corresponding virtual
+ RDMA interfaces will be named rxe0 ... rxeN where the ordering
+ will be as they are named in the list. UDP port 4791 must be
+ open on the respective ethernet interfaces.
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ systemd.services.rxe = {
+ path = with pkgs; [ kmod rdma-core ];
+ description = "RoCE interfaces";
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "systemd-modules-load.service" "network-online.target" ];
+ wants = [ "network-pre.target" ];
+
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ ExecStart = "${startScript}/bin/rxe-start";
+ ExecStop = "${stopScript}/bin/rxe-stop";
+ };
+ };
+ };
+}
+
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
index 9087b75c29c1..65df93a00da9 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixos/modules/services/networking/softether.nix
@@ -5,6 +5,8 @@ with lib;
let
cfg = config.services.softether;
+ package = cfg.package.override { dataDir = cfg.dataDir; };
+
in
{
@@ -49,7 +51,7 @@ in
dataDir = mkOption {
type = types.string;
- default = "${cfg.package.dataDir}";
+ default = "/var/lib/softether";
description = ''
Data directory for SoftEther VPN.
'';
@@ -64,11 +66,8 @@ in
config = mkIf cfg.enable (
mkMerge [{
- environment.systemPackages = [
- (pkgs.lib.overrideDerivation cfg.package (attrs: {
- dataDir = cfg.dataDir;
- }))
- ];
+ environment.systemPackages = [ package ];
+
systemd.services."softether-init" = {
description = "SoftEther VPN services initial task";
wantedBy = [ "network.target" ];
@@ -80,11 +79,11 @@ in
for d in vpnserver vpnbridge vpnclient vpncmd; do
if ! test -e ${cfg.dataDir}/$d; then
${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
- install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
+ install -m0600 ${package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
fi
done
rm -rf ${cfg.dataDir}/vpncmd/vpncmd
- ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
+ ln -s ${package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
'';
};
}
@@ -97,12 +96,12 @@ in
wantedBy = [ "network.target" ];
serviceConfig = {
Type = "forking";
- ExecStart = "${cfg.package}/bin/vpnserver start";
- ExecStop = "${cfg.package}/bin/vpnserver stop";
+ ExecStart = "${package}/bin/vpnserver start";
+ ExecStop = "${package}/bin/vpnserver stop";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
- ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
+ ln -s ${package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
'';
postStop = ''
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
@@ -118,12 +117,12 @@ in
wantedBy = [ "network.target" ];
serviceConfig = {
Type = "forking";
- ExecStart = "${cfg.package}/bin/vpnbridge start";
- ExecStop = "${cfg.package}/bin/vpnbridge stop";
+ ExecStart = "${package}/bin/vpnbridge start";
+ ExecStop = "${package}/bin/vpnbridge stop";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
- ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
+ ln -s ${package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
'';
postStop = ''
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
@@ -139,12 +138,12 @@ in
wantedBy = [ "network.target" ];
serviceConfig = {
Type = "forking";
- ExecStart = "${cfg.package}/bin/vpnclient start";
- ExecStop = "${cfg.package}/bin/vpnclient stop";
+ ExecStart = "${package}/bin/vpnclient start";
+ ExecStop = "${package}/bin/vpnclient stop";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnclient/vpnclient
- ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
+ ln -s ${package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
'';
postStart = ''
sleep 1
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 6c4dcfeda064..e50c4dbacf36 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -21,7 +21,7 @@ let
daemon reads in addition to the the user's authorized_keys file.
You can combine the keys and
keyFiles options.
- Warning: If you are using NixOps then don't use this
+ Warning: If you are using NixOps then don't use this
option since it will replace the key required for deployment via ssh.
'';
};
@@ -137,6 +137,14 @@ in
'';
};
+ openFirewall = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to automatically open the specified ports in the firewall.
+ '';
+ };
+
listenAddresses = mkOption {
type = with types; listOf (submodule {
options = {
@@ -248,13 +256,10 @@ in
let
service =
{ description = "SSH Daemon";
-
wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
-
+ after = [ "network.target" ];
stopIfChanged = false;
-
path = [ cfgc.package pkgs.gawk ];
-
environment.LD_LIBRARY_PATH = nssModulesPath;
preStart =
@@ -305,7 +310,7 @@ in
};
- networking.firewall.allowedTCPPorts = cfg.ports;
+ networking.firewall.allowedTCPPorts = if cfg.openFirewall then cfg.ports else [];
security.pam.services.sshd =
{ startSession = true;
@@ -365,14 +370,11 @@ in
KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
- MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-ripemd160-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,hmac-ripemd160,umac-128@openssh.com
+ MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
# LogLevel VERBOSE logs user's key fingerprint on login.
# Needed to have a clear audit track of which key was used to log in.
LogLevel VERBOSE
-
- # Use kernel sandbox mechanisms where possible in unprivileged processes.
- UsePrivilegeSeparation sandbox
'';
assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix
index 3a3f64221c42..707d24b9220f 100644
--- a/nixos/modules/services/networking/strongswan.nix
+++ b/nixos/modules/services/networking/strongswan.nix
@@ -32,13 +32,13 @@ let
${caConf}
'';
- strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" ''
+ strongswanConf = {setup, connections, ca, secretsFile, managePlugins, enabledPlugins}: toFile "strongswan.conf" ''
charon {
${if managePlugins then "load_modular = no" else ""}
${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""}
plugins {
stroke {
- secrets_file = ${ipsecSecrets secrets}
+ secrets_file = ${secretsFile}
}
}
}
@@ -135,7 +135,18 @@ in
};
};
- config = with cfg; mkIf enable {
+
+ config = with cfg;
+ let
+ secretsFile = ipsecSecrets cfg.secrets;
+ in
+ mkIf enable
+ {
+
+ # here we should use the default strongswan ipsec.secrets and
+ # append to it (default one is empty so not a pb for now)
+ environment.etc."ipsec.secrets".source = secretsFile;
+
systemd.services.strongswan = {
description = "strongSwan IPSec Service";
wantedBy = [ "multi-user.target" ];
@@ -143,11 +154,15 @@ in
wants = [ "keys.target" ];
after = [ "network-online.target" "keys.target" ];
environment = {
- STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; };
+ STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; };
};
serviceConfig = {
ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork";
};
+ preStart = ''
+ # with 'nopeerdns' setting, ppp writes into this folder
+ mkdir -m 700 -p /etc/ppp
+ '';
};
};
}
diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix
new file mode 100644
index 000000000000..89a14966eca7
--- /dev/null
+++ b/nixos/modules/services/networking/stunnel.nix
@@ -0,0 +1,221 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.stunnel;
+ yesNo = val: if val then "yes" else "no";
+
+ verifyChainPathAssert = n: c: {
+ assertion = c.verifyHostname == null || (c.verifyChain || c.verifyPeer);
+ message = "stunnel: \"${n}\" client configuration - hostname verification " +
+ "is not possible without either verifyChain or verifyPeer enabled";
+ };
+
+ serverConfig = {
+ options = {
+ accept = mkOption {
+ type = types.int;
+ description = "On which port stunnel should listen for incoming TLS connections.";
+ };
+
+ connect = mkOption {
+ type = types.int;
+ description = "To which port the decrypted connection should be forwarded.";
+ };
+
+ cert = mkOption {
+ type = types.path;
+ description = "File containing both the private and public keys.";
+ };
+ };
+ };
+
+ clientConfig = {
+ options = {
+ accept = mkOption {
+ type = types.string;
+ description = "IP:Port on which connections should be accepted.";
+ };
+
+ connect = mkOption {
+ type = types.string;
+ description = "IP:Port destination to connect to.";
+ };
+
+ verifyChain = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Check if the provided certificate has a valid certificate chain (against CAPath).";
+ };
+
+ verifyPeer = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Check if the provided certificate is contained in CAPath.";
+ };
+
+ CAPath = mkOption {
+ type = types.path;
+ default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+ description = "Path to a file containing certificates to validate against.";
+ };
+
+ verifyHostname = mkOption {
+ type = with types; nullOr string;
+ default = null;
+ description = "If set, stunnel checks if the provided certificate is valid for the given hostname.";
+ };
+ };
+ };
+
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.stunnel = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the stunnel TLS tunneling service.";
+ };
+
+ user = mkOption {
+ type = with types; nullOr string;
+ default = "nobody";
+ description = "The user under which stunnel runs.";
+ };
+
+ group = mkOption {
+ type = with types; nullOr string;
+ default = "nogroup";
+ description = "The group under which stunnel runs.";
+ };
+
+ logLevel = mkOption {
+ type = types.enum [ "emerg" "alert" "crit" "err" "warning" "notice" "info" "debug" ];
+ default = "info";
+ description = "Verbosity of stunnel output.";
+ };
+
+ fipsMode = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable FIPS 140-2 mode required for compliance.";
+ };
+
+ enableInsecureSSLv3 = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable support for the insecure SSLv3 protocol.";
+ };
+
+
+ servers = mkOption {
+ description = "Define the server configuations.";
+ type = with types; attrsOf (submodule serverConfig);
+ example = {
+ fancyWebserver = {
+ enable = true;
+ accept = 443;
+ connect = 8080;
+ cert = "/path/to/pem/file";
+ };
+ };
+ default = { };
+ };
+
+ clients = mkOption {
+ description = "Define the client configurations.";
+ type = with types; attrsOf (submodule clientConfig);
+ example = {
+ foobar = {
+ accept = "0.0.0.0:8080";
+ connect = "nixos.org:443";
+ verifyChain = false;
+ };
+ };
+ default = { };
+ };
+ };
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ assertions = concatLists [
+ (singleton {
+ assertion = (length (attrValues cfg.servers) != 0) || ((length (attrValues cfg.clients)) != 0);
+ message = "stunnel: At least one server- or client-configuration has to be present.";
+ })
+
+ (mapAttrsToList verifyChainPathAssert cfg.clients)
+ ];
+
+ environment.systemPackages = [ pkgs.stunnel ];
+
+ environment.etc."stunnel.cfg".text = ''
+ ${ if cfg.user != null then "setuid = ${cfg.user}" else "" }
+ ${ if cfg.group != null then "setgid = ${cfg.group}" else "" }
+
+ debug = ${cfg.logLevel}
+
+ ${ optionalString cfg.fipsMode "fips = yes" }
+ ${ optionalString cfg.enableInsecureSSLv3 "options = -NO_SSLv3" }
+
+ ; ----- SERVER CONFIGURATIONS -----
+ ${ lib.concatStringsSep "\n"
+ (lib.mapAttrsToList
+ (n: v: ''
+ [${n}]
+ accept = ${toString v.accept}
+ connect = ${toString v.connect}
+ cert = ${v.cert}
+
+ '')
+ cfg.servers)
+ }
+
+ ; ----- CLIENT CONFIGURATIONS -----
+ ${ lib.concatStringsSep "\n"
+ (lib.mapAttrsToList
+ (n: v: ''
+ [${n}]
+ client = yes
+ accept = ${v.accept}
+ connect = ${v.connect}
+ verifyChain = ${yesNo v.verifyChain}
+ verifyPeer = ${yesNo v.verifyPeer}
+ ${optionalString (v.CAPath != null) "CApath = ${v.CAPath}"}
+ ${optionalString (v.verifyHostname != null) "checkHost = ${v.verifyHostname}"}
+ OCSPaia = yes
+
+ '')
+ cfg.clients)
+ }
+ '';
+
+ systemd.services.stunnel = {
+ description = "stunnel TLS tunneling service";
+ after = [ "network.target" ];
+ wants = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ restartTriggers = [ config.environment.etc."stunnel.cfg".source ];
+ serviceConfig = {
+ ExecStart = "${pkgs.stunnel}/bin/stunnel ${config.environment.etc."stunnel.cfg".source}";
+ Type = "forking";
+ };
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index dcdc203bdc62..e485c073cbdd 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -16,12 +16,6 @@ in {
available on http://127.0.0.1:8384/.
'';
- useInotify = mkOption {
- type = types.bool;
- default = false;
- description = "Provide syncthing-inotify as a service.";
- };
-
systemService = mkOption {
type = types.bool;
default = true;
@@ -90,6 +84,12 @@ in {
};
};
+ imports = [
+ (mkRemovedOptionModule ["services" "syncthing" "useInotify"] ''
+ This option was removed because syncthing now has the inotify functionality included under the name "fswatcher".
+ It can be enabled on a per-folder basis through the webinterface.
+ '')
+ ];
###### implementation
@@ -100,8 +100,7 @@ in {
allowedUDPPorts = [ 21027 ];
};
- systemd.packages = [ pkgs.syncthing ]
- ++ lib.optional cfg.useInotify pkgs.syncthing-inotify;
+ systemd.packages = [ pkgs.syncthing ];
users = mkIf (cfg.user == defaultUser) {
extraUsers."${defaultUser}" =
@@ -125,7 +124,6 @@ in {
STNOUPGRADE = "yes";
inherit (cfg) all_proxy;
} // config.networking.proxy.envVars;
- wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "on-failure";
@@ -141,20 +139,6 @@ in {
syncthing-resume = {
wantedBy = [ "suspend.target" ];
};
-
- syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) {
- description = "Syncthing Inotify File Watcher service";
- after = [ "network.target" "syncthing.service" ];
- requires = [ "syncthing.service" ];
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- SuccessExitStatus = "2";
- RestartForceExitStatus = "3";
- Restart = "on-failure";
- User = cfg.user;
- ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0";
- };
- };
};
};
}
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index adb80ea29840..e3c9b5282b8c 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -178,6 +178,8 @@ in
preStart = ''
mkdir -p /etc/tinc/${network}/hosts
chown tinc.${network} /etc/tinc/${network}/hosts
+ mkdir -p /etc/tinc/${network}/invitations
+ chown tinc.${network} /etc/tinc/${network}/invitations
# Determine how we should generate our keys
if type tinc >/dev/null 2>&1; then
diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix
index c1f945773e23..cb0e6b158651 100644
--- a/nixos/modules/services/networking/tox-bootstrapd.nix
+++ b/nixos/modules/services/networking/tox-bootstrapd.nix
@@ -69,7 +69,7 @@ in
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig =
- { ExecStart = "${pkg}/bin/tox-bootstrapd ${cfgFile}";
+ { ExecStart = "${pkg}/bin/tox-bootstrapd --config=${cfgFile}";
Type = "forking";
inherit PIDFile;
User = "tox-bootstrapd";
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 4c7f58d1d8bc..ecab8cfc7df9 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -124,7 +124,7 @@ in
listenAddresses = mkOption {
type = types.listOf types.str;
- default = [ "127.0.0.1:631" ];
+ default = [ "localhost:631" ];
example = [ "*:631" ];
description = ''
A list of addresses and ports on which to listen.
@@ -321,7 +321,10 @@ in
''}
'';
- serviceConfig.PrivateTmp = true;
+ serviceConfig = {
+ PrivateTmp = true;
+ RuntimeDirectory = [ "cups" ];
+ };
};
systemd.services.cups-browsed = mkIf avahiEnabled
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index ac589be57736..e3b6b638f5a7 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -90,16 +90,24 @@ in
[ (allowdeny "allow" (cfg.allow))
(allowdeny "deny" cfg.deny)
# see man 5 fcron.conf
- { source = pkgs.writeText "fcron.conf" ''
- fcrontabs = /var/spool/fcron
- pidfile = /var/run/fcron.pid
- fifofile = /var/run/fcron.fifo
- fcronallow = /etc/fcron.allow
- fcrondeny = /etc/fcron.deny
- shell = /bin/sh
- sendmail = /run/wrappers/bin/sendmail
- editor = ${pkgs.vim}/bin/vim
- '';
+ { source =
+ let
+ isSendmailWrapped =
+ lib.hasAttr "sendmail" config.security.wrappers;
+ sendmailPath =
+ if isSendmailWrapped then "/run/wrappers/bin/sendmail"
+ else "${config.system.path}/bin/sendmail";
+ in
+ pkgs.writeText "fcron.conf" ''
+ fcrontabs = /var/spool/fcron
+ pidfile = /var/run/fcron.pid
+ fifofile = /var/run/fcron.fifo
+ fcronallow = /etc/fcron.allow
+ fcrondeny = /etc/fcron.deny
+ shell = /bin/sh
+ sendmail = ${sendmailPath}
+ editor = ${pkgs.vim}/bin/vim
+ '';
target = "fcron.conf";
gid = config.ids.gids.fcron;
mode = "0644";
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index c51dd5d94655..adef500b7b5c 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -6,6 +6,7 @@ let
cfg = config.services.elasticsearch;
es5 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "5" >= 0;
+ es6 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "6" >= 0;
esConfig = ''
network.host: ${cfg.listenAddress}
@@ -92,8 +93,6 @@ in {
node.name: "elasticsearch"
node.master: true
node.data: false
- index.number_of_shards: 5
- index.number_of_replicas: 1
'';
};
@@ -165,7 +164,10 @@ in {
path = [ pkgs.inetutils ];
environment = {
ES_HOME = cfg.dataDir;
- ES_JAVA_OPTS = toString ([ "-Des.path.conf=${configDir}" ] ++ cfg.extraJavaOptions);
+ ES_JAVA_OPTS = toString ( optional (!es6) [ "-Des.path.conf=${configDir}" ]
+ ++ cfg.extraJavaOptions);
+ } // optionalAttrs es6 {
+ ES_PATH_CONF = configDir;
};
serviceConfig = {
ExecStart = "${cfg.package}/bin/elasticsearch ${toString cfg.extraCmdLineOptions}";
diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index f71f30fee97a..4161c61ed375 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -76,8 +76,9 @@ in
};
};
- config = mkIf cfg.updater.enable or cfg.daemon.enable {
+ config = mkIf (cfg.updater.enable || cfg.daemon.enable) {
environment.systemPackages = [ pkg ];
+
users.extraUsers = singleton {
name = clamavUser;
uid = config.ids.uids.clamav;
@@ -94,10 +95,10 @@ in
environment.etc."clamav/freshclam.conf".source = freshclamConfigFile;
environment.etc."clamav/clamd.conf".source = clamdConfigFile;
- systemd.services.clamav-daemon = mkIf cfg.daemon.enable {
+ systemd.services.clamav-daemon = optionalAttrs cfg.daemon.enable {
description = "ClamAV daemon (clamd)";
- after = mkIf cfg.updater.enable [ "clamav-freshclam.service" ];
- requires = mkIf cfg.updater.enable [ "clamav-freshclam.service" ];
+ after = optional cfg.updater.enable "clamav-freshclam.service";
+ requires = optional cfg.updater.enable "clamav-freshclam.service";
wantedBy = [ "multi-user.target" ];
restartTriggers = [ clamdConfigFile ];
@@ -115,7 +116,7 @@ in
};
};
- systemd.timers.clamav-freshclam = mkIf cfg.updater.enable {
+ systemd.timers.clamav-freshclam = optionalAttrs cfg.updater.enable {
description = "Timer for ClamAV virus database updater (freshclam)";
wantedBy = [ "timers.target" ];
timerConfig = {
@@ -124,7 +125,7 @@ in
};
};
- systemd.services.clamav-freshclam = mkIf cfg.updater.enable {
+ systemd.services.clamav-freshclam = optionalAttrs cfg.updater.enable {
description = "ClamAV virus database updater (freshclam)";
restartTriggers = [ freshclamConfigFile ];
diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix
index 6c53a2df6306..39ed506f7617 100644
--- a/nixos/modules/services/security/hologram-agent.nix
+++ b/nixos/modules/services/security/hologram-agent.nix
@@ -35,10 +35,9 @@ in {
config = mkIf cfg.enable {
boot.kernelModules = [ "dummy" ];
- networking.interfaces.dummy0 = {
- ipAddress = "169.254.169.254";
- prefixLength = 32;
- };
+ networking.interfaces.dummy0.ipv4.addresses = [
+ { address = "169.254.169.254"; prefixLength = 32; }
+ ];
systemd.services.hologram-agent = {
description = "Provide EC2 instance credentials to machines outside of EC2";
diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix
index e267fed27955..bad02c7440ba 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixos/modules/services/security/hologram-server.nix
@@ -12,16 +12,20 @@ let
dn = cfg.ldapBindDN;
password = cfg.ldapBindPassword;
};
- insecureldap = cfg.ldapInsecure;
- userattr = cfg.ldapUserAttr;
- baseDN = cfg.ldapBaseDN;
+ insecureldap = cfg.ldapInsecure;
+ userattr = cfg.ldapUserAttr;
+ baseDN = cfg.ldapBaseDN;
+ enableldapRoles = cfg.enableLdapRoles;
+ roleAttr = cfg.roleAttr;
+ groupClassAttr = cfg.groupClassAttr;
};
aws = {
account = cfg.awsAccount;
defaultrole = cfg.awsDefaultRole;
};
- stats = cfg.statsAddress;
- listen = cfg.listenAddress;
+ stats = cfg.statsAddress;
+ listen = cfg.listenAddress;
+ cachetimeout = cfg.cacheTimeoutSeconds;
});
in {
options = {
@@ -70,6 +74,24 @@ in {
description = "Password of account to use to query the LDAP server";
};
+ enableLdapRoles = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to assign user roles based on the user's LDAP group memberships";
+ };
+
+ groupClassAttr = mkOption {
+ type = types.str;
+ default = "groupOfNames";
+ description = "The objectclass attribute to search for groups when enableLdapRoles is true";
+ };
+
+ roleAttr = mkOption {
+ type = types.str;
+ default = "businessCategory";
+ description = "Which LDAP group attribute to search for authorized role ARNs";
+ };
+
awsAccount = mkOption {
type = types.str;
description = "AWS account number";
@@ -85,6 +107,12 @@ in {
default = "";
description = "Address of statsd server";
};
+
+ cacheTimeoutSeconds = mkOption {
+ type = types.int;
+ default = 3600;
+ description = "How often (in seconds) to refresh the LDAP cache";
+ };
};
};
diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix
index 30224d7fc6ba..97fbd6aae6e0 100644
--- a/nixos/modules/services/security/physlock.nix
+++ b/nixos/modules/services/security/physlock.nix
@@ -30,6 +30,20 @@ in
'';
};
+ allowAnyUser = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to allow any user to lock the screen. This will install a
+ setuid wrapper to allow any user to start physlock as root, which
+ is a minor security risk. Call the physlock binary to use this instead
+ of using the systemd service.
+
+ Note that you might need to relog to have the correct binary in your
+ PATH upon changing this option.
+ '';
+ };
+
disableSysRq = mkOption {
type = types.bool;
default = true;
@@ -79,28 +93,36 @@ in
###### implementation
- config = mkIf cfg.enable {
+ config = mkIf cfg.enable (mkMerge [
+ {
- # for physlock -l and physlock -L
- environment.systemPackages = [ pkgs.physlock ];
+ # for physlock -l and physlock -L
+ environment.systemPackages = [ pkgs.physlock ];
- systemd.services."physlock" = {
- enable = true;
- description = "Physlock";
- wantedBy = optional cfg.lockOn.suspend "suspend.target"
- ++ optional cfg.lockOn.hibernate "hibernate.target"
- ++ cfg.lockOn.extraTargets;
- before = optional cfg.lockOn.suspend "systemd-suspend.service"
- ++ optional cfg.lockOn.hibernate "systemd-hibernate.service"
- ++ cfg.lockOn.extraTargets;
- serviceConfig.Type = "forking";
- script = ''
- ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}
- '';
- };
+ systemd.services."physlock" = {
+ enable = true;
+ description = "Physlock";
+ wantedBy = optional cfg.lockOn.suspend "suspend.target"
+ ++ optional cfg.lockOn.hibernate "hibernate.target"
+ ++ cfg.lockOn.extraTargets;
+ before = optional cfg.lockOn.suspend "systemd-suspend.service"
+ ++ optional cfg.lockOn.hibernate "systemd-hibernate.service"
+ ++ cfg.lockOn.extraTargets;
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}";
+ };
+ };
- security.pam.services.physlock = {};
+ security.pam.services.physlock = {};
- };
+ }
+
+ (mkIf cfg.allowAnyUser {
+
+ security.wrappers.physlock = { source = "${pkgs.physlock}/bin/physlock"; user = "root"; };
+
+ })
+ ]);
}
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index bc79d9f2a590..fed91756e769 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -9,6 +9,26 @@ let
opt = name: value: optionalString (value != null) "${name} ${value}";
optint = name: value: optionalString (value != null && value != 0) "${name} ${toString value}";
+ isolationOptions = {
+ type = types.listOf (types.enum [
+ "IsolateClientAddr"
+ "IsolateSOCKSAuth"
+ "IsolateClientProtocol"
+ "IsolateDestPort"
+ "IsolateDestAddr"
+ ]);
+ default = [];
+ example = [
+ "IsolateClientAddr"
+ "IsolateSOCKSAuth"
+ "IsolateClientProtocol"
+ "IsolateDestPort"
+ "IsolateDestAddr"
+ ];
+ description = "Tor isolation options";
+ };
+
+
torRc = ''
User tor
DataDirectory ${torDirectory}
@@ -20,10 +40,20 @@ let
${optint "ControlPort" cfg.controlPort}
''
# Client connection config
- + optionalString cfg.client.enable ''
- SOCKSPort ${cfg.client.socksListenAddress} IsolateDestAddr
+ + optionalString cfg.client.enable ''
+ SOCKSPort ${cfg.client.socksListenAddress} ${toString cfg.client.socksIsolationOptions}
SOCKSPort ${cfg.client.socksListenAddressFaster}
${opt "SocksPolicy" cfg.client.socksPolicy}
+
+ ${optionalString cfg.client.transparentProxy.enable ''
+ TransPort ${cfg.client.transparentProxy.listenAddress} ${toString cfg.client.transparentProxy.isolationOptions}
+ ''}
+
+ ${optionalString cfg.client.dns.enable ''
+ DNSPort ${cfg.client.dns.listenAddress} ${toString cfg.client.dns.isolationOptions}
+ AutomapHostsOnResolve 1
+ AutomapHostsSuffixes ${concatStringsSep "," cfg.client.dns.automapHostsSuffixes}
+ ''}
''
# Relay config
+ optionalString cfg.relay.enable ''
@@ -58,6 +88,9 @@ let
${flip concatMapStrings v.map (p: ''
HiddenServicePort ${toString p.port} ${p.destination}
'')}
+ ${optionalString (v.authorizeClient != null) ''
+ HiddenServiceAuthorizeClient ${v.authorizeClient.authType} ${concatStringsSep "," v.authorizeClient.clientNames}
+ ''}
''))
+ cfg.extraConfig;
@@ -154,6 +187,55 @@ in
'';
};
+ socksIsolationOptions = mkOption (isolationOptions // {
+ default = ["IsolateDestAddr"];
+ });
+
+ transparentProxy = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable tor transaprent proxy";
+ };
+
+ listenAddress = mkOption {
+ type = types.str;
+ default = "127.0.0.1:9040";
+ example = "192.168.0.1:9040";
+ description = ''
+ Bind transparent proxy to this address.
+ '';
+ };
+
+ isolationOptions = mkOption isolationOptions;
+ };
+
+ dns = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable tor dns resolver";
+ };
+
+ listenAddress = mkOption {
+ type = types.str;
+ default = "127.0.0.1:9053";
+ example = "192.168.0.1:9053";
+ description = ''
+ Bind tor dns to this address.
+ '';
+ };
+
+ isolationOptions = mkOption isolationOptions;
+
+ automapHostsSuffixes = mkOption {
+ type = types.listOf types.str;
+ default = [".onion" ".exit"];
+ example = [".onion"];
+ description = "List of suffixes to use with automapHostsOnResolve";
+ };
+ };
+
privoxy.enable = mkOption {
type = types.bool;
default = true;
@@ -540,6 +622,33 @@ in
}));
};
+ authorizeClient = mkOption {
+ default = null;
+ description = "If configured, the hidden service is accessible for authorized clients only.";
+ type = types.nullOr (types.submodule ({config, ...}: {
+
+ options = {
+
+ authType = mkOption {
+ type = types.enum [ "basic" "stealth" ];
+ description = ''
+ Either "basic" for a general-purpose authorization protocol
+ or "stealth" for a less scalable protocol
+ that also hides service activity from unauthorized clients.
+ '';
+ };
+
+ clientNames = mkOption {
+ type = types.nonEmptyListOf (types.strMatching "[A-Za-z0-9+-_]+");
+ description = ''
+ Only clients that are listed here are authorized to access the hidden service.
+ Generated authorization data can be found in ${torDirectory}/onion/$name/hostname.
+ Clients need to put this authorization data in their configuration file using HidServAuth.
+ '';
+ };
+ };
+ }));
+ };
};
config = {
diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix
index a29cb3f33dae..08da726437ea 100644
--- a/nixos/modules/services/security/torify.nix
+++ b/nixos/modules/services/security/torify.nix
@@ -7,7 +7,7 @@ let
torify = pkgs.writeTextFile {
name = "tsocks";
text = ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.tsocks.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@"
'';
executable = true;
diff --git a/nixos/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix
index 1b5a05b21e77..c60c745443bc 100644
--- a/nixos/modules/services/security/torsocks.nix
+++ b/nixos/modules/services/security/torsocks.nix
@@ -23,7 +23,7 @@ let
wrapTorsocks = name: server: pkgs.writeTextFile {
name = name;
text = ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (configFile server)} ${pkgs.torsocks}/bin/torsocks "$@"
'';
executable = true;
diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix
index 1f2c56a9efa1..5d469cabe2cb 100644
--- a/nixos/modules/services/security/usbguard.nix
+++ b/nixos/modules/services/security/usbguard.nix
@@ -56,7 +56,7 @@ in {
};
rules = mkOption {
- type = types.nullOr types.str;
+ type = types.nullOr types.lines;
default = null;
example = ''
allow with-interface equals { 08:*:* }
@@ -192,7 +192,7 @@ in {
serviceConfig = {
Type = "simple";
- ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -d -k -c ${daemonConfFile}'';
+ ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -P -d -k -c ${daemonConfFile}'';
Restart = "on-failure";
};
};
diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix
new file mode 100644
index 000000000000..b9355bbb9441
--- /dev/null
+++ b/nixos/modules/services/system/localtime.nix
@@ -0,0 +1,60 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.localtime;
+in {
+ options = {
+ services.localtime = {
+ enable = mkOption {
+ default = false;
+ description = ''
+ Enable localtime, simple daemon for keeping the system
+ timezone up-to-date based on the current location. It uses geoclue2 to
+ determine the current location and systemd-timedated to actually set
+ the timezone.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.geoclue2.enable = true;
+
+ security.polkit.extraConfig = ''
+ polkit.addRule(function(action, subject) {
+ if (action.id == "org.freedesktop.timedate1.set-timezone"
+ && subject.user == "localtimed") {
+ return polkit.Result.YES;
+ }
+ });
+ '';
+
+ users.users = [{
+ name = "localtimed";
+ description = "Taskserver user";
+ }];
+
+ systemd.services.localtime = {
+ description = "localtime service";
+ wantedBy = [ "multi-user.target" ];
+ partOf = [ "geoclue.service "];
+
+ serviceConfig = {
+ Restart = "on-failure";
+ # TODO: make it work with dbus
+ #DynamicUser = true;
+ Nice = 10;
+ User = "localtimed";
+ PrivateTmp = "yes";
+ PrivateDevices = true;
+ PrivateNetwork = "yes";
+ NoNewPrivileges = "yes";
+ ProtectSystem = "strict";
+ ProtectHome = true;
+ ExecStart = "${pkgs.localtime}/bin/localtimed";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index dd6b585b7e23..4911a64c95d0 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -90,7 +90,7 @@ in
# 1) Only the "transmission" user and group have access to torrents.
# 2) Optionally update/force specific fields into the configuration file.
serviceConfig.ExecStartPre = ''
- ${pkgs.stdenv.shell} -c "mkdir -p ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && chmod 770 ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json"
+ ${pkgs.runtimeShell} -c "mkdir -p ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && chmod 770 ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json"
'';
serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}";
serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index 3429397d2cc2..b50de496e975 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -64,8 +64,8 @@ in
config = {
# Note: this is set here rather than up there so that changing
- # nixosLabel would not rebuild manual pages
- services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixosLabel} (\m) - \l >>>'';
+ # nixos.label would not rebuild manual pages
+ services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>'';
systemd.services."getty@" =
{ serviceConfig.ExecStart = [
diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml
similarity index 58%
rename from nixos/modules/services/web-apps/piwik-doc.xml
rename to nixos/modules/services/web-apps/matomo-doc.xml
index a393a182d36a..456aae6cc366 100644
--- a/nixos/modules/services/web-apps/piwik-doc.xml
+++ b/nixos/modules/services/web-apps/matomo-doc.xml
@@ -2,16 +2,16 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
- xml:id="module-services-piwik">
+ xml:id="module-services-matomo">
- Piwik
+ Matomo
- Piwik is a real-time web analytics application.
- This module configures php-fpm as backend for piwik, optionally configuring an nginx vhost as well.
+ Matomo is a real-time web analytics application.
+ This module configures php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
- An automatic setup is not suported by piwik, so you need to configure piwik itself in the browser-based piwik setup.
+ An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup.
@@ -19,7 +19,7 @@
Database Setup
- You also need to configure a MariaDB or MySQL database and -user for piwik yourself,
+ You also need to configure a MariaDB or MySQL database and -user for Matomo yourself,
and enter those credentials in your browser.
You can use passwordless database authentication via the UNIX_SOCKET authentication plugin
with the following SQL commands:
@@ -27,20 +27,20 @@
# For MariaDB
INSTALL PLUGIN unix_socket SONAME 'auth_socket';
- CREATE DATABASE piwik;
- CREATE USER 'piwik'@'localhost' IDENTIFIED WITH unix_socket;
- GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost';
+ CREATE DATABASE matomo;
+ CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket;
+ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
# For MySQL
INSTALL PLUGIN auth_socket SONAME 'auth_socket.so';
- CREATE DATABASE piwik;
- CREATE USER 'piwik'@'localhost' IDENTIFIED WITH auth_socket;
- GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost';
+ CREATE DATABASE matomo;
+ CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket;
+ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
- Then fill in piwik as database user and database name, and leave the password field blank.
- This authentication works by allowing only the piwik unix user to authenticate as the
- piwik database user (without needing a password), but no other users.
+ Then fill in matomo as database user and database name, and leave the password field blank.
+ This authentication works by allowing only the matomo unix user to authenticate as the
+ matomo database user (without needing a password), but no other users.
For more information on passwordless login, see
.
@@ -55,9 +55,9 @@
Backup
You only need to take backups of your MySQL database and the
- /var/lib/piwik/config/config.ini.php file.
- Use a user in the piwik group or root to access the file.
- For more information, see .
+ /var/lib/matomo/config/config.ini.php file.
+ Use a user in the matomo group or root to access the file.
+ For more information, see .
@@ -67,14 +67,14 @@
- Piwik's file integrity check will warn you.
+ Matomo's file integrity check will warn you.
This is due to the patches necessary for NixOS, you can safely ignore this.
- Piwik will warn you that the JavaScript tracker is not writable.
+ Matomo will warn you that the JavaScript tracker is not writable.
This is because it's located in the read-only nix store.
You can safely ignore this, unless you need a plugin that needs JavaScript tracker access.
@@ -88,7 +88,7 @@
You can use other web servers by forwarding calls for index.php and
- piwik.php to the /run/phpfpm-piwik.sock fastcgi unix socket.
+ piwik.php to the /run/phpfpm-matomo.sock fastcgi unix socket.
You can use the nginx configuration in the module code as a reference to what else should be configured.
diff --git a/nixos/modules/services/web-apps/piwik.nix b/nixos/modules/services/web-apps/matomo.nix
similarity index 73%
rename from nixos/modules/services/web-apps/piwik.nix
rename to nixos/modules/services/web-apps/matomo.nix
index ce86c6873dd4..ef6ac9698e21 100644
--- a/nixos/modules/services/web-apps/piwik.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -1,10 +1,11 @@
{ config, lib, pkgs, services, ... }:
with lib;
let
- cfg = config.services.piwik;
+ cfg = config.services.matomo;
- user = "piwik";
+ user = "matomo";
dataDir = "/var/lib/${user}";
+ deprecatedDataDir = "/var/lib/piwik";
pool = user;
# it's not possible to use /run/phpfpm/${pool}.sock because /run/phpfpm/ is root:root 0770,
@@ -13,17 +14,22 @@ let
phpExecutionUnit = "phpfpm-${pool}";
databaseService = "mysql.service";
+ fqdn =
+ let
+ join = hostName: domain: hostName + optionalString (domain != null) ".${domain}";
+ in join config.networking.hostName config.networking.domain;
+
in {
options = {
- services.piwik = {
+ services.matomo = {
# NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963
- # piwik issue for automatic piwik setup: https://github.com/piwik/piwik/issues/10257
- # TODO: find a nice way to do this when more NixOS MySQL and / or piwik automatic setup stuff is implemented.
+ # matomo issue for automatic matomo setup: https://github.com/matomo-org/matomo/issues/10257
+ # TODO: find a nice way to do this when more NixOS MySQL and / or matomo automatic setup stuff is implemented.
enable = mkOption {
type = types.bool;
default = false;
description = ''
- Enable piwik web analytics with php-fpm backend.
+ Enable matomo web analytics with php-fpm backend.
Either the nginx option or the webServerUser option is mandatory.
'';
};
@@ -32,8 +38,9 @@ in {
type = types.nullOr types.str;
default = null;
example = "lighttpd";
+ # TODO: piwik.php might get renamed to matomo.php in future releases
description = ''
- Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for piwik if the nginx
+ Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for matomo if the nginx
option is not used. Either this option or the nginx option is mandatory.
If you want to use another webserver than nginx, you need to set this to that server's user
and pass fastcgi requests to `index.php` and `piwik.php` to this socket.
@@ -55,7 +62,7 @@ in {
catch_workers_output = yes
'';
description = ''
- Settings for phpfpm's process manager. You might need to change this depending on the load for piwik.
+ Settings for phpfpm's process manager. You might need to change this depending on the load for matomo.
'';
};
@@ -65,7 +72,7 @@ in {
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; })
{
# enable encryption by default,
- # as sensitive login and piwik data should not be transmitted in clear text.
+ # as sensitive login and matomo data should not be transmitted in clear text.
options.forceSSL.default = true;
options.enableACME.default = true;
}
@@ -73,15 +80,19 @@ in {
);
default = null;
example = {
- serverName = "stats.$\{config.networking.hostName\}";
+ serverAliases = [
+ "matomo.$\{config.networking.domain\}"
+ "stats.$\{config.networking.domain\}"
+ ];
enableACME = false;
};
description = ''
- With this option, you can customize an nginx virtualHost which already has sensible defaults for piwik.
+ With this option, you can customize an nginx virtualHost which already has sensible defaults for matomo.
Either this option or the webServerUser option is mandatory.
Set this to {} to just enable the virtualHost if you don't need any customization.
- If enabled, then by default, the serverName is piwik.$\{config.networking.hostName\}, SSL is active,
- and certificates are acquired via ACME.
+ If enabled, then by default, the is
+ ${user}.$\{config.networking.hostName\}.$\{config.networking.domain\},
+ SSL is active, and certificates are acquired via ACME.
If this is set to null (the default), no nginx virtualHost will be configured.
'';
};
@@ -90,12 +101,12 @@ in {
config = mkIf cfg.enable {
warnings = mkIf (cfg.nginx != null && cfg.webServerUser != null) [
- "If services.piwik.nginx is set, services.piwik.nginx.webServerUser is ignored and should be removed."
+ "If services.matomo.nginx is set, services.matomo.nginx.webServerUser is ignored and should be removed."
];
assertions = [ {
assertion = cfg.nginx != null || cfg.webServerUser != null;
- message = "Either services.piwik.nginx or services.piwik.nginx.webServerUser is mandatory";
+ message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory";
}];
users.extraUsers.${user} = {
@@ -106,19 +117,20 @@ in {
};
users.extraGroups.${user} = {};
- systemd.services.piwik_setup_update = {
- # everything needs to set up and up to date before piwik php files are executed
+ systemd.services.matomo_setup_update = {
+ # everything needs to set up and up to date before matomo php files are executed
requiredBy = [ "${phpExecutionUnit}.service" ];
before = [ "${phpExecutionUnit}.service" ];
# the update part of the script can only work if the database is already up and running
requires = [ databaseService ];
after = [ databaseService ];
- path = [ pkgs.piwik ];
+ path = [ pkgs.matomo ];
serviceConfig = {
Type = "oneshot";
User = user;
# hide especially config.ini.php from other
UMask = "0007";
+ # TODO: might get renamed to MATOMO_USER_PATH in future versions
Environment = "PIWIK_USER_PATH=${dataDir}";
# chown + chmod in preStart needs root
PermissionsStartOnly = true;
@@ -127,27 +139,32 @@ in {
# e.g. after restoring from backup or moving from another system.
# Note that ${dataDir}/config/config.ini.php might contain the MySQL password.
preStart = ''
+ # migrate data from piwik to matomo folder
+ if [ -d ${deprecatedDataDir} ]; then
+ echo "Migrating from ${deprecatedDataDir} to ${dataDir}"
+ mv -T ${deprecatedDataDir} ${dataDir}
+ fi
chown -R ${user}:${user} ${dataDir}
chmod -R ug+rwX,o-rwx ${dataDir}
'';
script = ''
- # Use User-Private Group scheme to protect piwik data, but allow administration / backup via piwik group
+ # Use User-Private Group scheme to protect matomo data, but allow administration / backup via matomo group
# Copy config folder
chmod g+s "${dataDir}"
- cp -r "${pkgs.piwik}/config" "${dataDir}/"
+ cp -r "${pkgs.matomo}/config" "${dataDir}/"
chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
# check whether user setup has already been done
if test -f "${dataDir}/config/config.ini.php"; then
# then execute possibly pending database upgrade
- piwik-console core:update --yes
+ matomo-console core:update --yes
fi
'';
};
systemd.services.${phpExecutionUnit} = {
- # stop phpfpm on package upgrade, do database upgrade via piwik_setup_update, and then restart
- restartTriggers = [ pkgs.piwik ];
+ # stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart
+ restartTriggers = [ pkgs.matomo ];
# stop config.ini.php from getting written with read permission for others
serviceConfig.UMask = "0007";
};
@@ -175,14 +192,14 @@ in {
# References:
# https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html
# https://github.com/perusio/piwik-nginx
- "${user}.${config.networking.hostName}" = mkMerge [ cfg.nginx {
- # don't allow to override the root easily, as it will almost certainly break piwik.
+ "${user}.${fqdn}" = mkMerge [ cfg.nginx {
+ # don't allow to override the root easily, as it will almost certainly break matomo.
# disadvantage: not shown as default in docs.
- root = mkForce "${pkgs.piwik}/share";
+ root = mkForce "${pkgs.matomo}/share";
# define locations here instead of as the submodule option's default
# so that they can easily be extended with additional locations if required
- # without needing to redefine the piwik ones.
+ # without needing to redefine the matomo ones.
# disadvantage: not shown as default in docs.
locations."/" = {
index = "index.php";
@@ -191,6 +208,7 @@ in {
locations."= /index.php".extraConfig = ''
fastcgi_pass unix:${phpSocket};
'';
+ # TODO: might get renamed to matomo.php in future versions
# allow piwik.php for tracking
locations."= /piwik.php".extraConfig = ''
fastcgi_pass unix:${phpSocket};
@@ -212,6 +230,7 @@ in {
locations."= /robots.txt".extraConfig = ''
return 200 "User-agent: *\nDisallow: /\n";
'';
+ # TODO: might get renamed to matomo.js in future versions
# let browsers cache piwik.js
locations."= /piwik.js".extraConfig = ''
expires 1M;
@@ -221,7 +240,7 @@ in {
};
meta = {
- doc = ./piwik-doc.xml;
+ doc = ./matomo-doc.xml;
maintainers = with stdenv.lib.maintainers; [ florianjacob ];
};
}
diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix
index a750aa66b27c..f6a5ce73a12b 100644
--- a/nixos/modules/services/web-apps/nexus.nix
+++ b/nixos/modules/services/web-apps/nexus.nix
@@ -11,7 +11,7 @@ in
{
options = {
services.nexus = {
- enable = mkEnableOption "SonarType Nexus3 OSS service";
+ enable = mkEnableOption "Sonatype Nexus3 OSS service";
user = mkOption {
type = types.str;
@@ -54,7 +54,7 @@ in
users.extraGroups."${cfg.group}" = {};
systemd.services.nexus = {
- description = "SonarType Nexus3";
+ description = "Sonatype Nexus3";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/web-apps/nixbot.nix b/nixos/modules/services/web-apps/nixbot.nix
deleted file mode 100644
index 0592d01bf369..000000000000
--- a/nixos/modules/services/web-apps/nixbot.nix
+++ /dev/null
@@ -1,149 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.nixbot;
- pyramidIni = ''
- ###
- # app configuration
- # http://docs.pylonsproject.org/projects/pyramid/en/1.7-branch/narr/environment.html
- ###
-
- [app:main]
- use = egg:nixbot
-
- nixbot.github_token = ${cfg.githubToken}
- nixbot.bot_name = ${cfg.botName}
- nixbot.repo = ${cfg.repo}
- nixbot.pr_repo = ${cfg.prRepo}
- nixbot.hydra_jobsets_repo = ${cfg.hydraJobsetsRepo}
- nixbot.github_secret = justnotsorandom
- nixbot.public_url = ${cfg.publicUrl}
- nixbot.repo_dir = ${cfg.repoDir}
-
- pyramid.reload_templates = false
- pyramid.debug_authorization = false
- pyramid.debug_notfound = false
- pyramid.debug_routematch = false
- pyramid.default_locale_name = en
-
- # By default, the toolbar only appears for clients from IP addresses
- # '127.0.0.1' and '::1'.
- # debugtoolbar.hosts = 127.0.0.1 ::1
-
- ###
- # wsgi server configuration
- ###
-
- [server:main]
- use = egg:waitress#main
- host = 0.0.0.0
- port = 6543
-
- ###
- # logging configuration
- # http://docs.pylonsproject.org/projects/pyramid/en/1.7-branch/narr/logging.html
- ###
-
- [loggers]
- keys = root, nixbot
-
- [handlers]
- keys = console
-
- [formatters]
- keys = generic
-
- [logger_root]
- level = INFO
- handlers = console
-
- [logger_nixbot]
- level = INFO
- handlers =
- qualname = nixbot
-
- [handler_console]
- class = StreamHandler
- args = (sys.stderr,)
- level = NOTSET
- formatter = generic
-
- [formatter_generic]
- format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s
- '';
-in {
- options = {
- services.nixbot = {
- enable = mkEnableOption "nixbot";
-
- botName = mkOption {
- type = types.str;
- description = "The bot's github user account name.";
- default = "nixbot";
- };
-
- githubToken = mkOption {
- type = types.str;
- description = "The bot's github user account token.";
- example = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
- };
-
- repo = mkOption {
- type = types.str;
- description = "The github repository to check for PRs.";
- example = "nixos/nixpkgs";
- };
-
- prRepo = mkOption {
- type = types.str;
- description = "The github repository to push the testing branches to.";
- example = "nixos/nixpkgs-pr";
- };
-
- hydraJobsetsRepo = mkOption {
- type = types.str;
- description = "The github repository to push the hydra jobset definitions to.";
- example = "nixos/hydra-jobsets";
- };
-
- publicUrl = mkOption {
- type = types.str;
- description = "The public URL the bot is reachable at (Github hook endpoint).";
- example = "https://nixbot.nixos.org";
- };
-
- repoDir = mkOption {
- type = types.path;
- description = "The directory the repositories are stored in.";
- default = "/var/lib/nixbot";
- };
- };
- };
-
- config = mkIf cfg.enable {
- users.extraUsers.nixbot = {
- createHome = true;
- home = cfg.repoDir;
- };
-
- systemd.services.nixbot = let
- env = pkgs.python3.buildEnv.override {
- extraLibs = [ pkgs.nixbot ];
- };
- in {
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
- script = ''
- ${env}/bin/pserve ${pkgs.writeText "production.ini" pyramidIni}
- '';
-
- serviceConfig = {
- User = "nixbot";
- Group = "nogroup";
- PermissionsStartOnly = true;
- };
- };
- };
-}
diff --git a/nixos/modules/services/web-apps/pump.io-configure.js b/nixos/modules/services/web-apps/pump.io-configure.js
deleted file mode 100644
index 1fbf346a34c4..000000000000
--- a/nixos/modules/services/web-apps/pump.io-configure.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var fs = require('fs');
-
-var opts = JSON.parse(fs.readFileSync("/dev/stdin").toString());
-var config = opts.config;
-
-var readSecret = function(filename) {
- return fs.readFileSync(filename).toString().trim();
-};
-
-if (opts.secretFile) {
- config.secret = readSecret(opts.secretFile);
-}
-if (opts.dbPasswordFile) {
- config.params.dbpass = readSecret(opts.dbPasswordFile);
-}
-if (opts.smtpPasswordFile) {
- config.smtppass = readSecret(opts.smtpPasswordFile);
-}
-if (opts.spamClientSecretFile) {
- config.spamclientsecret = readSecret(opts.opts.spamClientSecretFile);
-}
-
-fs.writeFileSync(opts.outputFile, JSON.stringify(config));
diff --git a/nixos/modules/services/web-apps/pump.io.nix b/nixos/modules/services/web-apps/pump.io.nix
deleted file mode 100644
index 27ae68516367..000000000000
--- a/nixos/modules/services/web-apps/pump.io.nix
+++ /dev/null
@@ -1,438 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.pumpio;
- dataDir = "/var/lib/pump.io";
- runDir = "/run/pump.io";
- user = "pumpio";
-
- optionalSet = condition: value: if condition then value else {};
-
- configScript = ./pump.io-configure.js;
- configOptions = {
- outputFile = "${runDir}/config.json";
- config =
- (optionalSet (cfg.driver != "disk") {
- driver = cfg.driver;
- }) //
- {
- params = (optionalSet (cfg.driver == "disk") { dir = dataDir; }) //
- (optionalSet (cfg.driver == "mongodb" || cfg.driver == "redis") {
- host = cfg.dbHost;
- port = cfg.dbPort;
- dbname = cfg.dbName;
- dbuser = cfg.dbUser;
- dbpass = cfg.dbPassword;
- }) //
- (optionalSet (cfg.driver == "memcached") {
- host = cfg.dbHost;
- port = cfg.dbPort;
- }) // cfg.driverParams;
- secret = cfg.secret;
-
- address = cfg.address;
- port = cfg.port;
-
- noweb = false;
- urlPort = cfg.urlPort;
- hostname = cfg.hostname;
- favicon = cfg.favicon;
-
- site = cfg.site;
- owner = cfg.owner;
- ownerURL = cfg.ownerURL;
-
- key = cfg.sslKey;
- cert = cfg.sslCert;
- bounce = false;
-
- spamhost = cfg.spamHost;
- spamclientid = cfg.spamClientId;
- spamclientsecret = cfg.spamClientSecret;
-
- requireEmail = cfg.requireEmail;
- smtpserver = cfg.smtpHost;
- smtpport = cfg.smtpPort;
- smtpuser = cfg.smtpUser;
- smtppass = cfg.smtpPassword;
- smtpusessl = cfg.smtpUseSSL;
- smtpfrom = cfg.smtpFrom;
-
- nologger = false;
- enableUploads = cfg.enableUploads;
- datadir = dataDir;
- debugClient = false;
- firehose = cfg.firehose;
- disableRegistration = cfg.disableRegistration;
-
- inherit (cfg) secretFile dbPasswordFile smtpPasswordFile spamClientSecretFile;
- } //
- (optionalSet (cfg.port < 1024) {
- serverUser = user; # have pump.io listen then drop privileges
- }) // cfg.extraConfig;
-}; in {
- options = {
-
- services.pumpio = {
-
- enable = mkEnableOption "Pump.io social streams server";
-
- secret = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "my dog has fleas";
- description = ''
- A session-generating secret, server-wide password. Warning:
- this is stored in cleartext in the Nix store!
- '';
- };
-
- secretFile = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/run/keys/pump.io-secret";
- description = ''
- A file containing the session-generating secret,
- server-wide password.
- '';
- };
-
- site = mkOption {
- type = types.str;
- example = "Awesome Sauce";
- description = "Name of the server";
- };
-
- owner = mkOption {
- type = types.str;
- default = "";
- example = "Awesome Inc.";
- description = "Name of owning entity, if you want to link to it.";
- };
-
- ownerURL = mkOption {
- type = types.str;
- default = "";
- example = "https://pump.io";
- description = "URL of owning entity, if you want to link to it.";
- };
-
- address = mkOption {
- type = types.str;
- default = "localhost";
- description = ''
- Web server listen address.
- '';
- };
-
- port = mkOption {
- type = types.int;
- default = 31337;
- description = ''
- Port to listen on. Defaults to 31337, which is suitable for
- running behind a reverse proxy. For a standalone server,
- use 443.
- '';
- };
-
- hostname = mkOption {
- type = types.nullOr types.str;
- default = "localhost";
- description = ''
- The hostname of the server, used for generating
- URLs. Defaults to "localhost" which doesn't do much for you.
- '';
- };
-
- urlPort = mkOption {
- type = types.int;
- default = 443;
- description = ''
- Port to use for generating URLs. This basically has to be
- either 80 or 443 because the host-meta and Webfinger
- protocols don't make any provision for HTTP/HTTPS servers
- running on other ports.
- '';
- };
-
- favicon = mkOption {
- type = types.nullOr types.path;
- default = null;
- description = ''
- Local filesystem path to the favicon.ico file to use. This
- will be served as "/favicon.ico" by the server.
- '';
- };
-
- enableUploads = mkOption {
- type = types.bool;
- default = true;
- description = ''
- If you want to disable file uploads, set this to false. Uploaded files will be stored
- in ${dataDir}/uploads.
- '';
- };
-
- sslKey = mkOption {
- type = types.path;
- example = "${dataDir}/myserver.key";
- default = "";
- description = ''
- The path to the server certificate private key. The
- certificate is required, but it can be self-signed.
- '';
- };
-
- sslCert = mkOption {
- type = types.path;
- example = "${dataDir}/myserver.crt";
- default = "";
- description = ''
- The path to the server certificate. The certificate is
- required, but it can be self-signed.
- '';
- };
-
- firehose = mkOption {
- type = types.str;
- default = "ofirehose.com";
- description = ''
- Firehose host running the ofirehose software. Defaults to
- "ofirehose.com". Public notices will be ping this firehose
- server and from there go out to search engines and the
- world. If you want to disconnect from the public web, set
- this to something falsy.
- '';
- };
-
- disableRegistration = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Disables registering new users on the site through the Web
- or the API.
- '';
- };
-
- requireEmail = mkOption {
- type = types.bool;
- default = false;
- description = "Require an e-mail address to register.";
- };
-
- extraConfig = mkOption {
- default = { };
- description = ''
- Extra configuration options which are serialized to json and added
- to the pump.io.json config file.
- '';
- };
-
- driver = mkOption {
- type = types.enum [ "mongodb" "disk" "lrucache" "memcached" "redis" ];
- default = "mongodb";
- description = "Type of database. Corresponds to a nodejs databank driver.";
- };
-
- driverParams = mkOption {
- default = { };
- description = "Extra parameters for the driver.";
- };
-
- dbHost = mkOption {
- type = types.str;
- default = "localhost";
- description = "The database host to connect to.";
- };
-
- dbPort = mkOption {
- type = types.int;
- default = 27017;
- description = "The port that the database is listening on.";
- };
-
- dbName = mkOption {
- type = types.str;
- default = "pumpio";
- description = "The name of the database to use.";
- };
-
- dbUser = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- The username. Defaults to null, meaning no authentication.
- '';
- };
-
- dbPassword = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- The password corresponding to dbUser. Warning: this is
- stored in cleartext in the Nix store!
- '';
- };
-
- dbPasswordFile = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/run/keys/pump.io-dbpassword";
- description = ''
- A file containing the password corresponding to dbUser.
- '';
- };
-
- smtpHost = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "localhost";
- description = ''
- Server to use for sending transactional email. If it's not
- set up, no email is sent and features like password recovery
- and email notification won't work.
- '';
- };
-
- smtpPort = mkOption {
- type = types.int;
- default = 25;
- description = ''
- Port to connect to on SMTP server.
- '';
- };
-
- smtpUser = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- Username to use to connect to SMTP server. Might not be
- necessary for some servers.
- '';
- };
-
- smtpPassword = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- Password to use to connect to SMTP server. Might not be
- necessary for some servers. Warning: this is stored in
- cleartext in the Nix store!
- '';
- };
-
- smtpPasswordFile = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/run/keys/pump.io-smtppassword";
- description = ''
- A file containing the password used to connect to SMTP
- server. Might not be necessary for some servers.
- '';
- };
-
-
- smtpUseSSL = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Only use SSL with the SMTP server. By default, a SSL
- connection is negotiated using TLS. You may need to change
- the smtpPort value if you set this.
- '';
- };
-
- smtpFrom = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- Email address to use in the "From:" header of outgoing
- notifications. Defaults to 'no-reply@' plus the site
- hostname.
- '';
- };
-
- spamHost = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- Host running activityspam software to use to test updates
- for spam.
- '';
- };
- spamClientId = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = "OAuth pair for spam server.";
- };
- spamClientSecret = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- OAuth pair for spam server. Warning: this is
- stored in cleartext in the Nix store!
- '';
- };
- spamClientSecretFile = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/run/keys/pump.io-spamclientsecret";
- description = ''
- A file containing the OAuth key for the spam server.
- '';
- };
- };
-
- };
-
- config = mkIf cfg.enable {
- warnings = let warn = k: optional (cfg.${k} != null)
- "config.services.pumpio.${k} is insecure. Use ${k}File instead.";
- in concatMap warn [ "secret" "dbPassword" "smtpPassword" "spamClientSecret" ];
-
- assertions = [
- { assertion = !(isNull cfg.secret && isNull cfg.secretFile);
- message = "pump.io needs a secretFile configured";
- }
- ];
-
- systemd.services."pump.io" =
- { description = "Pump.io - stream server that does most of what people really want from a social network";
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
-
- preStart = ''
- mkdir -p ${dataDir}/uploads
- mkdir -p ${runDir}
- chown pumpio:pumpio ${dataDir}/uploads ${runDir}
- chmod 770 ${dataDir}/uploads ${runDir}
-
- ${pkgs.nodejs}/bin/node ${configScript} < php.ini: extension = geoip.so
+#expat
+
+let
+ cfg = config.services.restya-board;
+
+ runDir = "/run/restya-board";
+
+ poolName = "restya-board";
+ phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock";
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.restya-board = {
+
+ enable = mkEnableOption "restya-board";
+
+ dataDir = mkOption {
+ type = types.path;
+ default = "/var/lib/restya-board";
+ example = "/var/lib/restya-board";
+ description = ''
+ Data of the application.
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "restya-board";
+ example = "restya-board";
+ description = ''
+ User account under which the web-application runs.
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "nginx";
+ example = "nginx";
+ description = ''
+ Group account under which the web-application runs.
+ '';
+ };
+
+ virtualHost = {
+ serverName = mkOption {
+ type = types.str;
+ default = "restya.board";
+ description = ''
+ Name of the nginx virtualhost to use.
+ '';
+ };
+
+ listenHost = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = ''
+ Listen address for the virtualhost to use.
+ '';
+ };
+
+ listenPort = mkOption {
+ type = types.int;
+ default = 3000;
+ description = ''
+ Listen port for the virtualhost to use.
+ '';
+ };
+ };
+
+ database = {
+ host = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Host of the database. Leave 'null' to use a local PostgreSQL database.
+ A local PostgreSQL database is initialized automatically.
+ '';
+ };
+
+ port = mkOption {
+ type = types.nullOr types.int;
+ default = 5432;
+ description = ''
+ The database's port.
+ '';
+ };
+
+ name = mkOption {
+ type = types.str;
+ default = "restya_board";
+ description = ''
+ Name of the database. The database must exist.
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "restya_board";
+ description = ''
+ The database user. The user must exist and have access to
+ the specified database.
+ '';
+ };
+
+ passwordFile = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ The database user's password. 'null' if no password is set.
+ '';
+ };
+ };
+
+ email = {
+ server = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "localhost";
+ description = ''
+ Hostname to send outgoing mail. Null to use the system MTA.
+ '';
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 25;
+ description = ''
+ Port used to connect to SMTP server.
+ '';
+ };
+
+ login = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ SMTP authentication login used when sending outgoing mail.
+ '';
+ };
+
+ password = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ SMTP authentication password used when sending outgoing mail.
+
+ ATTENTION: The password is stored world-readable in the nix-store!
+ '';
+ };
+ };
+
+ timezone = mkOption {
+ type = types.lines;
+ default = "GMT";
+ description = ''
+ Timezone the web-app runs in.
+ '';
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ services.phpfpm.poolConfigs = {
+ "${poolName}" = ''
+ listen = "${phpfpmSocketName}";
+ listen.owner = nginx
+ listen.group = nginx
+ listen.mode = 0600
+ user = ${cfg.user}
+ group = ${cfg.group}
+ pm = dynamic
+ pm.max_children = 75
+ pm.start_servers = 10
+ pm.min_spare_servers = 5
+ pm.max_spare_servers = 20
+ pm.max_requests = 500
+ catch_workers_output = 1
+ '';
+ };
+
+ services.phpfpm.phpOptions = ''
+ date.timezone = "CET"
+
+ ${optionalString (!isNull cfg.email.server) ''
+ SMTP = ${cfg.email.server}
+ smtp_port = ${toString cfg.email.port}
+ auth_username = ${cfg.email.login}
+ auth_password = ${cfg.email.password}
+ ''}
+ '';
+
+ services.nginx.enable = true;
+ services.nginx.virtualHosts."${cfg.virtualHost.serverName}" = {
+ listen = [ { addr = cfg.virtualHost.listenHost; port = cfg.virtualHost.listenPort; } ];
+ serverName = cfg.virtualHost.serverName;
+ root = runDir;
+ extraConfig = ''
+ index index.html index.php;
+
+ gzip on;
+ gzip_disable "msie6";
+
+ gzip_comp_level 6;
+ gzip_min_length 1100;
+ gzip_buffers 16 8k;
+ gzip_proxied any;
+ gzip_types text/plain application/xml text/css text/js text/xml application/x-javascript text/javascript application/json application/xml+rss;
+
+ client_max_body_size 300M;
+
+ rewrite ^/oauth/authorize$ /server/php/authorize.php last;
+ rewrite ^/oauth_callback/([a-zA-Z0-9_\.]*)/([a-zA-Z0-9_\.]*)$ /server/php/oauth_callback.php?plugin=$1&code=$2 last;
+ rewrite ^/download/([0-9]*)/([a-zA-Z0-9_\.]*)$ /server/php/download.php?id=$1&hash=$2 last;
+ rewrite ^/ical/([0-9]*)/([0-9]*)/([a-z0-9]*).ics$ /server/php/ical.php?board_id=$1&user_id=$2&hash=$3 last;
+ rewrite ^/api/(.*)$ /server/php/R/r.php?_url=$1&$args last;
+ rewrite ^/api_explorer/api-docs/$ /client/api_explorer/api-docs/index.php last;
+ '';
+
+ locations."/".root = "${runDir}/client";
+
+ locations."~ \.php$" = {
+ tryFiles = "$uri =404";
+ extraConfig = ''
+ include ${pkgs.nginx}/conf/fastcgi_params;
+ fastcgi_pass unix:${phpfpmSocketName};
+ fastcgi_index index.php;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param PHP_VALUE "upload_max_filesize=9G \n post_max_size=9G \n max_execution_time=200 \n max_input_time=200 \n memory_limit=256M";
+ '';
+ };
+
+ locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {
+ root = "${runDir}/client";
+ extraConfig = ''
+ if (-f $request_filename) {
+ break;
+ }
+ rewrite ^/img/([a-zA-Z_]*)/([a-zA-Z_]*)/([a-zA-Z0-9_\.]*)$ /server/php/image.php?size=$1&model=$2&filename=$3 last;
+ add_header Cache-Control public;
+ add_header Cache-Control must-revalidate;
+ expires 7d;
+ '';
+ };
+ };
+
+ systemd.services.restya-board-init = {
+ description = "Restya board initialization";
+ serviceConfig.Type = "oneshot";
+ serviceConfig.RemainAfterExit = true;
+
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "postgresql.service" ];
+ after = [ "network.target" "postgresql.service" ];
+
+ script = ''
+ rm -rf "${runDir}"
+ mkdir -m 750 -p "${runDir}"
+ cp -r "${pkgs.restya-board}/"* "${runDir}"
+ sed -i "s/@restya.com/@${cfg.virtualHost.serverName}/g" "${runDir}/sql/restyaboard_with_empty_data.sql"
+ rm -rf "${runDir}/media"
+ rm -rf "${runDir}/client/img"
+ chmod -R 0750 "${runDir}"
+
+ sed -i "s@^php@${config.services.phpfpm.phpPackage}/bin/php@" "${runDir}/server/php/shell/"*.sh
+
+ ${if (isNull cfg.database.host) then ''
+ sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', 'localhost');/g" "${runDir}/server/php/config.inc.php"
+ 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_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"
+ sed -i "s/^.*'R_DB_USER'.*$/define('R_DB_USER', '${cfg.database.user}');/g" "${runDir}/server/php/config.inc.php"
+
+ chmod 0400 "${runDir}/server/php/config.inc.php"
+
+ ln -sf "${cfg.dataDir}/media" "${runDir}/media"
+ ln -sf "${cfg.dataDir}/client/img" "${runDir}/client/img"
+
+ chmod g+w "${runDir}/tmp/cache"
+ chown -R "${cfg.user}"."${cfg.group}" "${runDir}"
+
+
+ mkdir -m 0750 -p "${cfg.dataDir}"
+ mkdir -m 0750 -p "${cfg.dataDir}/media"
+ mkdir -m 0750 -p "${cfg.dataDir}/client/img"
+ cp -r "${pkgs.restya-board}/media/"* "${cfg.dataDir}/media"
+ cp -r "${pkgs.restya-board}/client/img/"* "${cfg.dataDir}/client/img"
+ chown "${cfg.user}"."${cfg.group}" "${cfg.dataDir}"
+ chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media"
+ chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img"
+
+ ${optionalString (isNull cfg.database.host) ''
+ if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \
+ ${config.services.postgresql.package}/bin/psql -U ${config.services.postgresql.superUser} \
+ -c "CREATE USER ${cfg.database.user} WITH ENCRYPTED PASSWORD 'restya'"
+
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \
+ ${config.services.postgresql.package}/bin/psql -U ${config.services.postgresql.superUser} \
+ -c "CREATE DATABASE ${cfg.database.name} OWNER ${cfg.database.user} ENCODING 'UTF8' TEMPLATE template0"
+
+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} \
+ ${config.services.postgresql.package}/bin/psql -U ${cfg.database.user} \
+ -d ${cfg.database.name} -f "${runDir}/sql/restyaboard_with_empty_data.sql"
+
+ touch "${cfg.dataDir}/.db-initialized"
+ fi
+ ''}
+ '';
+ };
+
+ systemd.timers.restya-board = {
+ description = "restya-board scripts for e.g. email notification";
+ wantedBy = [ "timers.target" ];
+ after = [ "restya-board-init.service" ];
+ requires = [ "restya-board-init.service" ];
+ timerConfig = {
+ OnUnitInactiveSec = "60s";
+ Unit = "restya-board-timers.service";
+ };
+ };
+
+ systemd.services.restya-board-timers = {
+ description = "restya-board scripts for e.g. email notification";
+ serviceConfig.Type = "oneshot";
+ serviceConfig.User = cfg.user;
+
+ after = [ "restya-board-init.service" ];
+ requires = [ "restya-board-init.service" ];
+
+ script = ''
+ /bin/sh ${runDir}/server/php/shell/instant_email_notification.sh 2> /dev/null || true
+ /bin/sh ${runDir}/server/php/shell/periodic_email_notification.sh 2> /dev/null || true
+ /bin/sh ${runDir}/server/php/shell/imap.sh 2> /dev/null || true
+ /bin/sh ${runDir}/server/php/shell/webhook.sh 2> /dev/null || true
+ /bin/sh ${runDir}/server/php/shell/card_due_notification.sh 2> /dev/null || true
+ '';
+ };
+
+ users.extraUsers.restya-board = {
+ isSystemUser = true;
+ createHome = false;
+ home = runDir;
+ group = "restya-board";
+ };
+ users.extraGroups.restya-board = {};
+
+ services.postgresql.enable = mkIf (isNull cfg.database.host) true;
+
+ services.postgresql.identMap = optionalString (isNull cfg.database.host)
+ ''
+ restya-board-users restya-board restya_board
+ '';
+
+ services.postgresql.authentication = optionalString (isNull cfg.database.host)
+ ''
+ local restya_board all ident map=restya-board-users
+ '';
+
+ };
+
+}
+
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 76b0ee6da968..8f7a56189a07 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -99,8 +99,8 @@ let
user = mkOption {
type = types.str;
- default = "nginx";
- example = "nginx";
+ default = "tt_rss";
+ example = "tt_rss";
description = ''
User account under which both the update daemon and the web-application run.
'';
@@ -466,26 +466,28 @@ let
'';
};
- services.nginx.virtualHosts = mkIf (cfg.virtualHost != null) {
- "${cfg.virtualHost}" = {
- root = "${cfg.root}";
+ services.nginx = {
+ enable = true;
+ # NOTE: No configuration is done if not using virtual host
+ virtualHosts = mkIf (cfg.virtualHost != null) {
+ "${cfg.virtualHost}" = {
+ root = "${cfg.root}";
- locations."/" = {
- index = "index.php";
- };
+ locations."/" = {
+ index = "index.php";
+ };
- locations."~ \.php$" = {
- extraConfig = ''
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_pass unix:${phpfpmSocketName};
- fastcgi_index index.php;
- fastcgi_param SCRIPT_FILENAME ${cfg.root}/$fastcgi_script_name;
- '';
+ locations."~ \.php$" = {
+ extraConfig = ''
+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
+ fastcgi_pass unix:${phpfpmSocketName};
+ fastcgi_index index.php;
+ '';
+ };
};
};
};
-
systemd.services.tt-rss = let
dbService = if cfg.database.type == "pgsql" then "postgresql.service" else "mysql.service";
in {
@@ -496,14 +498,14 @@ let
callSql = e:
if cfg.database.type == "pgsql" then ''
${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \
- ${pkgs.postgresql95}/bin/psql \
+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.postgresql.package}/bin/psql \
-U ${cfg.database.user} \
${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \
-c '${e}' \
${cfg.database.name}''
else if cfg.database.type == "mysql" then ''
- echo '${e}' | ${pkgs.mysql}/bin/mysql \
+ echo '${e}' | ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.mysql.package}/bin/mysql \
-u ${cfg.database.user} \
${optionalString (cfg.database.password != null) "-p${cfg.database.password}"} \
${optionalString (cfg.database.host != null) "-h ${cfg.database.host} -P ${toString dbPort}"} \
@@ -521,6 +523,14 @@ let
''
+ (optionalString (cfg.database.type == "pgsql") ''
+ ${optionalString (cfg.database.host == null && cfg.database.password == null) ''
+ if ! [ -e ${cfg.root}/.db-created ]; then
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser ${cfg.database.user}
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O ${cfg.database.user} ${cfg.database.name}
+ touch ${cfg.root}/.db-created
+ fi
+ ''}
+
exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \
| tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//')
@@ -554,5 +564,28 @@ let
requires = ["${dbService}"];
after = ["network.target" "${dbService}"];
};
+
+ services.mysql = optionalAttrs (cfg.database.type == "mysql") {
+ enable = true;
+ package = mkDefault pkgs.mysql;
+ ensureDatabases = [ cfg.database.name ];
+ ensureUsers = [
+ {
+ name = cfg.user;
+ ensurePermissions = {
+ "${cfg.database.name}.*" = "ALL PRIVILEGES";
+ };
+ }
+ ];
+ };
+
+ services.postgresql = optionalAttrs (cfg.database.type == "pgsql") {
+ enable = mkDefault true;
+ };
+
+ users = optionalAttrs (cfg.user == "tt_rss") {
+ extraUsers.tt_rss.group = "tt_rss";
+ extraGroups.tt_rss = {};
+ };
};
}
diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
index 94e85f1f4289..82b8bf3e30db 100644
--- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
@@ -188,8 +188,7 @@ let
/* date format to be used while writing to the owncloud logfile */
'logdateformat' => 'F d, Y H:i:s',
- /* timezone used while writing to the owncloud logfile (default: UTC) */
- 'logtimezone' => '${serverInfo.fullConfig.time.timeZone}',
+ ${tzSetting}
/* Append all database queries and parameters to the log file.
(watch out, this option can increase the size of your log file)*/
@@ -339,6 +338,31 @@ let
'';
+ tzSetting = let tz = serverInfo.fullConfig.time.timeZone; in optionalString (!isNull tz) ''
+ /* timezone used while writing to the owncloud logfile (default: UTC) */
+ 'logtimezone' => '${tz}',
+ '';
+
+ postgresql = serverInfo.fullConfig.services.postgresql.package;
+
+ setupDb = pkgs.writeScript "setup-owncloud-db" ''
+ #!${pkgs.runtimeShell}
+ PATH="${postgresql}/bin"
+ createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true
+ createdb "${config.dbName}" -O "${config.dbUser}" || true
+ psql -U postgres -d postgres -c "alter user ${config.dbUser} with password '${config.dbPassword}';" || true
+
+ QUERY="CREATE TABLE appconfig
+ ( appid VARCHAR( 255 ) NOT NULL
+ , configkey VARCHAR( 255 ) NOT NULL
+ , configvalue VARCHAR( 255 ) NOT NULL
+ );
+ GRANT ALL ON appconfig TO ${config.dbUser};
+ ALTER TABLE appconfig OWNER TO ${config.dbUser};"
+
+ psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true
+ '';
+
in
rec {
@@ -353,7 +377,7 @@ rec {
''}
- ${builtins.readFile "${config.package}/.htaccess"}
+ Include ${config.package}/.htaccess
'';
@@ -373,7 +397,7 @@ rec {
defaultText = "pkgs.owncloud70";
example = literalExample "pkgs.owncloud70";
description = ''
- PostgreSQL package to use.
+ ownCloud package to use.
'';
};
@@ -574,13 +598,7 @@ rec {
chmod -R o-rwx ${config.dataDir}
chown -R wwwrun:wwwrun ${config.dataDir}
- ${pkgs.postgresql}/bin/createuser -s -r postgres
- ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true
- ${pkgs.postgresql}/bin/createdb "${config.dbName}" -O "${config.dbUser}" || true
- ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -U postgres -d postgres -c "alter user ${config.dbUser} with password '${config.dbPassword}';" || true
-
- QUERY="CREATE TABLE appconfig (appid VARCHAR( 255 ) NOT NULL ,configkey VARCHAR( 255 ) NOT NULL ,configvalue VARCHAR( 255 ) NOT NULL); GRANT ALL ON appconfig TO ${config.dbUser}; ALTER TABLE appconfig OWNER TO ${config.dbUser};"
- ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true
+ ${pkgs.sudo}/bin/sudo -u postgres ${setupDb}
fi
if [ -e ${config.package}/config/ca-bundle.crt ]; then
@@ -591,7 +609,11 @@ rec {
chown wwwrun:wwwrun ${config.dataDir}/owncloud.log || true
- QUERY="INSERT INTO groups (gid) values('admin'); INSERT INTO users (uid,password) values('${config.adminUser}','${builtins.hashString "sha1" config.adminPassword}'); INSERT INTO group_user (gid,uid) values('admin','${config.adminUser}');"
- ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true
+ QUERY="INSERT INTO groups (gid) values('admin');
+ INSERT INTO users (uid,password)
+ values('${config.adminUser}','${builtins.hashString "sha1" config.adminPassword}');
+ INSERT INTO group_user (gid,uid)
+ values('admin','${config.adminUser}');"
+ ${pkgs.sudo}/bin/sudo -u postgres ${postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true
'';
}
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 700b4469c565..d23e810dcc62 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -50,11 +50,14 @@ let
"mod_geoip"
"mod_magnet"
"mod_mysql_vhost"
+ "mod_openssl" # since v1.4.46
"mod_scgi"
"mod_setenv"
"mod_trigger_b4_dl"
"mod_uploadprogress"
+ "mod_vhostdb" # since v1.4.46
"mod_webdav"
+ "mod_wstunnel" # since v1.4.46
];
maybeModuleString = moduleName:
diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix
index 669e81d0f14b..8c813d116a52 100644
--- a/nixos/modules/services/web-servers/lighttpd/inginious.nix
+++ b/nixos/modules/services/web-servers/lighttpd/inginious.nix
@@ -113,7 +113,6 @@ in
tasksDirectory = mkOption {
type = types.path;
- default = "${inginious}/lib/python2.7/site-packages/inginious/tasks";
example = "/var/lib/INGInious/tasks";
description = ''
Path to the tasks folder.
@@ -218,6 +217,7 @@ in
# Common
{
+ services.lighttpd.inginious.tasksDirectory = mkDefault "${inginious}/lib/python2.7/site-packages/inginious/tasks";
# To access inginous tools (like inginious-test-task)
environment.systemPackages = [ inginious ];
diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix
new file mode 100644
index 000000000000..a888f623616e
--- /dev/null
+++ b/nixos/modules/services/web-servers/mighttpd2.nix
@@ -0,0 +1,132 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.mighttpd2;
+ configFile = pkgs.writeText "mighty-config" cfg.config;
+ routingFile = pkgs.writeText "mighty-routing" cfg.routing;
+in {
+ options.services.mighttpd2 = {
+ enable = mkEnableOption "Mighttpd2 web server";
+
+ config = mkOption {
+ default = "";
+ example = ''
+ # Example configuration for Mighttpd 2
+ Port: 80
+ # IP address or "*"
+ Host: *
+ Debug_Mode: Yes # Yes or No
+ # If available, "nobody" is much more secure for User:.
+ User: root
+ # If available, "nobody" is much more secure for Group:.
+ Group: root
+ Pid_File: /var/run/mighty.pid
+ Logging: Yes # Yes or No
+ Log_File: /var/log/mighty # The directory must be writable by User:
+ Log_File_Size: 16777216 # bytes
+ Log_Backup_Number: 10
+ Index_File: index.html
+ Index_Cgi: index.cgi
+ Status_File_Dir: /usr/local/share/mighty/status
+ Connection_Timeout: 30 # seconds
+ Fd_Cache_Duration: 10 # seconds
+ # Server_Name: Mighttpd/3.x.y
+ Tls_Port: 443
+ Tls_Cert_File: cert.pem # should change this with an absolute path
+ # should change this with comma-separated absolute paths
+ Tls_Chain_Files: chain.pem
+ # Currently, Tls_Key_File must not be encrypted.
+ Tls_Key_File: privkey.pem # should change this with an absolute path
+ Service: 0 # 0 is HTTP only, 1 is HTTPS only, 2 is both
+ '';
+ type = types.lines;
+ description = ''
+ Verbatim config file to use
+ (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html)
+ '';
+ };
+
+ routing = mkOption {
+ default = "";
+ example = ''
+ # Example routing for Mighttpd 2
+
+ # Domain lists
+ [localhost www.example.com]
+
+ # Entries are looked up in the specified order
+ # All paths must end with "/"
+
+ # A path to CGI scripts should be specified with "=>"
+ /~alice/cgi-bin/ => /home/alice/public_html/cgi-bin/
+
+ # A path to static files should be specified with "->"
+ /~alice/ -> /home/alice/public_html/
+ /cgi-bin/ => /export/cgi-bin/
+
+ # Reverse proxy rules should be specified with ">>"
+ # /path >> host:port/path2
+ # Either "host" or ":port" can be committed, but not both.
+ /app/cal/ >> example.net/calendar/
+ # Yesod app in the same server
+ /app/wiki/ >> 127.0.0.1:3000/
+
+ / -> /export/www/
+ '';
+ type = types.lines;
+ description = ''
+ Verbatim routing file to use
+ (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html)
+ '';
+ };
+
+ cores = mkOption {
+ default = null;
+ type = types.nullOr types.int;
+ description = ''
+ How many cores to use.
+ If null it will be determined automatically
+ '';
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+ assertions =
+ [ { assertion = cfg.routing != "";
+ message = "You need at least one rule in mighttpd2.routing";
+ }
+ ];
+ systemd.services.mighttpd2 = {
+ description = "Mighttpd2 web server";
+ after = [ "network-online.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.haskellPackages.mighttpd2}/bin/mighty \
+ ${configFile} \
+ ${routingFile} \
+ +RTS -N${optionalString (cfg.cores != null) "${cfg.cores}"}
+ '';
+ Type = "simple";
+ User = "mighttpd2";
+ Group = "mighttpd2";
+ Restart = "on-failure";
+ AmbientCapabilities = "cap_net_bind_service";
+ CapabilityBoundingSet = "cap_net_bind_service";
+ };
+ };
+
+ users.extraUsers.mighttpd2 = {
+ group = "mighttpd2";
+ uid = config.ids.uids.mighttpd2;
+ isSystemUser = true;
+ };
+
+ users.extraGroups.mighttpd2.gid = config.ids.gids.mighttpd2;
+ };
+
+ meta.maintainers = with lib.maintainers; [ fgaz ];
+}
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 97511aac9737..dee877f1c114 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -15,6 +15,9 @@ let
} // (optionalAttrs vhostConfig.enableACME {
sslCertificate = "/var/lib/acme/${serverName}/fullchain.pem";
sslCertificateKey = "/var/lib/acme/${serverName}/key.pem";
+ }) // (optionalAttrs (vhostConfig.useACMEHost != null) {
+ sslCertificate = "/var/lib/acme/${vhostConfig.useACMEHost}/fullchain.pem";
+ sslCertificateKey = "/var/lib/acme/${vhostConfig.useACMEHost}/key.pem";
})
) cfg.virtualHosts;
enableIPv6 = config.networking.enableIPv6;
@@ -167,13 +170,14 @@ let
listenString = { addr, port, ssl, ... }:
"listen ${addr}:${toString port} "
- + optionalString ssl "ssl http2 "
+ + optionalString ssl "ssl "
+ + optionalString (ssl && vhost.http2) "http2 "
+ optionalString vhost.default "default_server "
+ ";";
redirectListen = filter (x: !x.ssl) defaultListen;
- acmeLocation = ''
+ acmeLocation = optionalString (vhost.enableACME || vhost.useACMEHost != null) ''
location /.well-known/acme-challenge {
${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"}
root ${vhost.acmeRoot};
@@ -193,7 +197,7 @@ let
${concatMapStringsSep "\n" listenString redirectListen}
server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
- ${optionalString vhost.enableACME acmeLocation}
+ ${acmeLocation}
location / {
return 301 https://$host$request_uri;
}
@@ -203,7 +207,7 @@ let
server {
${concatMapStringsSep "\n" listenString hostListen}
server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
- ${optionalString vhost.enableACME acmeLocation}
+ ${acmeLocation}
${optionalString (vhost.root != null) "root ${vhost.root};"}
${optionalString (vhost.globalRedirect != null) ''
return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri;
@@ -554,6 +558,14 @@ in
are mutually exclusive.
'';
}
+
+ {
+ assertion = all (conf: !(conf.enableACME && conf.useACMEHost != null)) (attrValues virtualHosts);
+ message = ''
+ Options services.nginx.service.virtualHosts..enableACME and
+ services.nginx.virtualHosts..useACMEHost are mutually exclusive.
+ '';
+ }
];
systemd.services.nginx = {
@@ -566,6 +578,7 @@ in
mkdir -p ${cfg.stateDir}/logs
chmod 700 ${cfg.stateDir}
chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
+ ${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t
'';
serviceConfig = {
ExecStart = "${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir}";
@@ -579,7 +592,7 @@ in
security.acme.certs = filterAttrs (n: v: v != {}) (
let
vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts;
- acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME) vhostsConfigs;
+ acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME && vhostConfig.useACMEHost == null) vhostsConfigs;
acmePairs = map (vhostConfig: { name = vhostConfig.serverName; value = {
user = cfg.user;
group = lib.mkDefault cfg.group;
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 801601aafd9d..bf18108a1a3c 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -48,7 +48,21 @@ with lib;
enableACME = mkOption {
type = types.bool;
default = false;
- description = "Whether to ask Let's Encrypt to sign a certificate for this vhost.";
+ description = ''
+ Whether to ask Let's Encrypt to sign a certificate for this vhost.
+ Alternately, you can use an existing certificate through .
+ '';
+ };
+
+ 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 .
+ '';
};
acmeRoot = mkOption {
@@ -114,6 +128,20 @@ with lib;
description = "Path to server SSL certificate key.";
};
+ http2 = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to enable HTTP 2.
+ Note that (as of writing) due to nginx's implementation, to disable
+ HTTP 2 you have to disable it on all vhosts that use a given
+ IP address / port.
+ If there is one server block configured to enable http2,then it is
+ enabled for all server blocks on this IP.
+ See https://stackoverflow.com/a/39466948/263061.
+ '';
+ };
+
root = mkOption {
type = types.nullOr types.path;
default = null;
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index 943415e08c64..aa94e0e976c9 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -19,27 +19,43 @@ in
options = {
services.tomcat = {
-
- enable = mkOption {
- default = false;
- description = "Whether to enable Apache Tomcat";
- };
+ enable = mkEnableOption "Apache Tomcat";
package = mkOption {
type = types.package;
default = pkgs.tomcat85;
defaultText = "pkgs.tomcat85";
- example = lib.literalExample "pkgs.tomcatUnstable";
+ example = lib.literalExample "pkgs.tomcat9";
description = ''
Which tomcat package to use.
'';
};
baseDir = mkOption {
+ type = lib.types.path;
default = "/var/tomcat";
description = "Location where Tomcat stores configuration files, webapplications and logfiles";
};
+ logDirs = mkOption {
+ default = [];
+ type = types.listOf types.path;
+ description = "Directories to create in baseDir/logs/";
+ };
+
+ extraConfigFiles = mkOption {
+ default = [];
+ type = types.listOf types.path;
+ description = "Extra configuration files to pull into the tomcat conf directory";
+ };
+
+ extraEnvironment = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "ENVIRONMENT=production" ];
+ description = "Environment Variables to pass to the tomcat service";
+ };
+
extraGroups = mkOption {
default = [];
example = [ "users" ];
@@ -47,31 +63,46 @@ in
};
user = mkOption {
+ type = types.str;
default = "tomcat";
description = "User account under which Apache Tomcat runs.";
};
group = mkOption {
+ type = types.str;
default = "tomcat";
description = "Group account under which Apache Tomcat runs.";
};
javaOpts = mkOption {
+ type = types.either (types.listOf types.str) types.str;
default = "";
description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
};
catalinaOpts = mkOption {
+ type = types.either (types.listOf types.str) types.str;
default = "";
description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container";
};
sharedLibs = mkOption {
+ type = types.listOf types.str;
default = [];
description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications";
};
+ serverXml = mkOption {
+ type = types.lines;
+ default = "";
+ description = "
+ Verbatim server.xml configuration.
+ This is mutually exclusive with the virtualHosts options.
+ ";
+ };
+
commonLibs = mkOption {
+ type = types.listOf types.str;
default = [];
description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container";
};
@@ -84,11 +115,21 @@ in
};
virtualHosts = mkOption {
+ type = types.listOf (types.submodule {
+ options = {
+ name = mkOption {
+ type = types.listOf types.str;
+ description = "name of the virtualhost";
+ default = [];
+ };
+ };
+ });
default = [];
description = "List consisting of a virtual host name and a list of web applications to deploy on each virtual host";
};
logPerVirtualHost = mkOption {
+ type = types.bool;
default = false;
description = "Whether to enable logging per virtual host.";
};
@@ -104,11 +145,13 @@ in
enable = mkOption {
default = false;
+ type = types.bool;
description = "Whether to enable an Apache Axis2 container";
};
services = mkOption {
default = [];
+ type = types.listOf types.str;
description = "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2";
};
@@ -140,130 +183,104 @@ in
description = "Apache Tomcat server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- serviceConfig.Type = "oneshot";
- serviceConfig.RemainAfterExit = true;
preStart = ''
# Create the base directory
- mkdir -p ${cfg.baseDir}
+ mkdir -p \
+ ${cfg.baseDir}/{conf,virtualhosts,logs,temp,lib,shared/lib,webapps,work}
+ chown ${cfg.user}:${cfg.group} \
+ ${cfg.baseDir}/{conf,virtualhosts,logs,temp,lib,shared/lib,webapps,work}
# Create a symlink to the bin directory of the tomcat component
ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
- # Create a conf/ directory
- mkdir -p ${cfg.baseDir}/conf
- chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
-
# Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
- for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml)
- do
- ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
+ for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml); do
+ ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
done
- # Create subdirectory for virtual hosts
- mkdir -p ${cfg.baseDir}/virtualhosts
+ ${if cfg.extraConfigFiles != [] then ''
+ for i in ${toString cfg.extraConfigFiles}; do
+ ln -sfn $i ${cfg.baseDir}/conf/`basename $i`
+ done
+ '' else ""}
# Create a modified catalina.properties file
# Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
sed -e 's|''${catalina.home}|''${catalina.base}|g' \
- -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
- ${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
+ -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
+ ${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
- # Create a modified server.xml which also includes all virtual hosts
- sed -e "//a\ ${
- toString (map (virtualHost: ''${if cfg.logPerVirtualHost then '''' else ""}'') cfg.virtualHosts)}" \
- ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
-
- # Create a logs/ directory
- mkdir -p ${cfg.baseDir}/logs
- chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
- ${if cfg.logPerVirtualHost then
- toString (map (h: ''
- mkdir -p ${cfg.baseDir}/logs/${h.name}
- chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name}
- '') cfg.virtualHosts) else ''''}
-
- # Create a temp/ directory
- mkdir -p ${cfg.baseDir}/temp
- chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/temp
-
- # Create a lib/ directory
- mkdir -p ${cfg.baseDir}/lib
- chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/lib
-
- # Create a shared/lib directory
- mkdir -p ${cfg.baseDir}/shared/lib
- chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/shared/lib
-
- # Create a webapps/ directory
- mkdir -p ${cfg.baseDir}/webapps
- chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps
+ ${if cfg.serverXml != "" then ''
+ cp -f ${pkgs.writeTextDir "server.xml" cfg.serverXml}/* ${cfg.baseDir}/conf/
+ '' else ''
+ # Create a modified server.xml which also includes all virtual hosts
+ sed -e "//a\ ${toString (map (virtualHost: ''${if cfg.logPerVirtualHost then '''' else ""}'') cfg.virtualHosts)}" \
+ ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
+ ''
+ }
+ ${optionalString (cfg.logDirs != []) ''
+ for i in ${toString cfg.logDirs}; do
+ mkdir -p ${cfg.baseDir}/logs/$i
+ chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/$i
+ done
+ ''}
+ ${optionalString cfg.logPerVirtualHost (toString (map (h: ''
+ mkdir -p ${cfg.baseDir}/logs/${h.name}
+ chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name}
+ '') cfg.virtualHosts))}
# Symlink all the given common libs files or paths into the lib/ directory
- for i in ${tomcat} ${toString cfg.commonLibs}
- do
- if [ -f $i ]
- then
- # If the given web application is a file, symlink it into the common/lib/ directory
- ln -sfn $i ${cfg.baseDir}/lib/`basename $i`
- elif [ -d $i ]
- then
- # If the given web application is a directory, then iterate over the files
- # in the special purpose directories and symlink them into the tomcat tree
+ for i in ${tomcat} ${toString cfg.commonLibs}; do
+ if [ -f $i ]; then
+ # If the given web application is a file, symlink it into the common/lib/ directory
+ ln -sfn $i ${cfg.baseDir}/lib/`basename $i`
+ elif [ -d $i ]; then
+ # If the given web application is a directory, then iterate over the files
+ # in the special purpose directories and symlink them into the tomcat tree
- for j in $i/lib/*
- do
- ln -sfn $j ${cfg.baseDir}/lib/`basename $j`
- done
- fi
+ for j in $i/lib/*; do
+ ln -sfn $j ${cfg.baseDir}/lib/`basename $j`
+ done
+ fi
done
# Symlink all the given shared libs files or paths into the shared/lib/ directory
- for i in ${toString cfg.sharedLibs}
- do
- if [ -f $i ]
- then
- # If the given web application is a file, symlink it into the common/lib/ directory
- ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i`
- elif [ -d $i ]
- then
- # If the given web application is a directory, then iterate over the files
- # in the special purpose directories and symlink them into the tomcat tree
+ for i in ${toString cfg.sharedLibs}; do
+ if [ -f $i ]; then
+ # If the given web application is a file, symlink it into the common/lib/ directory
+ ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i`
+ elif [ -d $i ]; then
+ # If the given web application is a directory, then iterate over the files
+ # in the special purpose directories and symlink them into the tomcat tree
- for j in $i/shared/lib/*
- do
- ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j`
- done
- fi
+ for j in $i/shared/lib/*; do
+ ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j`
+ done
+ fi
done
# Symlink all the given web applications files or paths into the webapps/ directory
- for i in ${toString cfg.webapps}
- do
- if [ -f $i ]
- then
- # If the given web application is a file, symlink it into the webapps/ directory
- ln -sfn $i ${cfg.baseDir}/webapps/`basename $i`
- elif [ -d $i ]
- then
- # If the given web application is a directory, then iterate over the files
- # in the special purpose directories and symlink them into the tomcat tree
+ for i in ${toString cfg.webapps}; do
+ if [ -f $i ]; then
+ # If the given web application is a file, symlink it into the webapps/ directory
+ ln -sfn $i ${cfg.baseDir}/webapps/`basename $i`
+ elif [ -d $i ]; then
+ # If the given web application is a directory, then iterate over the files
+ # in the special purpose directories and symlink them into the tomcat tree
- for j in $i/webapps/*
- do
- ln -sfn $j ${cfg.baseDir}/webapps/`basename $j`
- done
+ for j in $i/webapps/*; do
+ ln -sfn $j ${cfg.baseDir}/webapps/`basename $j`
+ done
- # Also symlink the configuration files if they are included
- if [ -d $i/conf/Catalina ]
- then
- for j in $i/conf/Catalina/*
- do
- mkdir -p ${cfg.baseDir}/conf/Catalina/localhost
- ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
- done
- fi
+ # Also symlink the configuration files if they are included
+ if [ -d $i/conf/Catalina ]; then
+ for j in $i/conf/Catalina/*; do
+ mkdir -p ${cfg.baseDir}/conf/Catalina/localhost
+ ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+ done
fi
+ fi
done
${toString (map (virtualHost: ''
@@ -275,94 +292,79 @@ in
# Symlink all the given web applications files or paths into the webapps/ directory
# of this virtual host
- for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"
- do
- if [ -f $i ]
- then
- # If the given web application is a file, symlink it into the webapps/ directory
- ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
- elif [ -d $i ]
- then
- # If the given web application is a directory, then iterate over the files
- # in the special purpose directories and symlink them into the tomcat tree
+ for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"; do
+ if [ -f $i ]; then
+ # If the given web application is a file, symlink it into the webapps/ directory
+ ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
+ elif [ -d $i ]; then
+ # If the given web application is a directory, then iterate over the files
+ # in the special purpose directories and symlink them into the tomcat tree
- for j in $i/webapps/*
- do
- ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
- done
+ for j in $i/webapps/*; do
+ ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
+ done
- # Also symlink the configuration files if they are included
- if [ -d $i/conf/Catalina ]
- then
- for j in $i/conf/Catalina/*
- do
- mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name}
- ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
- done
- fi
+ # Also symlink the configuration files if they are included
+ if [ -d $i/conf/Catalina ]; then
+ for j in $i/conf/Catalina/*; do
+ mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name}
+ ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
+ done
fi
+ fi
done
+ '') cfg.virtualHosts)}
- ''
- ) cfg.virtualHosts) }
+ ${optionalString cfg.axis2.enable ''
+ # Copy the Axis2 web application
+ cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
- # Create a work/ directory
- mkdir -p ${cfg.baseDir}/work
- chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work
+ # Turn off addressing, which causes many errors
+ sed -i -e 's%%%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml
- ${if cfg.axis2.enable then
- ''
- # Copy the Axis2 web application
- cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
+ # Modify permissions on the Axis2 application
+ chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2
- # Turn off addressing, which causes many errors
- sed -i -e 's%%%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml
+ # Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory
+ for i in ${toString cfg.axis2.services}; do
+ if [ -f $i ]; then
+ # If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services
+ ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
+ elif [ -d $i ]; then
+ # If the given web application is a directory, then iterate over the files
+ # in the special purpose directories and symlink them into the tomcat tree
- # Modify permissions on the Axis2 application
- chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2
+ for j in $i/webapps/axis2/WEB-INF/services/*; do
+ ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
+ done
- # Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory
- for i in ${toString cfg.axis2.services}
- do
- if [ -f $i ]
- then
- # If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services
- ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
- elif [ -d $i ]
- then
- # If the given web application is a directory, then iterate over the files
- # in the special purpose directories and symlink them into the tomcat tree
-
- for j in $i/webapps/axis2/WEB-INF/services/*
- do
- ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
- done
-
- # Also symlink the configuration files if they are included
- if [ -d $i/conf/Catalina ]
- then
- for j in $i/conf/Catalina/*
- do
- ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
- done
- fi
- fi
- done
- ''
- else ""}
- '';
-
- script = ''
- ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
- '';
-
- preStop = ''
- echo "Stopping tomcat..."
- CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh
+ # Also symlink the configuration files if they are included
+ if [ -d $i/conf/Catalina ]; then
+ for j in $i/conf/Catalina/*; do
+ ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+ done
+ fi
+ fi
+ done
+ ''}
'';
+ serviceConfig = {
+ Type = "forking";
+ PermissionsStartOnly = true;
+ PIDFile="/run/tomcat/tomcat.pid";
+ RuntimeDirectory = "tomcat";
+ User = cfg.user;
+ Environment=[
+ "CATALINA_BASE=${cfg.baseDir}"
+ "CATALINA_PID=/run/tomcat/tomcat.pid"
+ "JAVA_HOME='${cfg.jdk}'"
+ "JAVA_OPTS='${builtins.toString cfg.javaOpts}'"
+ "CATALINA_OPTS='${builtins.toString cfg.catalinaOpts}'"
+ ] ++ cfg.extraEnvironment;
+ ExecStart = "${tomcat}/bin/startup.sh";
+ ExecStop = "${tomcat}/bin/shutdown.sh";
+ };
};
-
};
-
}
diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix
index 4ede4fc20967..b6c7fef21fb2 100644
--- a/nixos/modules/services/web-servers/traefik.nix
+++ b/nixos/modules/services/web-servers/traefik.nix
@@ -64,6 +64,16 @@ in {
'';
};
+ group = mkOption {
+ default = "traefik";
+ type = types.string;
+ example = "docker";
+ description = ''
+ Set the group that traefik runs under.
+ For the docker backend this needs to be set to docker instead.
+ '';
+ };
+
package = mkOption {
default = pkgs.traefik;
defaultText = "pkgs.traefik";
@@ -87,7 +97,7 @@ in {
];
Type = "simple";
User = "traefik";
- Group = "traefik";
+ Group = cfg.group;
Restart = "on-failure";
StartLimitInterval = 86400;
StartLimitBurst = 5;
diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index c3bc065d4651..bc74d62b116a 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -1,14 +1,27 @@
{ config, lib, pkgs, ...}:
+
+with lib;
+
let
cfg = config.services.varnish;
+ commandLine = "-f ${pkgs.writeText "default.vcl" cfg.config}" +
+ optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([cfg.package] ++ cfg.extraModules)}' -r vmod_path";
in
-with lib;
{
options = {
services.varnish = {
enable = mkEnableOption "Varnish Server";
+ package = mkOption {
+ type = types.package;
+ default = pkgs.varnish5;
+ defaultText = "pkgs.varnish5";
+ description = ''
+ The package to use
+ '';
+ };
+
http_address = mkOption {
type = types.str;
default = "*:6081";
@@ -35,7 +48,7 @@ with lib;
extraModules = mkOption {
type = types.listOf types.package;
default = [];
- example = literalExample "[ pkgs.varnish-geoip ]";
+ example = literalExample "[ pkgs.varnish5Packages.geoip ]";
description = "
Varnish modules (except 'std').
";
@@ -69,8 +82,7 @@ with lib;
serviceConfig = {
Type = "simple";
PermissionsStartOnly = true;
- ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -F ${cfg.extraCommandLine}"
- + optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([pkgs.varnish] ++ cfg.extraModules)}' -r vmod_path";
+ ExecStart = "${cfg.package}/sbin/varnishd -a ${cfg.http_address} -n ${cfg.stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
Restart = "always";
RestartSec = "5s";
User = "varnish";
@@ -81,7 +93,15 @@ with lib;
};
};
- environment.systemPackages = [ pkgs.varnish ];
+ environment.systemPackages = [ cfg.package ];
+
+ # check .vcl syntax at compile time (e.g. before nixops deployment)
+ system.extraDependencies = [
+ (pkgs.stdenv.mkDerivation {
+ name = "check-varnish-syntax";
+ buildCommand = "${cfg.package}/sbin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1)";
+ })
+ ];
users.extraUsers.varnish = {
group = "varnish";
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index 11cbcac6fa85..8641c05de52e 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -181,10 +181,10 @@ in {
};
backend = mkOption {
- type = types.enum [ "glx" "xrender" ];
+ type = types.enum [ "glx" "xrender" "xr_glx_hybrid" ];
default = "xrender";
description = ''
- Backend to use: glx or xrender.
+ Backend to use: glx, xrender or xr_glx_hybrid.
'';
};
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 39b27d4ceb61..4622c7b760f0 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -109,9 +109,5 @@ in
};
- config = {
- services.xserver.displayManager.session = cfg.session.list;
- environment.systemPackages =
- mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable
- };
+ config.services.xserver.displayManager.session = cfg.session.list;
}
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 8a523f0d8036..da3287aaea6e 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -33,7 +33,7 @@ in
pkgs.xorg.xauth # used by kdesu
pkgs.gtk2 # To get GTK+'s themes.
pkgs.tango-icon-theme
- pkgs.shared_mime_info
+ pkgs.shared-mime-info
pkgs.gnome2.gnomeicontheme
pkgs.xorg.xcursorthemes
];
@@ -47,7 +47,7 @@ in
export GTK_DATA_PREFIX=${config.system.path}
# find theme engines
export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
- export XDG_MENU_PREFIX=enlightenment
+ export XDG_MENU_PREFIX=e-
export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}"
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index e5a79496c7a5..7256013d5d8b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -27,7 +27,7 @@ let
nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {}
''
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
- cp -rf ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+ cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}
@@ -60,7 +60,7 @@ in {
example = literalExample "[ pkgs.gnome3.gpaste ]";
description = "Additional list of packages to be added to the session search path.
Useful for gnome shell extensions or gsettings-conditionated autostart.";
- apply = list: list ++ [ pkgs.gnome3.gnome_shell pkgs.gnome3.gnome-shell-extensions ];
+ apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ];
};
extraGSettingsOverrides = mkOption {
@@ -108,6 +108,7 @@ in {
services.gnome3.seahorse.enable = mkDefault true;
services.gnome3.sushi.enable = mkDefault true;
services.gnome3.tracker.enable = mkDefault true;
+ services.gnome3.tracker-miners.enable = mkDefault true;
hardware.pulseaudio.enable = mkDefault true;
services.telepathy.enable = mkDefault true;
networking.networkmanager.enable = mkDefault true;
@@ -117,13 +118,13 @@ in {
services.packagekit.enable = mkDefault true;
hardware.bluetooth.enable = mkDefault true;
services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
- services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];
+ services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];
systemd.packages = [ pkgs.gnome3.vino ];
# If gnome3 is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3";
- fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
+ fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ];
services.xserver.desktopManager.session = singleton
{ name = "gnome3";
@@ -135,7 +136,7 @@ in {
# find theme engines
export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
- export XDG_MENU_PREFIX=gnome
+ export XDG_MENU_PREFIX=gnome-
${concatMapStrings (p: ''
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
@@ -152,7 +153,7 @@ in {
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
# Override gsettings-desktop-schema
- export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
+ export NIX_GSETTINGS_OVERRIDES_DIR=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
# Let nautilus find extensions
export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/
@@ -163,7 +164,7 @@ in {
# Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
- ${pkgs.gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
+ ${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
waitPID=$!
'';
};
@@ -171,7 +172,7 @@ in {
services.xserver.updateDbusEnvironment = true;
environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
- "${pkgs.gnome3.glib_networking.out}/lib/gio/modules"
+ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules"
"${pkgs.gnome3.gvfs}/lib/gio/modules" ];
environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages);
@@ -179,10 +180,10 @@ in {
# Use the correct gnome3 packageSet
networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant;
- inherit (pkgs.gnome3) networkmanager_openvpn networkmanager_vpnc
- networkmanager_openconnect networkmanager_fortisslvpn
- networkmanager_pptp networkmanager_iodine
- networkmanager_l2tp; };
+ inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
+ networkmanager-openconnect networkmanager-fortisslvpn
+ networkmanager-pptp networkmanager-iodine
+ networkmanager-l2tp; };
# Needed for themes and backgrounds
environment.pathsToLink = [ "/share" ];
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index ab8a0a48b483..0117dc9d132b 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -12,6 +12,17 @@ let
in
filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
+ addToXDGDirs = p: ''
+ if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
+ export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
+ fi
+
+ if [ -d "${p}/lib/girepository-1.0" ]; then
+ export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
+ fi
+ '';
+
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.mate;
@@ -20,10 +31,14 @@ in
{
options = {
- services.xserver.desktopManager.mate.enable = mkOption {
- type = types.bool;
- default = false;
- description = "Enable the MATE desktop environment";
+ services.xserver.desktopManager.mate = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable the MATE desktop environment";
+ };
+
+ debug = mkEnableOption "mate-session debug messages";
};
environment.mate.excludePackages = mkOption {
@@ -47,15 +62,34 @@ in
# Find theme engines
export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
- export XDG_MENU_PREFIX=mate
+ export XDG_MENU_PREFIX=mate-
# Find the mouse
export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
+ # Let caja find extensions
+ export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0
+
+ # Let caja extensions find gsettings schemas
+ ${concatMapStrings (p: ''
+ if [ -d "${p}/lib/caja/extensions-2.0" ]; then
+ ${addToXDGDirs p}
+ fi
+ '')
+ config.environment.systemPackages
+ }
+
+ # Let mate-panel find applets
+ export MATE_PANEL_APPLETS_DIR=$MATE_PANEL_APPLETS_DIR''${MATE_PANEL_APPLETS_DIR:+:}${config.system.path}/share/mate-panel/applets
+ export MATE_PANEL_EXTRA_MODULES=$MATE_PANEL_EXTRA_MODULES''${MATE_PANEL_EXTRA_MODULES:+:}${config.system.path}/lib/mate-panel/applets
+
+ # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive)
+ ${addToXDGDirs pkgs.mate.mate-control-center}
+
# Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
- ${pkgs.mate.mate-session-manager}/bin/mate-session &
+ ${pkgs.mate.mate-session-manager}/bin/mate-session ${optionalString cfg.debug "--debug"} &
waitPID=$!
'';
};
@@ -68,7 +102,7 @@ in
services.dbus.packages = [
pkgs.gnome3.dconf
- pkgs.at_spi2_core
+ pkgs.at-spi2-core
];
services.gnome3.gnome-keyring.enable = true;
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index bb4f4e868fea..91d091d7d7e2 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -25,8 +25,8 @@ in
type = types.bool;
default = true;
description = ''
- Enable support for Qt 4-based applications. Particularly, install the
- Qt 4 version of the Breeze theme and a default backend for Phonon.
+ Enable support for Qt 4-based applications. Particularly, install a
+ default backend for Phonon.
'';
};
@@ -47,6 +47,18 @@ in
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''}
+ if [ -f "$HOME/.config/kdeglobals" ]
+ then
+ # Remove extraneous font style names.
+ # See also: https://phabricator.kde.org/D9070
+ ${getBin pkgs.gnused}/bin/sed -i "$HOME/.config/kdeglobals" \
+ -e '/^fixed=/ s/,Regular$//' \
+ -e '/^font=/ s/,Regular$//' \
+ -e '/^menuFont=/ s/,Regular$//' \
+ -e '/^smallestReadableFont=/ s/,Regular$//' \
+ -e '/^toolBarFont=/ s/,Regular$//'
+ fi
+
exec "${getBin plasma5.plasma-workspace}/bin/startkde"
'';
};
@@ -54,6 +66,10 @@ in
security.wrappers = {
kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass";
"start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit";
+ kwin_wayland = {
+ source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
+ capabilities = "cap_sys_nice+ep";
+ };
};
environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications;
@@ -138,15 +154,17 @@ in
print-manager
breeze-icons
- pkgs.hicolor_icon_theme
+ pkgs.hicolor-icon-theme
kde-gtk-config breeze-gtk
+ qtvirtualkeyboard
+
libsForQt56.phonon-backend-gstreamer
libsForQt5.phonon-backend-gstreamer
]
- ++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ]
+ ++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ]
# Optional hardware support features
++ lib.optional config.hardware.bluetooth.enable bluedevil
@@ -193,16 +211,6 @@ in
theme = mkDefault "breeze";
};
- boot.plymouth = {
- theme = mkDefault "breeze";
- themePackages = mkDefault [
- (pkgs.breeze-plymouth.override {
- nixosBranding = true;
- nixosVersion = config.system.nixosRelease;
- })
- ];
- };
-
security.pam.services.kde = { allowNullPassword = true; };
# Doing these one by one seems silly, but we currently lack a better
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 9c42dc8781b9..7dcc600d2664 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -3,15 +3,11 @@
with lib;
let
-
- xcfg = config.services.xserver;
- cfg = xcfg.desktopManager.xfce;
-
+ cfg = config.services.xserver.desktopManager.xfce;
in
{
options = {
-
services.xserver.desktopManager.xfce = {
enable = mkOption {
type = types.bool;
@@ -54,81 +50,93 @@ in
description = "Application used by XFCE to lock the screen.";
};
};
-
};
+ config = mkIf cfg.enable {
+ environment.systemPackages = with pkgs.xfce // pkgs; [
+ # Get GTK+ themes and gtk-update-icon-cache
+ gtk2.out
- config = mkIf (xcfg.enable && cfg.enable) {
+ # Supplies some abstract icons such as:
+ # utilities-terminal, accessories-text-editor
+ gnome3.defaultIconTheme
- services.xserver.desktopManager.session = singleton
- { name = "xfce";
- bgSupport = true;
- start =
- ''
- ${cfg.extraSessionCommands}
+ hicolor-icon-theme
+ tango-icon-theme
+ xfce4-icon-theme
- # Set GTK_PATH so that GTK+ can find the theme engines.
- export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
+ desktop-file-utils
+ shared-mime-info
- # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
- export GTK_DATA_PREFIX=${config.system.path}
+ # Needed by Xfce's xinitrc script
+ # TODO: replace with command -v
+ which
- ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} &
- waitPID=$!
- '';
- };
+ exo
+ garcon
+ gtk-xfce-engine
+ gvfs
+ libxfce4ui
+ tumbler
+ xfconf
+
+ mousepad
+ ristretto
+ xfce4-appfinder
+ xfce4-screenshooter
+ xfce4-session
+ xfce4-settings
+ 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
+ xfce4-notifyd
+ xfdesktop
+ ];
+
+ environment.pathsToLink = [
+ "/share/xfce4"
+ "/share/themes"
+ "/share/mime"
+ "/share/desktop-directories"
+ "/share/gtksourceview-2.0"
+ ];
+
+ environment.variables = {
+ GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
+ GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
+ };
+
+ services.xserver.desktopManager.session = [{
+ name = "xfce";
+ bgSupport = true;
+ start = ''
+ ${cfg.extraSessionCommands}
+
+ # Set GTK_PATH so that GTK+ can find the theme engines.
+ export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
+
+ # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
+ export GTK_DATA_PREFIX=${config.system.path}
+
+ ${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} &
+ waitPID=$!
+ '';
+ }];
services.xserver.updateDbusEnvironment = true;
- environment.systemPackages =
- [ pkgs.gtk2.out # To get GTK+'s themes and gtk-update-icon-cache
- pkgs.hicolor_icon_theme
- pkgs.tango-icon-theme
- pkgs.shared_mime_info
- pkgs.which # Needed by the xfce's xinitrc script.
- pkgs."${cfg.screenLock}"
- pkgs.xfce.exo
- pkgs.xfce.gtk_xfce_engine
- pkgs.xfce.mousepad
- pkgs.xfce.ristretto
- pkgs.xfce.terminal
- (pkgs.xfce.thunar.override { thunarPlugins = cfg.thunarPlugins; })
- pkgs.xfce.xfce4icontheme
- pkgs.xfce.xfce4session
- pkgs.xfce.xfce4settings
- pkgs.xfce.xfce4mixer
- pkgs.xfce.xfce4volumed
- pkgs.xfce.xfce4-screenshooter
- pkgs.xfce.xfconf
- # This supplies some "abstract" icons such as
- # "utilities-terminal" and "accessories-text-editor".
- pkgs.gnome3.defaultIconTheme
- pkgs.desktop_file_utils
- pkgs.xfce.libxfce4ui
- pkgs.xfce.garcon
- pkgs.xfce.thunar_volman
- pkgs.xfce.gvfs
- pkgs.xfce.xfce4_appfinder
- pkgs.xfce.tumbler # found via dbus
- ]
- ++ optional cfg.enableXfwm pkgs.xfce.xfwm4
- ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager
- ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet
- ++ optionals (!cfg.noDesktop)
- [ pkgs.xfce.xfce4panel
- pkgs.xfce.xfdesktop
- pkgs.xfce.xfce4notifyd # found via dbus
- ];
-
- environment.pathsToLink =
- [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
-
- environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
-
# Enable helpful DBus services.
services.udisks2.enable = true;
services.upower.enable = config.powerManagement.enable;
-
};
-
}
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 3fa482fb6722..43ed21c95fee 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -59,12 +59,6 @@ let
# Now it should be safe to assume that the script was called with the
# expected parameters.
- ${optionalString cfg.displayManager.logToJournal ''
- if [ -z "$_DID_SYSTEMD_CAT" ]; then
- _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$@"
- fi
- ''}
-
. /etc/profile
cd "$HOME"
@@ -72,16 +66,23 @@ let
sessionType="$1"
if [ "$sessionType" = default ]; then sessionType=""; fi
- ${optionalString (!cfg.displayManager.job.logsXsession && !cfg.displayManager.logToJournal) ''
- exec > ~/.xsession-errors 2>&1
- ''}
-
${optionalString cfg.startDbusSession ''
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$sessionType"
fi
''}
+ ${optionalString cfg.displayManager.job.logToJournal ''
+ if [ -z "$_DID_SYSTEMD_CAT" ]; then
+ export _DID_SYSTEMD_CAT=1
+ exec ${config.systemd.package}/bin/systemd-cat -t xsession "$0" "$sessionType"
+ fi
+ ''}
+
+ ${optionalString cfg.displayManager.job.logToFile ''
+ exec &> >(tee ~/.xsession-errors)
+ ''}
+
# Start PulseAudio if enabled.
${optionalString (config.hardware.pulseaudio.enable) ''
${optionalString (!config.hardware.pulseaudio.systemWide)
@@ -306,26 +307,24 @@ in
description = "Additional environment variables needed by the display manager.";
};
- logsXsession = mkOption {
+ logToFile = mkOption {
type = types.bool;
default = false;
description = ''
- Whether the display manager redirects the
- output of the session script to
- ~/.xsession-errors.
+ Whether the display manager redirects the output of the
+ session script to ~/.xsession-errors.
'';
};
- };
+ logToJournal = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether the display manager redirects the output of the
+ session script to the systemd journal.
+ '';
+ };
- logToJournal = mkOption {
- type = types.bool;
- default = true;
- description = ''
- By default, the stdout/stderr of sessions is written
- to ~/.xsession-errors. When this option
- is enabled, it will instead be written to the journal.
- '';
};
};
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 07642a8b13db..70fc7388c2ac 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -133,7 +133,7 @@ in
StandardError = "inherit";
};
- systemd.services.display-manager.path = [ pkgs.gnome3.gnome_session ];
+ systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];
services.dbus.packages = [ gdm ];
@@ -193,7 +193,7 @@ in
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet
- auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
+ auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@@ -213,7 +213,7 @@ in
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
- session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
+ session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
'';
gdm-password.text = ''
@@ -221,7 +221,7 @@ in
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet
- auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
+ auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@@ -240,7 +240,7 @@ in
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
- session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
+ session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
'';
gdm-autologin.text = ''
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index 1d5dcb2c7cbe..2a71d2338607 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -45,6 +45,8 @@ let
theme-name = ${cfg.theme.name}
icon-theme-name = ${cfg.iconTheme.name}
background = ${ldmcfg.background}
+ ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"}
+ ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"}
${cfg.extraConfig}
'';
@@ -66,8 +68,8 @@ in
package = mkOption {
type = types.package;
- default = pkgs.gnome3.gnome_themes_standard;
- defaultText = "pkgs.gnome3.gnome_themes_standard";
+ default = pkgs.gnome3.gnome-themes-standard;
+ defaultText = "pkgs.gnome3.gnome-themes-standard";
description = ''
The package path that contains the theme given in the name option.
'';
@@ -104,6 +106,35 @@ in
};
+ clock-format = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "%F";
+ description = ''
+ Clock format string (as expected by strftime, e.g. "%H:%M")
+ to use with the lightdm gtk greeter panel.
+
+ If set to null the default clock format is used.
+ '';
+ };
+
+ indicators = mkOption {
+ type = types.nullOr (types.listOf types.str);
+ default = null;
+ example = [ "~host" "~spacer" "~clock" "~spacer" "~session" "~language" "~a11y" "~power" ];
+ description = ''
+ List of allowed indicator modules to use for the lightdm gtk
+ greeter panel.
+
+ Built-in indicators include "~a11y", "~language", "~session",
+ "~power", "~clock", "~host", "~spacer". Unity indicators can be
+ represented by short name (e.g. "sound", "power"), service file name,
+ or absolute path.
+
+ If set to null the default indicators are used.
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 1733f2fd39b2..9d30155a7234 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -9,6 +9,10 @@ let
xEnv = config.systemd.services."display-manager".environment;
cfg = dmcfg.lightdm;
+ dmDefault = xcfg.desktopManager.default;
+ wmDefault = xcfg.windowManager.default;
+ hasDefaultUserSession = dmDefault != "none" || wmDefault != "none";
+
inherit (pkgs) stdenv lightdm writeScript writeText;
# lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup
@@ -54,14 +58,13 @@ let
autologin-user-timeout = ${toString cfg.autoLogin.timeout}
autologin-session = ${defaultSessionName}
''}
+ ${optionalString hasDefaultUserSession ''
+ user-session=${defaultSessionName}
+ ''}
${cfg.extraSeatDefaults}
'';
- defaultSessionName =
- let
- dm = xcfg.desktopManager.default;
- wm = xcfg.windowManager.default;
- in dm + optionalString (wm != "none") ("+" + wm);
+ defaultSessionName = dmDefault + optionalString (wmDefault != "none") ("+" + wmDefault);
in
{
# Note: the order in which lightdm greeter modules are imported
@@ -179,6 +182,14 @@ in
default session: ${defaultSessionName} is not valid.
'';
}
+ { assertion = hasDefaultUserSession -> elem defaultSessionName dmcfg.session.names;
+ message = ''
+ services.xserver.desktopManager.default and
+ services.xserver.windowMananger.default are not set to valid
+ values. The current default session: ${defaultSessionName}
+ is not valid.
+ '';
+ }
{ assertion = !cfg.greeter.enable -> (cfg.autoLogin.enable && cfg.autoLogin.timeout == 0);
message = ''
LightDM can only run without greeter if automatic login is enabled and the timeout for it
@@ -190,7 +201,7 @@ in
services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.job = {
- logsXsession = true;
+ logToFile = true;
# lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
execCmd = ''
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index facaea131ae5..2d4cb8aa20a5 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -205,7 +205,7 @@ in
services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.job = {
- logsXsession = true;
+ logToFile = true;
environment = {
# Load themes from system environment
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 0c4dd1973b53..f645a5c2f078 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -14,7 +14,7 @@ let
default_xserver ${dmcfg.xserverBin}
xserver_arguments ${toString dmcfg.xserverArgs}
sessiondir ${dmcfg.session.desktops}
- login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session"
+ login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.script} "%session"
halt_cmd ${config.systemd.package}/sbin/shutdown -h now
reboot_cmd ${config.systemd.package}/sbin/shutdown -r now
logfile /dev/stderr
diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix
index 8f5ce3dccc6a..b46ede550c16 100644
--- a/nixos/modules/services/x11/display-managers/xpra.nix
+++ b/nixos/modules/services/x11/display-managers/xpra.nix
@@ -220,7 +220,7 @@ in
'';
services.xserver.displayManager.job = {
- logsXsession = true;
+ logToFile = true;
execCmd = ''
${optionalString (cfg.pulseaudio)
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index 44555cb6e2a9..d0a87f183b6f 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -170,7 +170,7 @@ in {
disableWhileTyping = mkOption {
type = types.bool;
- default = true;
+ default = false;
description =
''
Disable input method while typing.
@@ -198,6 +198,13 @@ in {
environment.systemPackages = [ pkgs.xorg.xf86inputlibinput ];
+ environment.etc = [
+ (let cfgPath = "X11/xorg.conf.d/40-libinput.conf"; in {
+ source = pkgs.xorg.xf86inputlibinput.out + "/share/" + cfgPath;
+ target = cfgPath;
+ })
+ ];
+
services.udev.packages = [ pkgs.libinput ];
services.xserver.config =
diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix
index e3f5ec7dbe67..fdbdf35b0f5a 100644
--- a/nixos/modules/services/x11/window-managers/2bwm.nix
+++ b/nixos/modules/services/x11/window-managers/2bwm.nix
@@ -25,12 +25,12 @@ in
{ name = "2bwm";
start =
''
- ${pkgs."2bwm"}/bin/2bwm &
+ ${pkgs._2bwm}/bin/2bwm &
waitPID=$!
'';
};
- environment.systemPackages = [ pkgs."2bwm" ];
+ environment.systemPackages = [ pkgs._2bwm ];
};
diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix
index eb97449c6bd9..71eb02ec5954 100644
--- a/nixos/modules/services/x11/window-managers/awesome.nix
+++ b/nixos/modules/services/x11/window-managers/awesome.nix
@@ -6,7 +6,11 @@ let
cfg = config.services.xserver.windowManager.awesome;
awesome = cfg.package;
- inherit (pkgs.luaPackages) getLuaPath getLuaCPath;
+ getLuaPath = lib : dir : "${lib}/${dir}/lua/${pkgs.luaPackages.lua.luaversion}";
+ makeSearchPath = lib.concatMapStrings (path:
+ " --search " + (getLuaPath path "share") +
+ " --search " + (getLuaPath path "lib")
+ );
in
{
@@ -46,10 +50,7 @@ in
{ name = "awesome";
start =
''
- export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}"
- export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}"
-
- ${awesome}/bin/awesome &
+ ${awesome}/bin/awesome ${makeSearchPath cfg.luaModules} &
waitPID=$!
'';
};
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 25ba95fccd75..bc420831ad83 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -12,6 +12,7 @@ in
./afterstep.nix
./bspwm.nix
./dwm.nix
+ ./evilwm.nix
./exwm.nix
./fluxbox.nix
./fvwm.nix
diff --git a/nixos/modules/services/x11/window-managers/evilwm.nix b/nixos/modules/services/x11/window-managers/evilwm.nix
new file mode 100644
index 000000000000..6e19e3572c79
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/evilwm.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.xserver.windowManager.evilwm;
+in
+{
+ ###### interface
+ options = {
+ services.xserver.windowManager.evilwm.enable = mkEnableOption "evilwm";
+ };
+
+ ###### implementation
+ config = mkIf cfg.enable {
+ services.xserver.windowManager.session = singleton {
+ name = "evilwm";
+ start = ''
+ ${pkgs.evilwm}/bin/evilwm &
+ waitPID=$!
+ '';
+ };
+ environment.systemPackages = [ pkgs.evilwm ];
+ };
+}
diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix
index 28fc92024bcb..a614559970e9 100644
--- a/nixos/modules/services/x11/xautolock.nix
+++ b/nixos/modules/services/x11/xautolock.nix
@@ -26,9 +26,9 @@ in
};
locker = mkOption {
- default = "xlock"; # default according to `man xautolock`
- example = "i3lock -i /path/to/img";
- type = types.string;
+ default = "${pkgs.xlockmore}/bin/xlock"; # default according to `man xautolock`
+ example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img";
+ type = types.str;
description = ''
The script to use when automatically locking the computer.
@@ -37,8 +37,8 @@ in
nowlocker = mkOption {
default = null;
- example = "i3lock -i /path/to/img";
- type = types.nullOr types.string;
+ example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img";
+ type = types.nullOr types.str;
description = ''
The script to use when manually locking the computer with xautolock -locknow.
@@ -56,10 +56,8 @@ in
notifier = mkOption {
default = null;
- example = literalExample ''
- "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""
- '';
- type = types.nullOr types.string;
+ example = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\"";
+ type = types.nullOr types.str;
description = ''
Notification script to be used to warn about the pending autolock.
@@ -68,8 +66,8 @@ in
killer = mkOption {
default = null; # default according to `man xautolock` is none
- example = "systemctl suspend";
- type = types.nullOr types.string;
+ example = "${pkgs.systemd}/bin/systemctl suspend";
+ type = types.nullOr types.str;
description = ''
The script to use when nothing has happend for as long as
@@ -131,6 +129,12 @@ in
assertion = cfg.killer != null -> cfg.killtime >= 10;
message = "killtime has to be at least 10 minutes according to `man xautolock`";
}
- ];
+ ] ++ (lib.flip map [ "locker" "notifier" "nowlocker" "killer" ]
+ (option:
+ {
+ assertion = cfg."${option}" != null -> builtins.substring 0 1 cfg."${option}" == "/";
+ message = "Please specify a canonical path for `services.xserver.xautolock.${option}`";
+ })
+ );
};
}
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 7d544e153e9a..f96d3c5afbac 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -548,7 +548,7 @@ in
knownVideoDrivers;
in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver));
- nixpkgs.config.xorg = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { abiCompat = "1.18"; };
+ nixpkgs.config = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { xorg.abiCompat = "1.18"; };
assertions = [
{ assertion = config.security.polkit.enable;
@@ -578,6 +578,22 @@ in
target = "X11/xkb";
}
])
+ # localectl looks into 00-keyboard.conf
+ ++ [
+ {
+ text = ''
+ Section "InputClass"
+ Identifier "Keyboard catchall"
+ MatchIsKeyboard "on"
+ Option "XkbModel" "${cfg.xkbModel}"
+ Option "XkbLayout" "${cfg.layout}"
+ Option "XkbOptions" "${cfg.xkbOptions}"
+ Option "XkbVariant" "${cfg.xkbVariant}"
+ EndSection
+ '';
+ target = "X11/xorg.conf.d/00-keyboard.conf";
+ }
+ ]
# Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5
++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in
[{
@@ -697,16 +713,6 @@ in
${cfg.monitorSection}
EndSection
- Section "InputClass"
- Identifier "Keyboard catchall"
- MatchIsKeyboard "on"
- Option "XkbRules" "base"
- Option "XkbModel" "${cfg.xkbModel}"
- Option "XkbLayout" "${cfg.layout}"
- Option "XkbOptions" "${cfg.xkbOptions}"
- Option "XkbVariant" "${cfg.xkbVariant}"
- EndSection
-
# Additional "InputClass" sections
${flip concatMapStrings cfg.inputClassSections (inputClassSection: ''
Section "InputClass"
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index c2ac731d433d..c563614caaaf 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -61,7 +61,7 @@ in
apply = set: {
script =
''
- #! ${pkgs.stdenv.shell}
+ #! ${pkgs.runtimeShell}
systemConfig=@out@
@@ -117,14 +117,7 @@ in
config = {
- system.activationScripts.stdio =
- ''
- # Needed by some programs.
- ln -sfn /proc/self/fd /dev/fd
- ln -sfn /proc/self/fd/0 /dev/stdin
- ln -sfn /proc/self/fd/1 /dev/stdout
- ln -sfn /proc/self/fd/2 /dev/stderr
- '';
+ system.activationScripts.stdio = ""; # obsolete
system.activationScripts.var =
''
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 0c50241f2edf..091a2e412eed 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -30,6 +30,8 @@ let
let
kernelPath = "${config.boot.kernelPackages.kernel}/" +
"${config.system.boot.loader.kernelFile}";
+ initrdPath = "${config.system.build.initialRamdisk}/" +
+ "${config.system.boot.loader.initrdFile}";
in ''
mkdir $out
@@ -50,7 +52,7 @@ let
echo -n "$kernelParams" > $out/kernel-params
- ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
+ ln -s ${initrdPath} $out/initrd
ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out
@@ -106,7 +108,7 @@ let
if [] == failed then pkgs.stdenvNoCC.mkDerivation {
name = let hn = config.networking.hostName;
nn = if (hn != "") then hn else "unnamed";
- in "nixos-system-${nn}-${config.system.nixosLabel}";
+ in "nixos-system-${nn}-${config.system.nixos.label}";
preferLocalBuild = true;
allowSubstitutes = false;
buildCommand = systemBuilder;
@@ -120,7 +122,7 @@ let
config.system.build.installBootLoader
or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
activationScript = config.system.activationScripts.script;
- nixosLabel = config.system.nixosLabel;
+ nixosLabel = config.system.nixos.label;
configurationName = config.boot.loader.grub.configurationName;
@@ -179,6 +181,15 @@ in
'';
};
+ system.boot.loader.initrdFile = mkOption {
+ internal = true;
+ default = "initrd";
+ type = types.str;
+ description = ''
+ Name of the initrd file to be passed to the bootloader.
+ '';
+ };
+
system.copySystemConfiguration = mkOption {
type = types.bool;
default = false;
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
new file mode 100644
index 000000000000..15e84dc021e2
--- /dev/null
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -0,0 +1,139 @@
+{ config, lib, ... }:
+let
+ inherit (lib) mkOption types optionalString;
+
+ cfg = config.boot.binfmtMiscRegistrations;
+
+ makeBinfmtLine = name: { recognitionType, offset, magicOrExtension
+ , mask, preserveArgvZero, openBinary
+ , matchCredentials, fixBinary, ...
+ }: let
+ type = if recognitionType == "magic" then "M" else "E";
+ offset' = toString offset;
+ mask' = toString mask;
+ interpreter = "/run/binfmt/${name}";
+ flags = if !(matchCredentials -> openBinary)
+ then throw "boot.binfmtMiscRegistrations.${name}: you can't specify openBinary = false when matchCredentials = true."
+ else optionalString preserveArgvZero "P" +
+ optionalString (openBinary && !matchCredentials) "O" +
+ optionalString matchCredentials "C" +
+ optionalString fixBinary "F";
+ in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}";
+
+ binfmtFile = builtins.toFile "binfmt_nixos.conf"
+ (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine cfg));
+
+ activationSnippet = name: { interpreter, ... }:
+ "ln -sf ${interpreter} /run/binfmt/${name}";
+ activationScript = ''
+ mkdir -p -m 0755 /run/binfmt
+ ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet cfg)}
+ '';
+in {
+ options = {
+ boot.binfmtMiscRegistrations = mkOption {
+ default = {};
+
+ description = ''
+ Extra binary formats to register with the kernel.
+ See https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html for more details.
+ '';
+
+ type = types.attrsOf (types.submodule ({ config, ... }: {
+ options = {
+ recognitionType = mkOption {
+ default = "magic";
+ description = "Whether to recognize executables by magic number or extension.";
+ type = types.enum [ "magic" "extension" ];
+ };
+
+ offset = mkOption {
+ default = null;
+ description = "The byte offset of the magic number used for recognition.";
+ type = types.nullOr types.int;
+ };
+
+ magicOrExtension = mkOption {
+ description = "The magic number or extension to match on.";
+ type = types.str;
+ };
+
+ mask = mkOption {
+ default = null;
+ description =
+ "A mask to be ANDed with the byte sequence of the file before matching";
+ type = types.nullOr types.str;
+ };
+
+ interpreter = mkOption {
+ description = ''
+ The interpreter to invoke to run the program.
+
+ Note that the actual registration will point to
+ /run/binfmt/''${name}, so the kernel interpreter length
+ limit doesn't apply.
+ '';
+ type = types.path;
+ };
+
+ preserveArgvZero = mkOption {
+ default = false;
+ description = ''
+ Whether to pass the original argv[0] to the interpreter.
+
+ See the description of the 'P' flag in the kernel docs
+ for more details;
+ '';
+ type = types.bool;
+ };
+
+ openBinary = mkOption {
+ default = config.matchCredentials;
+ description = ''
+ Whether to pass the binary to the interpreter as an open
+ file descriptor, instead of a path.
+ '';
+ type = types.bool;
+ };
+
+ matchCredentials = mkOption {
+ default = false;
+ description = ''
+ Whether to launch with the credentials and security
+ token of the binary, not the interpreter (e.g. setuid
+ bit).
+
+ See the description of the 'C' flag in the kernel docs
+ for more details.
+
+ Implies/requires openBinary = true.
+ '';
+ type = types.bool;
+ };
+
+ fixBinary = mkOption {
+ default = false;
+ description = ''
+ Whether to open the interpreter file as soon as the
+ registration is loaded, rather than waiting for a
+ relevant file to be invoked.
+
+ See the description of the 'F' flag in the kernel docs
+ for more details.
+ '';
+ type = types.bool;
+ };
+ };
+ }));
+ };
+ };
+
+ config = lib.mkIf (cfg != {}) {
+ environment.etc."binfmt.d/nixos.conf".source = binfmtFile;
+ system.activationScripts.binfmt = activationScript;
+ systemd.additionalUpstreamSystemUnits =
+ [ "proc-sys-fs-binfmt_misc.automount"
+ "proc-sys-fs-binfmt_misc.mount"
+ ];
+ };
+}
diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix
new file mode 100644
index 000000000000..c4c6d82dc5c8
--- /dev/null
+++ b/nixos/modules/system/boot/grow-partition.nix
@@ -0,0 +1,43 @@
+# This module automatically grows the root partition.
+# This allows an instance to be created with a bigger root filesystem
+# than provided by the machine image.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+ options = {
+ boot.growPartition = mkEnableOption "grow the root partition on boot";
+ };
+
+ config = mkIf config.boot.growPartition {
+
+ boot.initrd.extraUtilsCommands = ''
+ copy_bin_and_libs ${pkgs.gawk}/bin/gawk
+ copy_bin_and_libs ${pkgs.gnused}/bin/sed
+ copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
+ copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
+
+ substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \
+ --replace "${pkgs.bash}/bin/sh" "/bin/sh" \
+ --replace "awk" "gawk" \
+ --replace "sed" "gnused"
+
+ ln -s sed $out/bin/gnused
+ '';
+
+ boot.initrd.postDeviceCommands = ''
+ rootDevice="${config.fileSystems."/".device}"
+ if [ -e "$rootDevice" ]; then
+ rootDevice="$(readlink -f "$rootDevice")"
+ parentDevice="$(lsblk -npo PKNAME "$rootDevice")"
+ TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}"
+ udevadm settle
+ fi
+ '';
+
+ };
+
+}
diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index 6e226c190609..33862b0965cc 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -23,6 +23,8 @@ let
fi
'';
+ udhcpcArgs = toString cfg.udhcpc.extraArgs;
+
in
{
@@ -40,6 +42,20 @@ in
kernel documentation. Otherwise, if
is enabled, an IP address
is acquired using DHCP.
+
+ You should add the module(s) required for your network card to
+ boot.initrd.availableKernelModules. lspci -v -s <ethernet controller>
+ will tell you which.
+ '';
+ };
+
+ boot.initrd.network.udhcpc.extraArgs = mkOption {
+ default = [];
+ type = types.listOf types.str;
+ description = ''
+ Additional command-line arguments passed verbatim to udhcpc if
+ and
+ are enabled.
'';
};
@@ -87,7 +103,7 @@ in
# Acquire a DHCP lease.
echo "acquiring IP address via DHCP..."
- udhcpc --quit --now --script ${udhcpcScript} && hasNetwork=1
+ udhcpc --quit --now --script ${udhcpcScript} ${udhcpcArgs} && hasNetwork=1
fi
''
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index d78775c27582..8b3dc2d90eb3 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -89,9 +89,6 @@ in
config = mkIf (config.boot.initrd.network.enable && cfg.enable) {
assertions = [
- { assertion = cfg.hostRSAKey != null || cfg.hostDSSKey != null || cfg.hostECDSAKey != null;
- message = "You should specify at least one host key for initrd SSH";
- }
{ assertion = cfg.authorizedKeys != [];
message = "You should specify at least one authorized key for initrd SSH";
}
@@ -121,7 +118,7 @@ in
echo ${escapeShellArg key} >> /root/.ssh/authorized_keys
'') cfg.authorizedKeys)}
- dropbear -s -j -k -E -m -p ${toString cfg.port}
+ dropbear -s -j -k -E -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"}
'';
boot.initrd.secrets =
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 4db9631743e3..3bd7d3558269 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -5,7 +5,7 @@ with lib;
let
inherit (config.boot) kernelPatches;
-
+ inherit (config.boot.kernel) features;
inherit (config.boot.kernelPackages) kernel;
kernelModulesConf = pkgs.writeText "nixos.conf"
@@ -21,11 +21,25 @@ in
options = {
+ boot.kernel.features = mkOption {
+ default = {};
+ example = literalExample "{ debug = true; }";
+ internal = true;
+ description = ''
+ This option allows to enable or disable certain kernel features.
+ It's not API, because it's about kernel feature sets, that
+ make sense for specific use cases. Mostly along with programs,
+ which would have separate nixos options.
+ `grep features pkgs/os-specific/linux/kernel/common-config.nix`
+ '';
+ };
+
boot.kernelPackages = mkOption {
default = pkgs.linuxPackages;
apply = kernelPackages: kernelPackages.extend (self: super: {
kernel = super.kernel.override {
kernelPatches = super.kernel.kernelPatches ++ kernelPatches;
+ features = lib.recursiveUpdate super.kernel.features features;
};
});
# We don't want to evaluate all of linuxPackages for the manual
@@ -170,7 +184,7 @@ in
[ "loglevel=${toString config.boot.consoleLogLevel}" ] ++
optionals config.boot.vesa [ "vga=0x317" ];
- boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel;
+ boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel;
boot.kernelModules = [ "loop" "atkbd" ];
@@ -197,7 +211,7 @@ in
"mmc_block"
# Support USB keyboards, in case the boot fails and we only have
- # a USB keyboard.
+ # a USB keyboard, or for LUKS passphrase prompt.
"uhci_hcd"
"ehci_hcd"
"ehci_pci"
@@ -207,11 +221,13 @@ in
"xhci_pci"
"usbhid"
"hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
+ "hid_logitech_hidpp" "hid_logitech_dj"
- # Misc. keyboard stuff.
+ ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
+ # Misc. x86 keyboard stuff.
"pcips2" "atkbd" "i8042"
- # Needed by the stage 2 init script.
+ # x86 RTC needed by the stage 2 init script.
"rtc_cmos"
];
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index b7821f9509f1..14ebe66e6320 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,21 +1,22 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
{
- environment.systemPackages = [ pkgs.kexectools ];
+ config = lib.mkIf (pkgs.kexectools != null) {
+ environment.systemPackages = [ pkgs.kexectools ];
- systemd.services."prepare-kexec" =
- { description = "Preparation for kexec";
- wantedBy = [ "kexec.target" ];
- before = [ "systemd-kexec.service" ];
- unitConfig.DefaultDependencies = false;
- serviceConfig.Type = "oneshot";
- path = [ pkgs.kexectools ];
- script =
- ''
- p=$(readlink -f /nix/var/nix/profiles/system)
- if ! [ -d $p ]; then exit 1; fi
- exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"
- '';
- };
-
-}
\ No newline at end of file
+ systemd.services."prepare-kexec" =
+ { description = "Preparation for kexec";
+ wantedBy = [ "kexec.target" ];
+ before = [ "systemd-kexec.service" ];
+ unitConfig.DefaultDependencies = false;
+ serviceConfig.Type = "oneshot";
+ path = [ pkgs.kexectools ];
+ script =
+ ''
+ p=$(readlink -f /nix/var/nix/profiles/system)
+ if ! [ -d $p ]; then exit 1; fi
+ exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 9056121fa7d1..e2cff1c1bd94 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -40,7 +40,7 @@ let
{ splashImage = f cfg.splashImage;
grub = f grub;
grubTarget = f (grub.grubTarget or "");
- shell = "${pkgs.stdenv.shell}";
+ shell = "${pkgs.runtimeShell}";
fullName = (builtins.parseDrvName realGrub.name).name;
fullVersion = (builtins.parseDrvName realGrub.name).version;
grubEfi = f grubEfi;
@@ -110,7 +110,7 @@ in
device = mkOption {
default = "";
- example = "/dev/hda";
+ example = "/dev/disk/by-id/wwn-0x500001234567890a";
type = types.str;
description = ''
The device on which the GRUB boot loader will be installed.
@@ -123,7 +123,7 @@ in
devices = mkOption {
default = [];
- example = [ "/dev/hda" ];
+ example = [ "/dev/disk/by-id/wwn-0x500001234567890a" ];
type = types.listOf types.str;
description = ''
The devices on which the boot loader, GRUB, will be
@@ -135,8 +135,8 @@ in
mirroredBoots = mkOption {
default = [ ];
example = [
- { path = "/boot1"; devices = [ "/dev/sda" ]; }
- { path = "/boot2"; devices = [ "/dev/sdb" ]; }
+ { path = "/boot1"; devices = [ "/dev/disk/by-id/wwn-0x500001234567890a" ]; }
+ { path = "/boot2"; devices = [ "/dev/disk/by-id/wwn-0x500009876543210a" ]; }
];
description = ''
Mirror the boot configuration to multiple partitions and install grub
@@ -178,7 +178,7 @@ in
devices = mkOption {
default = [ ];
- example = [ "/dev/sda" "/dev/sdb" ];
+ example = [ "/dev/disk/by-id/wwn-0x500001234567890a" "/dev/disk/by-id/wwn-0x500009876543210a" ];
type = types.listOf types.str;
description = ''
The path to the devices which will have the GRUB MBR written.
@@ -536,9 +536,9 @@ in
btrfsprogs = pkgs.btrfs-progs;
};
in pkgs.writeScript "install-grub.sh" (''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
set -e
- export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])}
+ export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX XMLSAXBase ListCompare ])}
${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
'' + flip concatMapStrings cfg.mirroredBoots (args: ''
${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index cc03e54ead63..8bd203106f55 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -182,7 +182,7 @@ sub GrubFs {
# Based on the type pull in the identifier from the system
my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}");
if ($status != 0) {
- die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}";
+ die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}";
}
my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
if ($#matches != 0) {
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 06f004fb06ec..54dfb53fd30f 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -5,7 +5,7 @@ with lib;
let
luks = config.boot.initrd.luks;
- openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, ... }: assert name' == name; ''
+ openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, fallbackToPassword, ... }: assert name' == name; ''
# Wait for a target (e.g. device, keyFile, header, ...) to appear.
wait_target() {
@@ -43,8 +43,17 @@ let
open_normally() {
echo luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \
${optionalString (header != null) "--header=${header}"} \
- ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"} \
> /.luksopen_args
+ ${optionalString (keyFile != null) ''
+ ${optionalString fallbackToPassword "if [ -e ${keyFile} ]; then"}
+ echo " --key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}" \
+ >> /.luksopen_args
+ ${optionalString fallbackToPassword ''
+ else
+ echo "keyfile ${keyFile} not found -- fallback to interactive unlocking"
+ fi
+ ''}
+ ''}
cryptsetup-askpass
rm /.luksopen_args
}
@@ -227,6 +236,7 @@ in
default =
[ "aes" "aes_generic" "blowfish" "twofish"
"serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
+
(if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586")
];
description = ''
@@ -323,6 +333,16 @@ in
'';
};
+ fallbackToPassword = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Whether to fallback to interactive passphrase prompt if the keyfile
+ cannot be found. This will prevent unattended boot should the keyfile
+ go missing.
+ '';
+ };
+
yubikey = mkOption {
default = null;
description = ''
@@ -434,7 +454,12 @@ in
["firewire_ohci" "firewire_core" "firewire_sbp2"];
# Some modules that may be needed for mounting anything ciphered
- boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" ] ++ luks.cryptoModules;
+ # Also load input_leds to get caps lock light working (#12456)
+ boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ]
+ ++ luks.cryptoModules
+ # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged
+ # remove once 'modprobe --show-depends xts' shows ecb as a dependency
+ ++ (if builtins.elem "xts" luks.cryptoModules then ["ecb"] else []);
# copy the cryptsetup binary and it's dependencies
boot.initrd.extraUtilsCommands = ''
diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index b915a98d5375..dee0ab470c99 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
@@ -54,7 +54,7 @@ with lib;
environment.systemPackages = [ pkgs.kmod ];
- system.activationScripts.modprobe =
+ system.activationScripts.modprobe = stringAfter ["specialfs"]
''
# Allow the kernel to find our wrapped modprobe (which searches
# in the right location in the Nix store for kernel modules).
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 9d2cea3ad165..eea10613ea58 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -94,7 +94,7 @@ let
checkNetwork = checkUnitConfig "Network" [
(assertOnlyFields [
"Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute"
- "LLMNR" "MulticastDNS" "Domains" "Bridge" "Bond"
+ "LLMNR" "MulticastDNS" "Domains" "Bridge" "Bond" "IPv6PrivacyExtensions"
])
(assertValueOneOf "DHCP" ["both" "none" "v4" "v6"])
(assertValueOneOf "DHCPServer" boolValues)
@@ -104,6 +104,7 @@ let
(assertValueOneOf "IPv4LLRoute" boolValues)
(assertValueOneOf "LLMNR" boolValues)
(assertValueOneOf "MulticastDNS" boolValues)
+ (assertValueOneOf "IPv6PrivacyExtensions" ["yes" "no" "prefer-public" "kernel"])
];
checkAddress = checkUnitConfig "Address" [
@@ -700,7 +701,6 @@ in
systemd.additionalUpstreamSystemUnits = [
"systemd-networkd.service" "systemd-networkd-wait-online.service"
- "org.freedesktop.network1.busname"
];
systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 4b0c498424b5..f8fb8a64cb9b 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -8,9 +8,14 @@ let
cfg = config.boot.plymouth;
+ breezePlymouth = pkgs.breeze-plymouth.override {
+ nixosBranding = true;
+ nixosVersion = config.system.nixos.release;
+ };
+
themesEnv = pkgs.buildEnv {
name = "plymouth-themes";
- paths = [ plymouth ] ++ cfg.themePackages;
+ paths = [ plymouth breezePlymouth ] ++ cfg.themePackages;
};
configFile = pkgs.writeText "plymouthd.conf" ''
@@ -38,7 +43,7 @@ in
};
theme = mkOption {
- default = "fade-in";
+ default = "breeze";
type = types.str;
description = ''
Splash screen theme.
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index 2147d43c4f19..4d9de020c84e 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -126,7 +126,7 @@ in
config = mkIf cfg.enable {
systemd.additionalUpstreamSystemUnits = [
- "systemd-resolved.service" "org.freedesktop.resolve1.busname"
+ "systemd-resolved.service"
];
systemd.services.systemd-resolved = {
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index b442386914ad..964ec68cfe2f 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -167,6 +167,7 @@ done
# Load the required kernel modules.
mkdir -p /lib
ln -s @modulesClosure@/lib/modules /lib/modules
+ln -s @modulesClosure@/lib/firmware /lib/firmware
echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe
for i in @kernelModules@; do
echo "loading module $(basename $i)..."
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index d6e3e3a87d01..55bb6d3449c5 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -13,12 +13,14 @@ let
kernelPackages = config.boot.kernelPackages;
modulesTree = config.system.modulesTree;
+ firmware = config.hardware.firmware;
# Determine the set of modules that we need to mount the root FS.
modulesClosure = pkgs.makeModulesClosure {
rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
kernel = modulesTree;
+ firmware = firmware;
allowMissing = true;
};
@@ -28,6 +30,50 @@ let
# mounting `/`, like `/` on a loopback).
fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;
+ # A utility for enumerating the shared-library dependencies of a program
+ findLibs = pkgs.writeShellScriptBin "find-libs" ''
+ set -euo pipefail
+
+ declare -A seen
+ declare -a left
+
+ patchelf="${pkgs.buildPackages.patchelf}/bin/patchelf"
+
+ function add_needed {
+ rpath="$($patchelf --print-rpath $1)"
+ dir="$(dirname $1)"
+ for lib in $($patchelf --print-needed $1); do
+ left+=("$lib" "$rpath" "$dir")
+ done
+ }
+
+ add_needed $1
+
+ while [ ''${#left[@]} -ne 0 ]; do
+ next=''${left[0]}
+ rpath=''${left[1]}
+ ORIGIN=''${left[2]}
+ left=("''${left[@]:3}")
+ if [ -z ''${seen[$next]+x} ]; then
+ seen[$next]=1
+ IFS=: read -ra paths <<< $rpath
+ res=
+ for path in "''${paths[@]}"; do
+ path=$(eval "echo $path")
+ if [ -f "$path/$next" ]; then
+ res="$path/$next"
+ echo "$res"
+ add_needed "$res"
+ break
+ fi
+ done
+ if [ -z "$res" ]; then
+ echo "Couldn't satisfy dependency $next" >&2
+ exit 1
+ fi
+ fi
+ done
+ '';
# Some additional utilities needed in stage 1, like mount, lvm, fsck
# etc. We don't want to bring in all of those packages, so we just
@@ -35,7 +81,7 @@ let
# we just copy what we need from Glibc and use patchelf to make it
# work.
extraUtils = pkgs.runCommandCC "extra-utils"
- { buildInputs = [pkgs.nukeReferences];
+ { nativeBuildInputs = [pkgs.buildPackages.nukeReferences];
allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd
}
''
@@ -101,9 +147,7 @@ let
# Copy all of the needed libraries
find $out/bin $out/lib -type f | while read BIN; do
echo "Copying libs for executable $BIN"
- LDD="$(ldd $BIN)" || continue
- LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')"
- for LIB in $LIBS; do
+ for LIB in $(${findLibs}/bin/find-libs $BIN); do
TGT="$out/lib/$(basename $LIB)"
if [ ! -f "$TGT" ]; then
SRC="$(readlink -e $LIB)"
@@ -130,6 +174,7 @@ let
fi
done
+ if [ -z "${toString pkgs.stdenv.isCross}" ]; then
# Make sure that the patchelf'ed binaries still work.
echo "testing patched programs..."
$out/bin/ash -c 'echo hello world' | grep "hello world"
@@ -142,6 +187,7 @@ let
$out/bin/mdadm --version
${config.boot.initrd.extraUtilsCommandsTest}
+ fi
''; # */
@@ -243,7 +289,7 @@ let
{ src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; }
''
target=$out
- ${pkgs.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
+ ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
'';
symlink = "/etc/modprobe.d/ubuntu.conf";
}
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 46aed44bf10f..9d2c580d62a7 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -82,7 +82,6 @@ ln -s /proc/mounts /etc/mtab
mkdir -m 01777 -p /tmp
mkdir -m 0755 -p /var/{log,lib,db} /nix/var /etc/nixos/ \
/run/lock /home /bin # for the /bin/sh symlink
-install -m 0700 -d /root
# Miscellaneous boot time cleanup.
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index 8db6d2d2f734..78afbd8dbc12 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -10,6 +10,7 @@ let
bootStage2 = pkgs.substituteAll {
src = ./stage-2-init.sh;
shellDebug = "${pkgs.bashInteractive}/bin/bash";
+ shell = "${pkgs.bash}/bin/bash";
isExecutable = true;
inherit (config.nix) readOnlyStore;
inherit (config.networking) useHostResolvConf;
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index dd9ba7104485..92c9ee0c4691 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -14,7 +14,6 @@ let
upstreamSystemUnits =
[ # Targets.
"basic.target"
- "busnames.target"
"sysinit.target"
"sockets.target"
"exit.target"
@@ -47,6 +46,7 @@ let
# Consoles.
"getty.target"
+ "getty-pre.target"
"getty@.service"
"serial-getty@.service"
"console-getty.service"
@@ -63,10 +63,7 @@ let
"systemd-logind.service"
"autovt@.service"
"systemd-user-sessions.service"
- "dbus-org.freedesktop.login1.service"
"dbus-org.freedesktop.machine1.service"
- "org.freedesktop.login1.busname"
- "org.freedesktop.machine1.busname"
"user@.service"
# Journal.
@@ -99,7 +96,6 @@ let
"swap.target"
"dev-hugepages.mount"
"dev-mqueue.mount"
- "proc-sys-fs-binfmt_misc.mount"
"sys-fs-fuse-connections.mount"
"sys-kernel-config.mount"
"sys-kernel-debug.mount"
@@ -155,19 +151,16 @@ let
"systemd-tmpfiles-setup-dev.service"
# Misc.
- "org.freedesktop.systemd1.busname"
"systemd-sysctl.service"
"dbus-org.freedesktop.timedate1.service"
"dbus-org.freedesktop.locale1.service"
"dbus-org.freedesktop.hostname1.service"
- "org.freedesktop.timedate1.busname"
- "org.freedesktop.locale1.busname"
- "org.freedesktop.hostname1.busname"
"systemd-timedated.service"
"systemd-localed.service"
"systemd-hostnamed.service"
"systemd-binfmt.service"
"systemd-exit.service"
+ "systemd-update-done.service"
]
++ cfg.additionalUpstreamSystemUnits;
@@ -182,7 +175,6 @@ let
upstreamUserUnits =
[ "basic.target"
"bluetooth.target"
- "busnames.target"
"default.target"
"exit.target"
"graphical-session-pre.target"
@@ -249,37 +241,37 @@ let
}
(mkIf (config.preStart != "")
{ serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" ''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
${config.preStart}
'';
})
(mkIf (config.script != "")
{ serviceConfig.ExecStart = makeJobScript "${name}-start" ''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
${config.script}
'' + " " + config.scriptArgs;
})
(mkIf (config.postStart != "")
{ serviceConfig.ExecStartPost = makeJobScript "${name}-post-start" ''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
${config.postStart}
'';
})
(mkIf (config.reload != "")
{ serviceConfig.ExecReload = makeJobScript "${name}-reload" ''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
${config.reload}
'';
})
(mkIf (config.preStop != "")
{ serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" ''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
${config.preStop}
'';
})
(mkIf (config.postStop != "")
{ serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" ''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
${config.postStop}
'';
})
@@ -789,8 +781,7 @@ in
# Keep a persistent journal. Note that systemd-tmpfiles will
# set proper ownership/permissions.
- # FIXME: revert to 0700 with systemd v233.
- mkdir -m 0750 -p /var/log/journal
+ mkdir -m 0700 -p /var/log/journal
'';
users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
@@ -887,7 +878,7 @@ in
systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
systemd.targets.network-online.wantedBy = [ "multi-user.target" ];
- systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ];
+ systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ];
# Don't bother with certain units in containers.
systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";
diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
index 8cfa1b6921d3..1384873b6631 100644
--- a/nixos/modules/tasks/filesystems/btrfs.nix
+++ b/nixos/modules/tasks/filesystems/btrfs.nix
@@ -1,35 +1,132 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, utils, ... }:
with lib;
let
inInitrd = any (fs: fs == "btrfs") config.boot.initrd.supportedFilesystems;
+ inSystem = any (fs: fs == "btrfs") config.boot.supportedFilesystems;
+
+ cfgScrub = config.services.btrfs.autoScrub;
+
+ enableAutoScrub = cfgScrub.enable;
+ enableBtrfs = inInitrd || inSystem || enableAutoScrub;
in
{
- config = mkIf (any (fs: fs == "btrfs") config.boot.supportedFilesystems) {
+ options = {
+ # One could also do regular btrfs balances, but that shouldn't be necessary
+ # during normal usage and as long as the filesystems aren't filled near capacity
+ services.btrfs.autoScrub = {
+ enable = mkEnableOption "Enable regular btrfs scrub";
- system.fsPackages = [ pkgs.btrfs-progs ];
+ fileSystems = mkOption {
+ type = types.listOf types.path;
+ example = [ "/" ];
+ description = ''
+ List of paths to btrfs filesystems to regularily call btrfs scrub on.
+ Defaults to all mount points with btrfs filesystems.
+ If you mount a filesystem multiple times or additionally mount subvolumes,
+ you need to manually specify this list to avoid scrubbing multiple times.
+ '';
+ };
- boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ];
+ interval = mkOption {
+ default = "monthly";
+ type = types.str;
+ example = "weekly";
+ description = ''
+ Systemd calendar expression for when to scrub btrfs filesystems.
+ The recommended period is a month but could be less
+ (btrfs-scrub
+ 8).
+ See
+ systemd.time
+ 7
+ for more information on the syntax.
+ '';
+ };
- boot.initrd.extraUtilsCommands = mkIf inInitrd
+ };
+ };
+
+ config = mkMerge [
+ (mkIf enableBtrfs {
+ system.fsPackages = [ pkgs.btrfs-progs ];
+
+ boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ];
+
+ boot.initrd.extraUtilsCommands = mkIf inInitrd
''
copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs
ln -sv btrfs $out/bin/btrfsck
ln -sv btrfsck $out/bin/fsck.btrfs
'';
- boot.initrd.extraUtilsCommandsTest = mkIf inInitrd
+ boot.initrd.extraUtilsCommandsTest = mkIf inInitrd
''
$out/bin/btrfs --version
'';
- boot.initrd.postDeviceCommands = mkIf inInitrd
+ boot.initrd.postDeviceCommands = mkIf inInitrd
''
btrfs device scan
'';
- };
+ })
+
+ (mkIf enableAutoScrub {
+ assertions = [
+ {
+ assertion = cfgScrub.enable -> (cfgScrub.fileSystems != []);
+ message = ''
+ If 'services.btrfs.autoScrub' is enabled, you need to have at least one
+ btrfs file system mounted via 'fileSystems' or specify a list manually
+ in 'services.btrfs.autoScrub.fileSystems'.
+ '';
+ }
+ ];
+
+ # This will yield duplicated units if the user mounts a filesystem multiple times
+ # or additionally mounts subvolumes, but going the other way around via devices would
+ # yield duplicated units when a filesystem spans multiple devices.
+ # This way around seems like the more sensible default.
+ services.btrfs.autoScrub.fileSystems = mkDefault (mapAttrsToList (name: fs: fs.mountPoint)
+ (filterAttrs (name: fs: fs.fsType == "btrfs") config.fileSystems));
+
+ # TODO: Did not manage to do it via the usual btrfs-scrub@.timer/.service
+ # template units due to problems enabling the parameterized units,
+ # so settled with many units and templating via nix for now.
+ # https://github.com/NixOS/nixpkgs/pull/32496#discussion_r156527544
+ systemd.timers = let
+ scrubTimer = fs: let
+ fs' = utils.escapeSystemdPath fs;
+ in nameValuePair "btrfs-scrub-${fs'}" {
+ description = "regular btrfs scrub timer on ${fs}";
+
+ wantedBy = [ "timers.target" ];
+ timerConfig = {
+ OnCalendar = cfgScrub.interval;
+ AccuracySec = "1d";
+ Persistent = true;
+ };
+ };
+ in listToAttrs (map scrubTimer cfgScrub.fileSystems);
+
+ systemd.services = let
+ scrubService = fs: let
+ fs' = utils.escapeSystemdPath fs;
+ in nameValuePair "btrfs-scrub-${fs'}" {
+ description = "btrfs scrub on ${fs}";
+
+ serviceConfig = {
+ Type = "oneshot";
+ Nice = 19;
+ IOSchedulingClass = "idle";
+ ExecStart = "${pkgs.btrfs-progs}/bin/btrfs scrub start -B ${fs}";
+ };
+ };
+ in listToAttrs (map scrubService cfgScrub.fileSystems);
+ })
+ ];
}
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 7fee99115329..30c54ddd0e4e 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -24,7 +24,11 @@ let
kernel = config.boot.kernelPackages;
- packages = if config.boot.zfs.enableUnstable then {
+ packages = if config.boot.zfs.enableLegacyCrypto then {
+ spl = kernel.splLegacyCrypto;
+ zfs = kernel.zfsLegacyCrypto;
+ zfsUser = pkgs.zfsLegacyCrypto;
+ } else if config.boot.zfs.enableUnstable then {
spl = kernel.splUnstable;
zfs = kernel.zfsUnstable;
zfsUser = pkgs.zfsUnstable;
@@ -75,6 +79,27 @@ in
'';
};
+ enableLegacyCrypto = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enabling this option will allow you to continue to use the old format for
+ encrypted datasets. With the inclusion of stability patches the format of
+ encrypted datasets has changed. They can still be accessed and mounted but
+ in read-only mode mounted. It is highly recommended to convert them to
+ the new format.
+
+ This option is only for convenience to people that cannot convert their
+ datasets to the new format yet and it will be removed in due time.
+
+ For migration strategies from old format to this new one, check the Wiki:
+ https://nixos.wiki/wiki/NixOS_on_ZFS#Encrypted_Dataset_Format_Change
+
+ See https://github.com/zfsonlinux/zfs/pull/6864 for more details about
+ the stability patches.
+ '';
+ };
+
extraPools = mkOption {
type = types.listOf types.str;
default = [];
@@ -268,7 +293,7 @@ in
assertions = [
{
assertion = config.networking.hostId != null;
- message = "ZFS requires config.networking.hostId to be set";
+ message = "ZFS requires networking.hostId to be set";
}
{
assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 7fb3cbc5c1bc..fbe42b8e8f04 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -13,7 +13,7 @@ let
isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale);
optimizedKeymap = pkgs.runCommand "keymap" {
- nativeBuildInputs = [ pkgs.kbd ];
+ nativeBuildInputs = [ pkgs.buildPackages.kbd ];
LOADKEYS_KEYMAP_PATH = "${kbdEnv}/share/keymaps/**";
} ''
loadkeys -b ${optionalString isUnicode "-u"} "${config.i18n.consoleKeyMap}" > $out
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 1f424f84c6e0..630fe6d114ce 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -20,14 +20,8 @@ let
"sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
interfaceIps = i:
- i.ip4 ++ optionals cfg.enableIPv6 i.ip6
- ++ optional (i.ipAddress != null) {
- address = i.ipAddress;
- prefixLength = i.prefixLength;
- } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) {
- address = i.ipv6Address;
- prefixLength = i.ipv6PrefixLength;
- };
+ i.ipv4.addresses
+ ++ optionals cfg.enableIPv6 i.ipv6.addresses;
destroyBond = i: ''
while true; do
@@ -80,7 +74,7 @@ let
else optional (dev != null && dev != "lo" && !config.boot.isContainer) (subsystemDevice dev);
hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "")
- || (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");
+ || (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");
networkLocalCommands = {
after = [ "network-setup.service" ];
@@ -185,33 +179,58 @@ let
path = [ pkgs.iproute ];
script =
''
- # FIXME: shouldn't this be done in network-link?
- echo "bringing up interface..."
- ip link set "${i.name}" up
-
state="/run/nixos/network/addresses/${i.name}"
-
mkdir -p $(dirname "$state")
- '' + flip concatMapStrings (ips) (ip:
- let
- address = "${ip.address}/${toString ip.prefixLength}";
- in
- ''
- echo "${address}" >> $state
- if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then
- echo "added ip ${address}"
- elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
- echo "failed to add ${address}"
- exit 1
- fi
- '');
+ ${flip concatMapStrings ips (ip:
+ let
+ cidr = "${ip.address}/${toString ip.prefixLength}";
+ in
+ ''
+ echo "${cidr}" >> $state
+ echo -n "adding address ${cidr}... "
+ if out=$(ip addr add "${cidr}" dev "${i.name}" 2>&1); then
+ echo "done"
+ elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
+ echo "failed"
+ exit 1
+ fi
+ ''
+ )}
+
+ state="/run/nixos/network/routes/${i.name}"
+ mkdir -p $(dirname "$state")
+
+ ${flip concatMapStrings (i.ipv4.routes ++ i.ipv6.routes) (route:
+ let
+ cidr = "${route.address}/${toString route.prefixLength}";
+ via = optionalString (route.via != null) ''via "${route.via}"'';
+ options = concatStrings (mapAttrsToList (name: val: "${name} ${val} ") route.options);
+ in
+ ''
+ echo "${cidr}" >> $state
+ echo -n "adding route ${cidr}... "
+ if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" 2>&1); then
+ echo "done"
+ elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
+ echo "failed"
+ exit 1
+ fi
+ ''
+ )}
+ '';
preStop = ''
+ state="/run/nixos/network/routes/${i.name}"
+ while read cidr; do
+ echo -n "deleting route $cidr... "
+ ip route del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed"
+ done < "$state"
+ rm -f "$state"
+
state="/run/nixos/network/addresses/${i.name}"
- while read address; do
- echo -n "deleting $address..."
- ip addr del "$address" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed"
- echo ""
+ while read cidr; do
+ echo -n "deleting address $cidr... "
+ ip addr del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed"
done < "$state"
rm -f "$state"
'';
@@ -230,9 +249,7 @@ let
RemainAfterExit = true;
};
script = ''
- ip tuntap add dev "${i.name}" \
- ${optionalString (i.virtualType != null) "mode ${i.virtualType}"} \
- user "${i.virtualOwner}"
+ ip tuntap add dev "${i.name}" mode "${i.virtualType}" user "${i.virtualOwner}"
'';
postStop = ''
ip link del ${i.name} || true
@@ -271,6 +288,17 @@ let
${i}
'')}" > /run/${n}.interfaces
+ ${optionalString config.virtualisation.libvirtd.enable ''
+ # Enslave dynamically added interfaces which may be lost on nixos-rebuild
+ for uri in qemu:///system lxc:///; do
+ for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do
+ ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \
+ ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \
+ ${pkgs.bash}/bin/bash
+ done
+ done
+ ''}
+
# Enable stp on the interface
${optionalString v.rstp ''
echo 2 >/sys/class/net/${n}/bridge/stp_state
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index a365a01bfb1e..c640e886fca8 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -9,14 +9,8 @@ let
interfaces = attrValues cfg.interfaces;
interfaceIps = i:
- i.ip4 ++ optionals cfg.enableIPv6 i.ip6
- ++ optional (i.ipAddress != null) {
- address = i.ipAddress;
- prefixLength = i.prefixLength;
- } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) {
- address = i.ipv6Address;
- prefixLength = i.ipv6PrefixLength;
- };
+ i.ipv4.addresses
+ ++ optionals cfg.enableIPv6 i.ipv6.addresses;
dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "none";
@@ -74,27 +68,24 @@ in
networks."99-main" = genericNetwork mkDefault;
}
(mkMerge (flip map interfaces (i: {
- netdevs = mkIf i.virtual (
- let
- devType = if i.virtualType != null then i.virtualType
- else (if hasPrefix "tun" i.name then "tun" else "tap");
- in {
- "40-${i.name}" = {
- netdevConfig = {
- Name = i.name;
- Kind = devType;
- };
- "${devType}Config" = optionalAttrs (i.virtualOwner != null) {
- User = i.virtualOwner;
- };
+ netdevs = mkIf i.virtual ({
+ "40-${i.name}" = {
+ netdevConfig = {
+ Name = i.name;
+ Kind = i.virtualType;
};
- });
+ "${i.virtualType}Config" = optionalAttrs (i.virtualOwner != null) {
+ User = i.virtualOwner;
+ };
+ };
+ });
networks."40-${i.name}" = mkMerge [ (genericNetwork mkDefault) {
name = mkDefault i.name;
DHCP = mkForce (dhcpStr
(if i.useDHCP != null then i.useDHCP else cfg.useDHCP && interfaceIps i == [ ]));
address = flip map (interfaceIps i)
(ip: "${ip.address}/${toString ip.prefixLength}");
+ networkConfig.IPv6PrivacyExtensions = "kernel";
} ];
})))
(mkMerge (flip mapAttrsToList cfg.bridges (name: bridge: {
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index b7e85e402aa9..a2d2eb1c3119 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, utils, stdenv, ... }:
+{ config, options, lib, pkgs, utils, stdenv, ... }:
with lib;
with utils;
@@ -26,7 +26,7 @@ let
executable = true;
destination = "/bin/bridge-stp";
text = ''
- #!${pkgs.stdenv.shell} -e
+ #!${pkgs.runtimeShell} -e
export PATH="${pkgs.mstpd}/bin"
BRIDGES=(${concatStringsSep " " (attrNames rstpBridges)})
@@ -64,7 +64,7 @@ let
# udev script that configures a physical wlan device and adds virtual interfaces
wlanDeviceUdevScript = device: interfaceList: pkgs.writeScript "wlan-${device}-udev-script" ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
# Change the wireless phy device to a predictable name.
if [ -e "/sys/class/net/${device}/phy80211/name" ]; then
@@ -101,7 +101,7 @@ let
address = mkOption {
type = types.str;
description = ''
- IPv${toString v} address of the interface. Leave empty to configure the
+ IPv${toString v} address of the interface. Leave empty to configure the
interface using DHCP.
'';
};
@@ -116,6 +116,40 @@ let
};
};
+ routeOpts = v:
+ { options = {
+ address = mkOption {
+ type = types.str;
+ description = "IPv${toString v} address of the network.";
+ };
+
+ prefixLength = mkOption {
+ type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128));
+ description = ''
+ Subnet mask of the network, specified as the number of
+ bits in the prefix (${if v == 4 then "24" else "64"}).
+ '';
+ };
+
+ via = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "IPv${toString v} address of the next hop.";
+ };
+
+ options = mkOption {
+ type = types.attrsOf types.str;
+ default = { };
+ example = { mtu = "1492"; window = "524288"; };
+ description = ''
+ Other route options. See the symbol OPTIONS
+ in the ip-route(8) manual page for the details.
+ '';
+ };
+
+ };
+ };
+
gatewayCoerce = address: { inherit address; };
gatewayOpts = { ... }: {
@@ -148,13 +182,22 @@ let
interfaceOpts = { name, ... }: {
options = {
-
name = mkOption {
example = "eth0";
type = types.str;
description = "Name of the interface.";
};
+ preferTempAddress = mkOption {
+ type = types.bool;
+ default = cfg.enableIPv6;
+ defaultText = literalExample "config.networking.enableIPv6";
+ description = ''
+ When using SLAAC prefer a temporary (IPv6) address over the EUI-64
+ address for originating connections. This is used to reduce tracking.
+ '';
+ };
+
useDHCP = mkOption {
type = types.nullOr types.bool;
default = null;
@@ -165,7 +208,7 @@ let
'';
};
- ip4 = mkOption {
+ ipv4.addresses = mkOption {
default = [ ];
example = [
{ address = "10.0.0.1"; prefixLength = 16; }
@@ -177,7 +220,7 @@ let
'';
};
- ip6 = mkOption {
+ ipv6.addresses = mkOption {
default = [ ];
example = [
{ address = "fdfd:b3f0:482::1"; prefixLength = 48; }
@@ -189,50 +232,27 @@ let
'';
};
- ipAddress = mkOption {
- default = null;
- example = "10.0.0.1";
- type = types.nullOr types.str;
+ ipv4.routes = mkOption {
+ default = [];
+ example = [
+ { address = "10.0.0.0"; prefixLength = 16; }
+ { address = "192.168.2.0"; prefixLength = 24; via = "192.168.1.1"; }
+ ];
+ type = with types; listOf (submodule (routeOpts 4));
description = ''
- IP address of the interface. Leave empty to configure the
- interface using DHCP.
+ List of extra IPv4 static routes that will be assigned to the interface.
'';
};
- prefixLength = mkOption {
- default = null;
- example = 24;
- type = types.nullOr types.int;
+ ipv6.routes = mkOption {
+ default = [];
+ example = [
+ { address = "fdfd:b3f0::"; prefixLength = 48; }
+ { address = "2001:1470:fffd:2098::"; prefixLength = 64; via = "fdfd:b3f0::1"; }
+ ];
+ type = with types; listOf (submodule (routeOpts 6));
description = ''
- Subnet mask of the interface, specified as the number of
- bits in the prefix (24).
- '';
- };
-
- subnetMask = mkOption {
- default = null;
- description = ''
- Defunct, supply the prefix length instead.
- '';
- };
-
- ipv6Address = mkOption {
- default = null;
- example = "2001:1470:fffd:2098::e006";
- type = types.nullOr types.str;
- description = ''
- IPv6 address of the interface. Leave empty to configure the
- interface using NDP.
- '';
- };
-
- ipv6PrefixLength = mkOption {
- default = 64;
- example = 64;
- type = types.int;
- description = ''
- Subnet mask of the interface, specified as the number of
- bits in the prefix (64).
+ List of extra IPv6 static routes that will be assigned to the interface.
'';
};
@@ -273,11 +293,13 @@ let
};
virtualType = mkOption {
- default = null;
- type = with types; nullOr (enum [ "tun" "tap" ]);
+ default = if hasPrefix "tun" name then "tun" else "tap";
+ defaultText = literalExample ''if hasPrefix "tun" name then "tun" else "tap"'';
+ type = with types; enum [ "tun" "tap" ];
description = ''
- The explicit type of interface to create. Accepts tun or tap strings.
- Also accepts null to implicitly detect the type of device.
+ The type of interface to create.
+ The default is TUN for an interface name starting
+ with "tun", otherwise TAP.
'';
};
@@ -305,6 +327,32 @@ let
name = mkDefault name;
};
+ # Renamed or removed options
+ imports =
+ let
+ defined = x: x != "_mkMergedOptionModule";
+ in [
+ (mkRenamedOptionModule [ "ip4" ] [ "ipv4" "addresses"])
+ (mkRenamedOptionModule [ "ip6" ] [ "ipv6" "addresses"])
+ (mkRemovedOptionModule [ "subnetMask" ] ''
+ Supply a prefix length instead; use option
+ networking.interfaces..ipv{4,6}.addresses'')
+ (mkMergedOptionModule
+ [ [ "ipAddress" ] [ "prefixLength" ] ]
+ [ "ipv4" "addresses" ]
+ (cfg: with cfg;
+ optional (defined ipAddress && defined prefixLength)
+ { address = ipAddress; prefixLength = prefixLength; }))
+ (mkMergedOptionModule
+ [ [ "ipv6Address" ] [ "ipv6PrefixLength" ] ]
+ [ "ipv6" "addresses" ]
+ (cfg: with cfg;
+ optional (defined ipv6Address && defined ipv6PrefixLength)
+ { address = ipv6Address; prefixLength = ipv6PrefixLength; }))
+
+ ({ options.warnings = options.warnings; })
+ ];
+
};
hexChars = stringToCharacters "0123456789abcdef";
@@ -441,7 +489,7 @@ in
networking.interfaces = mkOption {
default = {};
example =
- { eth0.ip4 = [ {
+ { eth0.ipv4.addresses = [ {
address = "131.211.84.78";
prefixLength = 25;
} ];
@@ -920,13 +968,10 @@ in
config = {
+ warnings = concatMap (i: i.warnings) interfaces;
+
assertions =
(flip map interfaces (i: {
- assertion = i.subnetMask == null;
- message = ''
- The networking.interfaces."${i.name}".subnetMask option is defunct. Use prefixLength instead.
- '';
- })) ++ (flip map interfaces (i: {
# With the linux kernel, interface name length is limited by IFNAMSIZ
# to 16 bytes, including the trailing null byte.
# See include/linux/if.h in the kernel sources
@@ -935,10 +980,15 @@ in
The name of networking.interfaces."${i.name}" is too long, it needs to be less than 16 characters.
'';
})) ++ (flip map slaveIfs (i: {
- assertion = i.ip4 == [ ] && i.ipAddress == null && i.ip6 == [ ] && i.ipv6Address == null;
+ assertion = i.ipv4.addresses == [ ] && i.ipv6.addresses == [ ];
message = ''
The networking.interfaces."${i.name}" must not have any defined ips when it is a slave.
'';
+ })) ++ (flip map interfaces (i: {
+ assertion = i.preferTempAddress -> cfg.enableIPv6;
+ message = ''
+ Temporary addresses are only needed when IPv6 is enabled.
+ '';
})) ++ [
{
assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId);
@@ -961,9 +1011,10 @@ in
"net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6);
"net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);
"net.ipv6.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
- } // listToAttrs (concatLists (flip map (filter (i: i.proxyARP) interfaces)
- (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true))
- ));
+ } // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces)
+ (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true)))
+ // listToAttrs (flip map (filter (i: i.preferTempAddress) interfaces)
+ (i: nameValuePair "net.ipv6.conf.${i.name}.use_tempaddr" 2));
# Capabilities won't work unless we have at-least a 4.3 Linux
# kernel because we need the ambient capability
@@ -1071,6 +1122,9 @@ in
'' + optionalString (i.mtu != null) ''
echo "setting MTU to ${toString i.mtu}..."
ip link set "${i.name}" mtu "${toString i.mtu}"
+ '' + ''
+ echo -n "bringing up interface... "
+ ip link set "${i.name}" up && echo "done" || (echo "failed"; exit 1)
'';
})));
@@ -1104,7 +1158,7 @@ in
# The script creates the required, new WLAN interfaces interfaces and configures the
# existing, default interface.
curInterfaceScript = device: current: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${device}.sh" ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
# Change the wireless phy device to a predictable name.
${pkgs.iw}/bin/iw phy `${pkgs.coreutils}/bin/cat /sys/class/net/$INTERFACE/phy80211/name` set name ${device}
@@ -1123,7 +1177,7 @@ in
# Udev script to execute for a new WLAN interface. The script configures the new WLAN interface.
newInterfaceScript = device: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
# Configure the new interface
${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type}
${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${new.meshID}"}
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 7f5b55d5cca0..41dec2af9ed4 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -4,8 +4,11 @@
{ config, lib, pkgs, ... }:
with lib;
+with import ../../lib/qemu-flags.nix { inherit pkgs; };
-let kernel = config.boot.kernelPackages.kernel; in
+let
+ kernel = config.boot.kernelPackages.kernel;
+in
{
@@ -22,8 +25,8 @@ let kernel = config.boot.kernelPackages.kernel; in
systemd.services.backdoor =
{ wantedBy = [ "multi-user.target" ];
- requires = [ "dev-hvc0.device" "dev-ttyS0.device" ];
- after = [ "dev-hvc0.device" "dev-ttyS0.device" ];
+ requires = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ];
+ after = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ];
script =
''
export USER=root
@@ -40,7 +43,7 @@ let kernel = config.boot.kernelPackages.kernel; in
cd /tmp
exec < /dev/hvc0 > /dev/hvc0
- while ! exec 2> /dev/ttyS0; do sleep 0.1; done
+ while ! exec 2> /dev/${qemuSerialDevice}; do sleep 0.1; done
echo "connecting to host..." >&2
stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
echo
@@ -49,10 +52,10 @@ let kernel = config.boot.kernelPackages.kernel; in
serviceConfig.KillSignal = "SIGHUP";
};
- # Prevent agetty from being instantiated on ttyS0, since it
- # interferes with the backdoor (writes to ttyS0 will randomly fail
+ # Prevent agetty from being instantiated on the serial device, since it
+ # interferes with the backdoor (writes to it will randomly fail
# with EIO). Likewise for hvc0.
- systemd.services."serial-getty@ttyS0".enable = false;
+ systemd.services."serial-getty@${qemuSerialDevice}".enable = false;
systemd.services."serial-getty@hvc0".enable = false;
boot.initrd.preDeviceCommands =
@@ -88,7 +91,7 @@ let kernel = config.boot.kernelPackages.kernel; in
# Panic if an error occurs in stage 1 (rather than waiting for
# user intervention).
boot.kernelParams =
- [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
+ [ "console=${qemuSerialDevice}" "panic=1" "boot.panic_on_fail" ];
# `xwininfo' is used by the test driver to query open windows.
environment.systemPackages = [ pkgs.xorg.xwininfo ];
@@ -122,7 +125,7 @@ let kernel = config.boot.kernelPackages.kernel; in
# Make it easy to log in as root when running the test interactively.
users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
- services.xserver.displayManager.logToJournal = true;
+ services.xserver.displayManager.job.logToJournal = true;
};
}
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 1eb3ca707afd..f74c42a777f5 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -11,7 +11,7 @@ with lib;
let cfg = config.ec2; in
{
- imports = [ ../profiles/headless.nix ./ec2-data.nix ./grow-partition.nix ./amazon-init.nix ];
+ imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-init.nix ];
config = {
@@ -21,7 +21,7 @@ let cfg = config.ec2; in
}
];
- virtualisation.growPartition = cfg.hvm;
+ boot.growPartition = cfg.hvm;
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
@@ -152,5 +152,8 @@ let cfg = config.ec2; in
environment.systemPackages = [ pkgs.cryptsetup ];
boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
+
+ # EC2 has its own NTP server provided by the hypervisor
+ networking.timeServers = [ "169.254.169.123" ];
};
}
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index a7362423eb46..8032b2c6d7ca 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -2,7 +2,7 @@
let
script = ''
- #!${pkgs.stdenv.shell} -eu
+ #!${pkgs.runtimeShell} -eu
echo "attempting to fetch configuration from EC2 user data..."
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index 6817eb837a01..201d5f71ba34 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -47,7 +47,7 @@ let
};
provisionedHook = pkgs.writeScript "provisioned-hook" ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
${config.systemd.package}/bin/systemctl start provisioned.target
'';
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
index 08bbcfd9d7c2..39a655b4c104 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -26,7 +26,7 @@ in
rm $diskImageBase
popd
'';
- diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
+ diskImageBase = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.system}.raw";
buildInputs = [ pkgs.utillinux pkgs.perl ];
exportReferencesGraph =
[ "closure" config.system.build.toplevel ];
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index b4f9d8b6fc17..5e368acd6d8b 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -11,7 +11,7 @@ with lib;
services.udisks2.enable = mkDefault false;
powerManagement.enable = mkDefault false;
- networking.useHostResolvConf = true;
+ networking.useHostResolvConf = mkDefault true;
# Containers should be light-weight, so start sshd on demand.
services.openssh.startWhenNeeded = mkDefault true;
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index e68bfd860601..e54a5fe7d40c 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -33,7 +33,7 @@ let
in
pkgs.writeScript "container-init"
''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
# Initialise the container side of the veth pair.
if [ "$PRIVATE_NETWORK" = 1 ]; then
@@ -223,7 +223,7 @@ let
serviceDirectives = cfg: {
ExecReload = pkgs.writeScript "reload-container"
''
- #! ${pkgs.stdenv.shell} -e
+ #! ${pkgs.runtimeShell} -e
${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \
bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
'';
@@ -726,6 +726,11 @@ in
networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ];
+ services.udev.extraRules = optionalString config.networking.networkmanager.enable ''
+ # Don't manage interfaces created by nixos-container.
+ ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1"
+ '';
+
environment.systemPackages = [ pkgs.nixos-container ];
});
}
diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 14826b6272f7..01512911a057 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -223,21 +223,22 @@ let self = {
"17.03".us-west-2.hvm-ebs = "ami-a93daac9";
"17.03".us-west-2.hvm-s3 = "ami-5139ae31";
- # 17.09.1483.d0f0657ca0
- "17.09".eu-west-1.hvm-ebs = "ami-cf33e7b6";
- "17.09".eu-west-2.hvm-ebs = "ami-7d061419";
- "17.09".eu-central-1.hvm-ebs = "ami-7548fa1a";
- "17.09".us-east-1.hvm-ebs = "ami-6f669d15";
- "17.09".us-east-2.hvm-ebs = "ami-cbe1ccae";
- "17.09".us-west-1.hvm-ebs = "ami-9d95a5fd";
- "17.09".us-west-2.hvm-ebs = "ami-d3956fab";
- "17.09".ca-central-1.hvm-ebs = "ami-ee4ef78a";
- "17.09".ap-southeast-1.hvm-ebs = "ami-1dfc807e";
- "17.09".ap-southeast-2.hvm-ebs = "ami-dcb350be";
- "17.09".ap-northeast-1.hvm-ebs = "ami-00ec3d66";
- "17.09".ap-northeast-2.hvm-ebs = "ami-1107dd7f";
- "17.09".sa-east-1.hvm-ebs = "ami-0377086f";
- "17.09".ap-south-1.hvm-ebs = "ami-4a064625";
+ # 17.09.2681.59661f21be6
+ "17.09".eu-west-1.hvm-ebs = "ami-a30192da";
+ "17.09".eu-west-2.hvm-ebs = "ami-295a414d";
+ "17.09".eu-west-3.hvm-ebs = "ami-8c0eb9f1";
+ "17.09".eu-central-1.hvm-ebs = "ami-266cfe49";
+ "17.09".us-east-1.hvm-ebs = "ami-40bee63a";
+ "17.09".us-east-2.hvm-ebs = "ami-9d84aff8";
+ "17.09".us-west-1.hvm-ebs = "ami-d14142b1";
+ "17.09".us-west-2.hvm-ebs = "ami-3eb40346";
+ "17.09".ca-central-1.hvm-ebs = "ami-ca8207ae";
+ "17.09".ap-southeast-1.hvm-ebs = "ami-84bccff8";
+ "17.09".ap-southeast-2.hvm-ebs = "ami-0dc5386f";
+ "17.09".ap-northeast-1.hvm-ebs = "ami-89b921ef";
+ "17.09".ap-northeast-2.hvm-ebs = "ami-179b3b79";
+ "17.09".sa-east-1.hvm-ebs = "ami-4762202b";
+ "17.09".ap-south-1.hvm-ebs = "ami-4e376021";
latest = self."17.09";
}; in self
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index e3b3e6a5f4ab..155a33b3bb37 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -6,7 +6,7 @@ let
gce = pkgs.google-compute-engine;
in
{
- imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ];
+ imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
name = "google-compute-image";
@@ -14,7 +14,7 @@ in
PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
pushd $out
mv $diskImage disk.raw
- tar -Szcf nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw.tar.gz disk.raw
+ tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.system}.raw.tar.gz disk.raw
rm $out/disk.raw
popd
'';
@@ -29,6 +29,7 @@ in
autoResize = true;
};
+ boot.growPartition = true;
boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
boot.initrd.kernelModules = [ "virtio_scsi" ];
boot.kernelModules = [ "virtio_pci" "virtio_net" ];
@@ -211,7 +212,7 @@ in
echo "Obtaining SSH keys..."
mkdir -m 0700 -p /root/.ssh
AUTH_KEYS=$(${mktemp})
- ${wget} -O $AUTH_KEYS http://metadata.google.internal/computeMetadata/v1/project/attributes/sshKeys
+ ${wget} -O $AUTH_KEYS --header="Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys
if [ -s $AUTH_KEYS ]; then
# Read in key one by one, split in case Google decided
diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix
index 2cb932d208f0..444c0bc1630e 100644
--- a/nixos/modules/virtualisation/grow-partition.nix
+++ b/nixos/modules/virtualisation/grow-partition.nix
@@ -1,48 +1,3 @@
-# This module automatically grows the root partition on virtual machines.
-# This allows an instance to be created with a bigger root filesystem
-# than provided by the machine image.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
-
- options = {
-
- virtualisation.growPartition = mkOption {
- type = types.bool;
- default = true;
- };
-
- };
-
- config = mkIf config.virtualisation.growPartition {
-
- boot.initrd.extraUtilsCommands = ''
- copy_bin_and_libs ${pkgs.gawk}/bin/gawk
- copy_bin_and_libs ${pkgs.gnused}/bin/sed
- copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
- copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
-
- substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \
- --replace "${pkgs.bash}/bin/sh" "/bin/sh" \
- --replace "awk" "gawk" \
- --replace "sed" "gnused"
-
- ln -s sed $out/bin/gnused
- '';
-
- boot.initrd.postDeviceCommands = ''
- rootDevice="${config.fileSystems."/".device}"
- if [ -e "$rootDevice" ]; then
- rootDevice="$(readlink -f "$rootDevice")"
- parentDevice="$(lsblk -npo PKNAME "$rootDevice")"
- TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}"
- udevadm settle
- fi
- '';
-
- };
-
-}
+# This profile is deprecated, use boot.growPartition directly.
+builtins.trace "the profile is deprecated, use boot.growPartition instead"
+{ }
diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix
new file mode 100644
index 000000000000..ecd2a8117710
--- /dev/null
+++ b/nixos/modules/virtualisation/hyperv-guest.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.virtualisation.hypervGuest;
+
+in {
+ options = {
+ virtualisation.hypervGuest = {
+ enable = mkEnableOption "Hyper-V Guest Support";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ config.boot.kernelPackages.hyperv-daemons.bin ];
+
+ security.rngd.enable = false;
+
+ # enable hotadding memory
+ services.udev.packages = lib.singleton (pkgs.writeTextFile {
+ name = "hyperv-memory-hotadd-udev-rules";
+ destination = "/etc/udev/rules.d/99-hyperv-memory-hotadd.rules";
+ text = ''
+ ACTION="add", SUBSYSTEM=="memory", ATTR{state}="online"
+ '';
+ });
+
+ systemd = {
+ packages = [ config.boot.kernelPackages.hyperv-daemons.lib ];
+
+ targets.hyperv-daemons = {
+ wantedBy = [ "multi-user.target" ];
+ };
+ };
+ };
+}
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 8aa7ad8e3911..024db7f87c2e 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -37,11 +37,13 @@ in {
'';
};
- virtualisation.libvirtd.enableKVM = mkOption {
- type = types.bool;
- default = true;
+ virtualisation.libvirtd.qemuPackage = mkOption {
+ type = types.package;
+ default = pkgs.qemu;
description = ''
- This option enables support for QEMU/KVM in libvirtd.
+ Qemu package to use with libvirt.
+ `pkgs.qemu` can emulate alien architectures (e.g. aarch64 on x86)
+ `pkgs.qemu_kvm` saves disk space allowing to emulate only host architectures.
'';
};
@@ -102,7 +104,7 @@ in {
config = mkIf cfg.enable {
- environment.systemPackages = with pkgs; [ libvirt netcat-openbsd qemu_kvm ];
+ environment.systemPackages = with pkgs; [ libvirt netcat-openbsd cfg.qemuPackage ];
boot.kernelModules = [ "tun" ];
@@ -117,17 +119,10 @@ in {
after = [ "systemd-udev-settle.service" ]
++ optional vswitch.enable "vswitchd.service";
- environment = {
- LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
- };
+ environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
- path = with pkgs; [
- bridge-utils
- dmidecode
- dnsmasq
- ebtables
- ]
- ++ optional vswitch.enable vswitch.package;
+ path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
+ ++ optional vswitch.enable vswitch.package;
preStart = ''
mkdir -p /var/log/libvirt/qemu -m 755
@@ -154,9 +149,9 @@ in {
# stable (not GC'able as in /nix/store) paths for using in section of xml configs
mkdir -p /run/libvirt/nix-emulators
- ln -s --force ${pkgs.libvirt}/libexec/libvirt_lxc /run/libvirt/nix-emulators/
- ${optionalString pkgs.stdenv.isAarch64 "ln -s --force ${pkgs.qemu}/bin/qemu-system-aarch64 /run/libvirt/nix-emulators/"}
- ${optionalString cfg.enableKVM "ln -s --force ${pkgs.qemu_kvm}/bin/qemu-kvm /run/libvirt/nix-emulators/"}
+ for emulator in ${pkgs.libvirt}/libexec/libvirt_lxc ${cfg.qemuPackage}/bin/qemu-kvm ${cfg.qemuPackage}/bin/qemu-system-*; do
+ ln -s --force "$emulator" /run/libvirt/nix-emulators/
+ done
${optionalString cfg.qemuOvmf ''
mkdir -p /run/libvirt/nix-ovmf
diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix
index 48462dc66da8..b2457403463a 100644
--- a/nixos/modules/virtualisation/lxcfs.nix
+++ b/nixos/modules/virtualisation/lxcfs.nix
@@ -28,13 +28,9 @@ in {
###### implementation
config = mkIf cfg.enable {
- services.cgmanager.enable = true;
-
systemd.services.lxcfs = {
description = "FUSE filesystem for LXC";
wantedBy = [ "multi-user.target" ];
- requires = [ "cgmanager.service" ];
- after = [ "cgmanager.service" ];
before = [ "lxc.service" ];
restartIfChanged = false;
serviceConfig = {
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index b1ff0337994e..4988886baf60 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -38,6 +38,15 @@ in
environment.systemPackages =
[ pkgs.lxd ];
+ security.apparmor = {
+ enable = true;
+ profiles = [
+ "${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start"
+ "${pkgs.lxc}/etc/apparmor.d/lxc-containers"
+ ];
+ packages = [ pkgs.lxc ];
+ };
+
systemd.services.lxd =
{ description = "LXD Container Management Daemon";
@@ -47,6 +56,10 @@ in
# TODO(wkennington): Add lvm2 and thin-provisioning-tools
path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ];
+ preStart = ''
+ mkdir -m 0755 -p /var/lib/lxc/rootfs
+ '';
+
serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd";
serviceConfig.Type = "simple";
serviceConfig.KillMode = "process"; # when stopping, leave the containers alone
diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix
index c865cf451e40..c1d2a314daf2 100644
--- a/nixos/modules/virtualisation/nova-config.nix
+++ b/nixos/modules/virtualisation/nova-config.nix
@@ -6,7 +6,6 @@ with lib;
imports = [
../profiles/qemu-guest.nix
../profiles/headless.nix
- ./grow-partition.nix
];
config = {
@@ -15,8 +14,7 @@ with lib;
autoResize = true;
};
- virtualisation.growPartition = true;
-
+ boot.growPartition = true;
boot.kernelParams = [ "console=ttyS0" ];
boot.loader.grub.device = "/dev/vda";
boot.loader.timeout = 0;
diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix
deleted file mode 100644
index c2837d0e2e24..000000000000
--- a/nixos/modules/virtualisation/nova.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-# Module for Nova, a.k.a. OpenStack Compute.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.virtualisation.nova;
-
- nova = pkgs.nova;
-
- novaConf = pkgs.writeText "nova.conf"
- ''
- --nodaemon
- --verbose
- ${cfg.extraConfig}
- '';
-
-in
-
-{
-
- ###### interface
-
- options = {
-
- virtualisation.nova.enableSingleNode =
- mkOption {
- default = false;
- description =
- ''
- This option enables Nova, also known as OpenStack Compute,
- a cloud computing system, as a single-machine
- installation. That is, all of Nova's components are
- enabled on this machine, using SQLite as Nova's database.
- This is useful for evaluating and experimenting with Nova.
- However, for a real cloud computing environment, you'll
- want to enable some of Nova's services on other machines,
- and use a database such as MySQL.
- '';
- };
-
- virtualisation.nova.extraConfig =
- mkOption {
- default = "";
- description =
- ''
- Additional text appended to nova.conf,
- the main Nova configuration file.
- '';
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf cfg.enableSingleNode {
-
- environment.systemPackages = [ nova pkgs.euca2ools pkgs.novaclient ];
-
- environment.etc =
- [ { source = novaConf;
- target = "nova/nova.conf";
- }
- ];
-
- # Nova requires libvirtd and RabbitMQ.
- virtualisation.libvirtd.enable = true;
- services.rabbitmq.enable = true;
-
- # `qemu-nbd' required the `nbd' kernel module.
- boot.kernelModules = [ "nbd" ];
-
- system.activationScripts.nova =
- ''
- mkdir -m 755 -p /var/lib/nova
- mkdir -m 755 -p /var/lib/nova/networks
- mkdir -m 700 -p /var/lib/nova/instances
- mkdir -m 700 -p /var/lib/nova/keys
-
- # Allow the CA certificate generation script (called by
- # nova-api) to work.
- mkdir -m 700 -p /var/lib/nova/CA /var/lib/nova/CA/private
-
- # Initialise the SQLite database.
- ${nova}/bin/nova-manage db sync
- '';
-
- # `nova-api' receives and executes external client requests from
- # tools such as euca2ools. It listens on port 8773 (XML) and 8774
- # (JSON).
- jobs.nova_api =
- { name = "nova-api";
-
- description = "Nova API service";
-
- startOn = "ip-up";
-
- # `openssl' is required to generate the CA. `openssh' is
- # required to generate key pairs.
- path = [ pkgs.openssl config.programs.ssh.package pkgs.bash ];
-
- respawn = false;
-
- exec = "${nova}/bin/nova-api --flagfile=${novaConf} --api_paste_config=${nova}/etc/nova/api-paste.ini";
- };
-
- # `nova-objectstore' is a simple image server. Useful if you're
- # not running the OpenStack Imaging Service (Swift). It serves
- # images placed in /var/lib/nova/images/.
- jobs.nova_objectstore =
- { name = "nova-objectstore";
-
- description = "Nova Simple Object Store Service";
-
- startOn = "ip-up";
-
- preStart =
- ''
- mkdir -m 700 -p /var/lib/nova/images
- '';
-
- exec = "${nova}/bin/nova-objectstore --flagfile=${novaConf}";
- };
-
- # `nova-scheduler' schedules VM execution requests.
- jobs.nova_scheduler =
- { name = "nova-scheduler";
-
- description = "Nova Scheduler Service";
-
- startOn = "ip-up";
-
- exec = "${nova}/bin/nova-scheduler --flagfile=${novaConf}";
- };
-
- # `nova-compute' starts and manages virtual machines.
- jobs.nova_compute =
- { name = "nova-compute";
-
- description = "Nova Compute Service";
-
- startOn = "ip-up";
-
- path =
- [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm
- pkgs.e2fsprogs pkgs.utillinux pkgs.multipath-tools pkgs.iproute
- pkgs.bridge-utils
- ];
-
- exec = "${nova}/bin/nova-compute --flagfile=${novaConf}";
- };
-
- # `nova-network' manages networks and allocates IP addresses.
- jobs.nova_network =
- { name = "nova-network";
-
- description = "Nova Network Service";
-
- startOn = "ip-up";
-
- path =
- [ pkgs.sudo pkgs.vlan pkgs.dnsmasq pkgs.nettools pkgs.iptables
- pkgs.iproute pkgs.bridge-utils pkgs.radvd
- ];
-
- exec = "${nova}/bin/nova-network --flagfile=${novaConf}";
- };
-
- };
-
-}
diff --git a/nixos/modules/virtualisation/openstack/common.nix b/nixos/modules/virtualisation/openstack/common.nix
deleted file mode 100644
index 2feb0a873951..000000000000
--- a/nixos/modules/virtualisation/openstack/common.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{ lib }:
-
-with lib;
-
-rec {
- # A shell script string helper to get the value of a secret at
- # runtime.
- getSecret = secretOption:
- if secretOption.storage == "fromFile"
- then ''$(cat ${secretOption.value})''
- else ''${secretOption.value}'';
-
-
- # A shell script string help to replace at runtime in a file the
- # pattern of a secret by its value.
- replaceSecret = secretOption: filename: ''
- sed -i "s/${secretOption.pattern}/${getSecret secretOption}/g" ${filename}
- '';
-
- # This generates an option that can be used to declare secrets which
- # can be stored in the nix store, or not. A pattern is written in
- # the nix store to represent the secret. The pattern can
- # then be overwritten with the value of the secret at runtime.
- mkSecretOption = {name, description ? ""}:
- mkOption {
- description = description;
- type = types.submodule ({
- options = {
- pattern = mkOption {
- type = types.str;
- default = "##${name}##";
- description = "The pattern that represent the secret.";
- };
- storage = mkOption {
- type = types.enum [ "fromNixStore" "fromFile" ];
- description = ''
- Choose the way the password is provisionned. If
- fromNixStore is used, the value is the password and it is
- written in the nix store. If fromFile is used, the value
- is a path from where the password will be read at
- runtime. This is generally used with
- deployment keys of Nixops.
- '';};
- value = mkOption {
- type = types.str;
- description = ''
- If the storage is fromNixStore, the value is the password itself,
- otherwise it is a path to the file that contains the password.
- '';
- };
- };});
- };
-
- databaseOption = name: {
- host = mkOption {
- type = types.str;
- default = "localhost";
- description = ''
- Host of the database.
- '';
- };
-
- name = mkOption {
- type = types.str;
- default = name;
- description = ''
- Name of the existing database.
- '';
- };
-
- user = mkOption {
- type = types.str;
- default = name;
- description = ''
- The database user. The user must exist and has access to
- the specified database.
- '';
- };
- password = mkSecretOption {
- name = name + "MysqlPassword";
- description = "The database user's password";};
- };
-}
diff --git a/nixos/modules/virtualisation/openstack/glance.nix b/nixos/modules/virtualisation/openstack/glance.nix
deleted file mode 100644
index 7862409a65ec..000000000000
--- a/nixos/modules/virtualisation/openstack/glance.nix
+++ /dev/null
@@ -1,245 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib; with import ./common.nix {inherit lib;};
-
-let
- cfg = config.virtualisation.openstack.glance;
- commonConf = ''
- [database]
- connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}"
- notification_driver = noop
-
- [keystone_authtoken]
- auth_url = ${cfg.authUrl}
- auth_plugin = password
- project_name = service
- project_domain_id = default
- user_domain_id = default
- username = ${cfg.serviceUsername}
- password = ${cfg.servicePassword.pattern}
-
- [glance_store]
- default_store = file
- filesystem_store_datadir = /var/lib/glance/images/
- '';
- glanceApiConfTpl = pkgs.writeText "glance-api.conf" ''
- ${commonConf}
-
- [paste_deploy]
- flavor = keystone
- config_file = ${cfg.package}/etc/glance-api-paste.ini
- '';
- glanceRegistryConfTpl = pkgs.writeText "glance-registry.conf" ''
- ${commonConf}
-
- [paste_deploy]
- config_file = ${cfg.package}/etc/glance-registry-paste.ini
- '';
- glanceApiConf = "/var/lib/glance/glance-api.conf";
- glanceRegistryConf = "/var/lib/glance/glance-registry.conf";
-
-in {
- options.virtualisation.openstack.glance = {
- package = mkOption {
- type = types.package;
- default = pkgs.glance;
- defaultText = "pkgs.glance";
- description = ''
- Glance package to use.
- '';
- };
-
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- This option enables Glance as a single-machine
- installation. That is, all of Glance's components are
- enabled on this machine. This is useful for evaluating and
- experimenting with Glance. Note we are currently not
- providing any configurations for a multi-node setup.
- '';
- };
-
- authUrl = mkOption {
- type = types.str;
- default = http://localhost:5000;
- description = ''
- Complete public Identity (Keystone) API endpoint. Note this is
- unversionned.
- '';
- };
-
- serviceUsername = mkOption {
- type = types.str;
- default = "glance";
- description = ''
- The Glance service username. This user is created if bootstrap
- is enable, otherwise it has to be manually created before
- starting this service.
- '';
- };
-
- servicePassword = mkSecretOption {
- name = "glanceAdminPassword";
- description = ''
- The Glance service user's password.
- '';
- };
-
- database = databaseOption "glance";
-
- bootstrap = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Bootstrap the Glance service by creating the service tenant,
- an admin account and a public endpoint. This option provides
- a ready-to-use glance service. This is only done at the
- first Glance execution by the systemd post start section.
- The keystone admin account is used to create required
- Keystone resource for the Glance service.
-
- This option is a helper for setting up
- development or testing environments.
- '';
- };
-
- endpointPublic = mkOption {
- type = types.str;
- default = "http://localhost:9292";
- description = ''
- The public image endpoint. The link
- create endpoint provides more informations
- about that.
- '';
- };
-
- keystoneAdminUsername = mkOption {
- type = types.str;
- default = "admin";
- description = ''
- The keystone admin user name used to create the Glance account.
- '';
- };
-
- keystoneAdminPassword = mkSecretOption {
- name = "keystoneAdminPassword";
- description = ''
- The keystone admin user's password.
- '';
- };
-
- keystoneAdminTenant = mkOption {
- type = types.str;
- default = "admin";
- description = ''
- The keystone admin tenant used to create the Glance account.
- '';
- };
- keystoneAuthUrl = mkOption {
- type = types.str;
- default = "http://localhost:5000/v2.0";
- description = ''
- The keystone auth url used to create the Glance account.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- users.extraUsers = [{
- name = "glance";
- group = "glance";
- uid = config.ids.gids.glance;
-
- }];
- users.extraGroups = [{
- name = "glance";
- gid = config.ids.gids.glance;
- }];
-
- systemd.services.glance-registry = {
- description = "OpenStack Glance Registry Daemon";
- after = [ "network.target"];
- path = [ pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ];
- wantedBy = [ "multi-user.target" ];
- preStart = ''
- mkdir -m 775 -p /var/lib/glance/{images,scrubber,image_cache}
- chown glance:glance /var/lib/glance/{images,scrubber,image_cache}
-
- # Secret file managment
- cp ${glanceRegistryConfTpl} ${glanceRegistryConf};
- chown glance:glance ${glanceRegistryConf};
- chmod 640 ${glanceRegistryConf}
- ${replaceSecret cfg.database.password glanceRegistryConf}
- ${replaceSecret cfg.servicePassword glanceRegistryConf}
-
- cp ${glanceApiConfTpl} ${glanceApiConf};
- chown glance:glance ${glanceApiConf};
- chmod 640 ${glanceApiConf}
- ${replaceSecret cfg.database.password glanceApiConf}
- ${replaceSecret cfg.servicePassword glanceApiConf}
-
- # Initialise the database
- ${cfg.package}/bin/glance-manage --config-file=${glanceApiConf} --config-file=${glanceRegistryConf} db_sync
- '';
- postStart = ''
- set -eu
- export OS_AUTH_URL=${cfg.bootstrap.keystoneAuthUrl}
- export OS_USERNAME=${cfg.bootstrap.keystoneAdminUsername}
- export OS_PASSWORD=${getSecret cfg.bootstrap.keystoneAdminPassword}
- export OS_TENANT_NAME=${cfg.bootstrap.keystoneAdminTenant}
-
- # Wait until the keystone is available for use
- count=0
- while ! keystone user-get ${cfg.bootstrap.keystoneAdminUsername} > /dev/null
- do
- if [ $count -eq 30 ]
- then
- echo "Tried 30 times, giving up..."
- exit 1
- fi
-
- echo "Keystone not yet started. Waiting for 1 second..."
- count=$((count++))
- sleep 1
- done
-
- # If the service glance doesn't exist, we consider glance is
- # not initialized
- if ! keystone service-get glance
- then
- keystone service-create --type image --name glance
- ID=$(keystone service-get glance | awk '/ id / { print $4 }')
- keystone endpoint-create --region RegionOne --service $ID --internalurl http://localhost:9292 --adminurl http://localhost:9292 --publicurl ${cfg.bootstrap.endpointPublic}
-
- keystone user-create --name ${cfg.serviceUsername} --tenant service --pass ${getSecret cfg.servicePassword}
- keystone user-role-add --tenant service --user ${cfg.serviceUsername} --role admin
- fi
- '';
- serviceConfig = {
- PermissionsStartOnly = true; # preStart must be run as root
- TimeoutStartSec = "600"; # 10min for initial db migrations
- User = "glance";
- Group = "glance";
- ExecStart = "${cfg.package}/bin/glance-registry --config-file=${glanceRegistryConf}";
- };
- };
- systemd.services.glance-api = {
- description = "OpenStack Glance API Daemon";
- after = [ "glance-registry.service" "network.target"];
- requires = [ "glance-registry.service" "network.target"];
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- PermissionsStartOnly = true; # preStart must be run as root
- User = "glance";
- Group = "glance";
- ExecStart = "${cfg.package}/bin/glance-api --config-file=${glanceApiConf}";
- };
- };
- };
-
-}
diff --git a/nixos/modules/virtualisation/openstack/keystone.nix b/nixos/modules/virtualisation/openstack/keystone.nix
deleted file mode 100644
index e32c5a4cae1b..000000000000
--- a/nixos/modules/virtualisation/openstack/keystone.nix
+++ /dev/null
@@ -1,220 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib; with import ./common.nix {inherit lib;};
-
-let
- cfg = config.virtualisation.openstack.keystone;
- keystoneConfTpl = pkgs.writeText "keystone.conf" ''
- [DEFAULT]
- admin_token = ${cfg.adminToken.pattern}
- policy_file=${cfg.package}/etc/policy.json
-
- [database]
-
- connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}"
-
- [paste_deploy]
- config_file = ${cfg.package}/etc/keystone-paste.ini
-
- ${cfg.extraConfig}
- '';
- keystoneConf = "/var/lib/keystone/keystone.conf";
-
-in {
- options.virtualisation.openstack.keystone = {
- package = mkOption {
- type = types.package;
- example = literalExample "pkgs.keystone";
- description = ''
- Keystone package to use.
- '';
- };
-
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Enable Keystone, the OpenStack Identity Service
- '';
- };
-
- extraConfig = mkOption {
- default = "";
- type = types.lines;
- description = ''
- Additional text appended to keystone.conf,
- the main Keystone configuration file.
- '';
- };
-
- adminToken = mkSecretOption {
- name = "adminToken";
- description = ''
- This is the admin token used to boostrap keystone,
- ie. to provision first resources.
- '';
- };
-
- bootstrap = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Bootstrap the Keystone service by creating the service
- tenant, an admin account and a public endpoint. This options
- provides a ready-to-use admin account. This is only done at
- the first Keystone execution by the systemd post start.
-
- Note this option is a helper for setting up development or
- testing environments.
- '';
- };
-
- endpointPublic = mkOption {
- type = types.str;
- default = "http://localhost:5000/v2.0";
- description = ''
- The public identity endpoint. The link
- create keystone endpoint provides more informations
- about that.
- '';
- };
-
- adminUsername = mkOption {
- type = types.str;
- default = "admin";
- description = ''
- A keystone admin username.
- '';
- };
-
- adminPassword = mkSecretOption {
- name = "keystoneAdminPassword";
- description = ''
- The keystone admin user's password.
- '';
- };
-
- adminTenant = mkOption {
- type = types.str;
- default = "admin";
- description = ''
- A keystone admin tenant name.
- '';
- };
- };
-
- database = {
- host = mkOption {
- type = types.str;
- default = "localhost";
- description = ''
- Host of the database.
- '';
- };
-
- name = mkOption {
- type = types.str;
- default = "keystone";
- description = ''
- Name of the existing database.
- '';
- };
-
- user = mkOption {
- type = types.str;
- default = "keystone";
- description = ''
- The database user. The user must exist and has access to
- the specified database.
- '';
- };
- password = mkSecretOption {
- name = "mysqlPassword";
- description = "The database user's password";};
- };
- };
-
- config = mkIf cfg.enable {
- # Note: when changing the default, make it conditional on
- # ‘system.stateVersion’ to maintain compatibility with existing
- # systems!
- virtualisation.openstack.keystone.package = mkDefault pkgs.keystone;
-
- users.extraUsers = [{
- name = "keystone";
- group = "keystone";
- uid = config.ids.uids.keystone;
- }];
- users.extraGroups = [{
- name = "keystone";
- gid = config.ids.gids.keystone;
- }];
-
- systemd.services.keystone-all = {
- description = "OpenStack Keystone Daemon";
- after = [ "network.target"];
- path = [ cfg.package pkgs.mysql pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ];
- wantedBy = [ "multi-user.target" ];
- preStart = ''
- mkdir -m 755 -p /var/lib/keystone
-
- cp ${keystoneConfTpl} ${keystoneConf};
- chown keystone:keystone ${keystoneConf};
- chmod 640 ${keystoneConf}
-
- ${replaceSecret cfg.database.password keystoneConf}
- ${replaceSecret cfg.adminToken keystoneConf}
-
- # Initialise the database
- ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} db_sync
- # Set up the keystone's PKI infrastructure
- ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} pki_setup --keystone-user keystone --keystone-group keystone
- '';
- postStart = optionalString cfg.bootstrap.enable ''
- set -eu
- # Wait until the keystone is available for use
- count=0
- while ! curl --fail -s http://localhost:35357/v2.0 > /dev/null
- do
- if [ $count -eq 30 ]
- then
- echo "Tried 30 times, giving up..."
- exit 1
- fi
-
- echo "Keystone not yet started. Waiting for 1 second..."
- count=$((count++))
- sleep 1
- done
-
- # We use the service token to create a first admin user
- export OS_SERVICE_ENDPOINT=http://localhost:35357/v2.0
- export OS_SERVICE_TOKEN=${getSecret cfg.adminToken}
-
- # If the tenant service doesn't exist, we consider
- # keystone is not initialized
- if ! keystone tenant-get service
- then
- keystone tenant-create --name service
- keystone tenant-create --name ${cfg.bootstrap.adminTenant}
- keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${getSecret cfg.bootstrap.adminPassword}
- keystone role-create --name admin
- keystone role-create --name Member
- keystone user-role-add --tenant ${cfg.bootstrap.adminTenant} --user ${cfg.bootstrap.adminUsername} --role admin
- keystone service-create --type identity --name keystone
- ID=$(keystone service-get keystone | awk '/ id / { print $4 }')
- keystone endpoint-create --region RegionOne --service $ID --publicurl ${cfg.bootstrap.endpointPublic} --adminurl http://localhost:35357/v2.0 --internalurl http://localhost:5000/v2.0
- fi
- '';
- serviceConfig = {
- PermissionsStartOnly = true; # preStart must be run as root
- TimeoutStartSec = "600"; # 10min for initial db migrations
- User = "keystone";
- Group = "keystone";
- ExecStart = "${cfg.package}/bin/keystone-all --config-file=${keystoneConf}";
- };
- };
- };
-}
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 4218a3840fc1..38b138e06326 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -169,7 +169,7 @@ in {
mkdir -p ${runDir}/ipsec/{etc/racoon,etc/init.d/,usr/sbin/}
ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey
ln -fs ${pkgs.writeScript "racoon-restart" ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
/var/run/current-system/sw/bin/systemctl $1 racoon
''} ${runDir}/ipsec/etc/init.d/racoon
'';
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index bd85973ee561..36ca7f356d44 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -3,9 +3,7 @@
with lib;
let
-
- prl-tools = config.boot.kernelPackages.prl-tools;
-
+ prl-tools = config.hardware.parallels.package;
in
{
@@ -22,12 +20,31 @@ in
'';
};
+ autoMountShares = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Control prlfsmountd service. When this service is running, shares can not be manually
+ mounted through `mount -t prl_fs ...` as this service will remount and trample any set options.
+ Recommended to enable for simple file sharing, but extended share use such as for code should
+ disable this to manually mount shares.
+ '';
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = config.boot.kernelPackages.prl-tools;
+ defaultText = "config.boot.kernelPackages.prl-tools";
+ example = literalExample "config.boot.kernelPackages.prl-tools";
+ description = ''
+ Defines which package to use for prl-tools. Override to change the version.
+ '';
+ };
};
};
config = mkIf config.hardware.parallels.enable {
-
services.xserver = {
drivers = singleton
{ name = "prlvideo"; modules = [ prl-tools ]; libPath = [ prl-tools ]; };
@@ -55,7 +72,7 @@ in
boot.extraModulePackages = [ prl-tools ];
- boot.kernelModules = [ "prl_tg" "prl_eth" "prl_fs" "prl_fs_freeze" "acpi_memhotplug" ];
+ boot.kernelModules = [ "prl_tg" "prl_eth" "prl_fs" "prl_fs_freeze" ];
services.timesyncd.enable = false;
@@ -68,7 +85,7 @@ in
};
};
- systemd.services.prlfsmountd = {
+ systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares {
description = "Parallels Shared Folders Daemon";
wantedBy = [ "multi-user.target" ];
serviceConfig = rec {
@@ -89,5 +106,50 @@ in
};
};
+ systemd.user.services = {
+ prlcc = {
+ description = "Parallels Control Center";
+ wantedBy = [ "graphical-session.target" ];
+ serviceConfig = {
+ ExecStart = "${prl-tools}/bin/prlcc";
+ };
+ };
+ prldnd = {
+ description = "Parallels Control Center";
+ wantedBy = [ "graphical-session.target" ];
+ serviceConfig = {
+ ExecStart = "${prl-tools}/bin/prldnd";
+ };
+ };
+ prl_wmouse_d = {
+ description = "Parallels Walking Mouse Daemon";
+ wantedBy = [ "graphical-session.target" ];
+ serviceConfig = {
+ ExecStart = "${prl-tools}/bin/prl_wmouse_d";
+ };
+ };
+ prlcp = {
+ description = "Parallels CopyPaste Tool";
+ wantedBy = [ "graphical-session.target" ];
+ serviceConfig = {
+ ExecStart = "${prl-tools}/bin/prlcp";
+ };
+ };
+ prlsga = {
+ description = "Parallels Shared Guest Applications Tool";
+ wantedBy = [ "graphical-session.target" ];
+ serviceConfig = {
+ ExecStart = "${prl-tools}/bin/prlsga";
+ };
+ };
+ prlshprof = {
+ description = "Parallels Shared Profile Tool";
+ wantedBy = [ "graphical-session.target" ];
+ serviceConfig = {
+ ExecStart = "${prl-tools}/bin/prlshprof";
+ };
+ };
+ };
+
};
}
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 3c89ca68113b..ee327ed805b2 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -10,6 +10,7 @@
{ config, lib, pkgs, ... }:
with lib;
+with import ../../lib/qemu-flags.nix { inherit pkgs; };
let
@@ -23,13 +24,13 @@ let
cfg = config.virtualisation;
qemuGraphics = if cfg.graphics then "" else "-nographic";
- kernelConsole = if cfg.graphics then "" else "console=ttyS0";
+ kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}";
ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
# Shell script to start the VM.
startVM =
''
- #! ${pkgs.stdenv.shell}
+ #! ${pkgs.runtimeShell}
NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})
@@ -72,11 +73,10 @@ let
'')}
# Start QEMU.
- exec ${qemu}/bin/qemu-kvm \
+ exec ${qemuBinary qemu} \
-name ${vmName} \
-m ${toString config.virtualisation.memorySize} \
-smp ${toString config.virtualisation.cores} \
- ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \
-virtfs local,path=/nix/store,security_model=none,mount_tag=store \
-virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
@@ -319,8 +319,8 @@ in
networkingOptions =
mkOption {
default = [
- "-net nic,vlan=0,model=virtio"
- "-net user,vlan=0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
+ "-net nic,netdev=user.0,model=virtio"
+ "-netdev user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
];
type = types.listOf types.str;
description = ''
@@ -434,7 +434,11 @@ in
virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
- virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
+ # FIXME: Consolidate this one day.
+ virtualisation.qemu.options = mkMerge [
+ (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ])
+ (mkIf (pkgs.stdenv.isArm || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ])
+ ];
# Mount the host filesystem via 9P, and bind-mount the Nix store
# of the host into our own filesystem. We use mkVMOverride to
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index bb0c38bd4eb8..7413e12c8f3d 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -124,7 +124,7 @@ in
'';
};
- networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ];
+ networking.interfaces.vboxnet0.ipv4.addresses = [{ address = "192.168.56.1"; prefixLength = 24; }];
# Make sure NetworkManager won't assume this interface being up
# means we have internet access.
networking.networkmanager.unmanaged = ["vboxnet0"];
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index d68b3bb73904..64f145f77ca3 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -8,8 +8,6 @@ let
in {
- imports = [ ./grow-partition.nix ];
-
options = {
virtualbox = {
baseImageSize = mkOption {
@@ -23,12 +21,11 @@ in {
};
config = {
-
system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix {
- name = "nixos-ova-${config.system.nixosLabel}-${pkgs.stdenv.system}";
+ name = "nixos-ova-${config.system.nixos.label}-${pkgs.stdenv.system}";
inherit pkgs lib config;
- partitioned = true;
+ partitionTableType = "legacy";
diskSize = cfg.baseImageSize;
postVM =
@@ -40,7 +37,7 @@ in {
VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage
echo "creating VirtualBox VM..."
- vmName="NixOS ${config.system.nixosLabel} (${pkgs.stdenv.system})"
+ vmName="NixOS ${config.system.nixos.label} (${pkgs.stdenv.system})"
VBoxManage createvm --name "$vmName" --register \
--ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
VBoxManage modifyvm "$vmName" \
@@ -56,7 +53,7 @@ in {
echo "exporting VirtualBox VM..."
mkdir -p $out
- fn="$out/nixos-${config.system.nixosLabel}-${pkgs.stdenv.system}.ova"
+ fn="$out/nixos-${config.system.nixos.label}-${pkgs.stdenv.system}.ova"
VBoxManage export "$vmName" --output "$fn"
rm -v $diskImage
@@ -71,6 +68,7 @@ in {
autoResize = true;
};
+ boot.growPartition = true;
boot.loader.grub.device = "/dev/sda";
virtualisation.virtualbox.guest.enable = true;
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index c7656bc309c0..cf57868acef9 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -35,24 +35,19 @@ in
description = ''
The package used for Xen binary.
'';
+ relatedPackages = [ "xen" "xen-light" ];
};
- virtualisation.xen.qemu = mkOption {
- type = types.path;
- defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386";
- example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386";
- description = ''
- The qemu binary to use for Dom-0 backend.
- '';
- };
-
- virtualisation.xen.qemu-package = mkOption {
+ virtualisation.xen.package-qemu = mkOption {
type = types.package;
defaultText = "pkgs.xen";
example = literalExample "pkgs.qemu_xen-light";
description = ''
- The package with qemu binaries for xendomains.
+ The package with qemu binaries for dom0 qemu and xendomains.
'';
+ relatedPackages = [ "xen"
+ { name = "qemu_xen-light"; comment = "For use with pkgs.xen-light."; }
+ ];
};
virtualisation.xen.bootParams =
@@ -158,8 +153,7 @@ in
} ];
virtualisation.xen.package = mkDefault pkgs.xen;
- virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
- virtualisation.xen.qemu-package = mkDefault pkgs.xen;
+ virtualisation.xen.package-qemu = mkDefault pkgs.xen;
virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored";
environment.systemPackages = [ cfg.package ];
@@ -247,6 +241,12 @@ in
'';
target = "default/xendomains";
}
+ ]
+ ++ lib.optionals (builtins.compareVersions cfg.package.version "4.10" >= 0) [
+ # in V 4.10 oxenstored requires /etc/xen/oxenstored.conf to start
+ { source = "${cfg.package}/etc/xen/oxenstored.conf";
+ target = "xen/oxenstored.conf";
+ }
];
# Xen provides udev rules.
@@ -268,7 +268,7 @@ in
mkdir -p /var/lib/xen # so we create them here unconditionally.
grep -q control_d /proc/xen/capabilities
'';
- serviceConfig = if cfg.package.version < "4.8" then
+ serviceConfig = if (builtins.compareVersions cfg.package.version "4.8" < 0) then
{ ExecStart = ''
${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork
'';
@@ -281,7 +281,7 @@ in
NotifyAccess = "all";
};
postStart = ''
- ${optionalString (cfg.package.version < "4.8") ''
+ ${optionalString (builtins.compareVersions cfg.package.version "4.8" < 0) ''
time=0
timeout=30
# Wait for xenstored to actually come up, timing out after 30 seconds
@@ -326,7 +326,7 @@ in
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/xenconsoled\
- ${optionalString ((cfg.package.version >= "4.8")) " -i"}\
+ ${optionalString ((builtins.compareVersions cfg.package.version "4.8" >= 0)) " -i"}\
${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"}
'';
};
@@ -339,7 +339,8 @@ in
after = [ "xen-console.service" ];
requires = [ "xen-store.service" ];
serviceConfig.ExecStart = ''
- ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \
+ ${cfg.package-qemu}/${cfg.package-qemu.qemu-system-i386} \
+ -xen-attach -xen-domid 0 -name dom0 -M xenpv \
-nographic -monitor /dev/null -serial /dev/null -parallel /dev/null
'';
};
@@ -448,7 +449,7 @@ in
before = [ "dhcpd.service" ];
restartIfChanged = false;
serviceConfig.RemainAfterExit = "yes";
- path = [ cfg.package cfg.qemu-package ];
+ path = [ cfg.package cfg.package-qemu ];
environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains";
preStart = "mkdir -p /var/lock/subsys -m 755";
serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start";
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 34a413f1ac3e..e010b532a688 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -2,7 +2,7 @@
# and nixos-14.04). The channel is updated every time the ‘tested’ job
# succeeds, and all other jobs have finished (they may fail).
-{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
+{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false
, supportedSystems ? [ "x86_64-linux" ]
, limitedSupportedSystems ? [ "i686-linux" ]
@@ -52,16 +52,17 @@ in rec {
(all nixos.dummy)
(all nixos.manual)
- (all nixos.iso_minimal)
- nixos.iso_graphical.x86_64-linux
- nixos.ova.x86_64-linux
+ nixos.iso_minimal.x86_64-linux or []
+ nixos.iso_minimal.i686-linux or []
+ nixos.iso_graphical.x86_64-linux or []
+ nixos.ova.x86_64-linux or []
#(all nixos.tests.containers)
- nixos.tests.chromium
+ nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox)
(all nixos.tests.firewall)
(all nixos.tests.gnome3)
- nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only
+ nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
(all nixos.tests.installer.lvm)
(all nixos.tests.installer.luksroot)
(all nixos.tests.installer.separateBoot)
@@ -80,7 +81,7 @@ in rec {
(all nixos.tests.boot.uefiUsb)
(all nixos.tests.boot-stage1)
(all nixos.tests.hibernate)
- nixos.tests.docker
+ nixos.tests.docker.x86_64-linux or []
(all nixos.tests.ecryptfs)
(all nixos.tests.env)
(all nixos.tests.ipv6)
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index e9f3cfb4de53..4bfb9a423f7d 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -2,7 +2,7 @@
# small subset of Nixpkgs, mostly useful for servers that need fast
# security updates.
-{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
+{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false
, supportedSystems ? [ "x86_64-linux" ] # no i686-linux
}:
@@ -41,6 +41,7 @@ in rec {
nfs3
openssh
php-pcre
+ predictable-interface-names
proxy
simple;
installer = {
@@ -49,6 +50,10 @@ in rec {
separateBoot
simple;
};
+ boot = {
+ inherit (nixos'.tests.boot)
+ biosCdrom;
+ };
};
};
diff --git a/nixos/release.nix b/nixos/release.nix
index fbc95784cfbe..9b4aa4b0399d 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,8 +1,9 @@
-{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
+{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 130979; shortRev = "gfedcba"; }
, stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" ]
+, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
}:
+with import ../pkgs/top-level/release-lib.nix { inherit supportedSystems; };
with import ../lib;
let
@@ -11,15 +12,19 @@ let
versionSuffix =
(if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
- forAllSystems = genAttrs supportedSystems;
-
importTest = fn: args: system: import fn ({
inherit system;
} // args);
- callTest = fn: args: forAllSystems (system: hydraJob (importTest fn args system));
+ # Note: only supportedSystems are considered.
+ callTestOnMatchingSystems = systems: fn: args:
+ forMatchingSystems
+ (intersectLists supportedSystems systems)
+ (system: hydraJob (importTest fn args system));
+ callTest = callTestOnMatchingSystems supportedSystems;
- callSubTests = fn: args: let
+ callSubTests = callSubTestsOnMatchingSystems supportedSystems;
+ callSubTestsOnMatchingSystems = systems: fn: args: let
discover = attrs: let
subTests = filterAttrs (const (hasAttr "test")) attrs;
in mapAttrs (const (t: hydraJob t.test)) subTests;
@@ -28,17 +33,14 @@ let
${system} = test;
}) (discover (importTest fn args system));
- # If the test is only for a particular system, use only the specified
- # system instead of generating attributes for all available systems.
- in if args ? system then discover (import fn args)
- else foldAttrs mergeAttrs {} (map discoverForSystem supportedSystems);
+ in foldAttrs mergeAttrs {} (map discoverForSystem (intersectLists systems supportedSystems));
pkgs = import nixpkgs { system = "x86_64-linux"; };
versionModule =
- { system.nixosVersionSuffix = versionSuffix;
- system.nixosRevision = nixpkgs.rev or nixpkgs.shortRev;
+ { system.nixos.versionSuffix = versionSuffix;
+ system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev;
};
@@ -89,6 +91,28 @@ let
});
}).config));
+ makeNetboot = config:
+ let
+ configEvaled = import lib/eval-config.nix config;
+ build = configEvaled.config.system.build;
+ kernelTarget = configEvaled.pkgs.stdenv.platform.kernelTarget;
+ in
+ pkgs.symlinkJoin {
+ name = "netboot";
+ paths = [
+ build.netbootRamdisk
+ build.kernel
+ build.netbootIpxeScript
+ ];
+ postBuild = ''
+ mkdir -p $out/nix-support
+ echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products
+ echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
+ echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
+ '';
+ preferLocalBuild = true;
+ };
+
in rec {
@@ -103,28 +127,13 @@ in rec {
# Build the initial ramdisk so Hydra can keep track of its size over time.
initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);
- netboot.x86_64-linux = let build = (import lib/eval-config.nix {
- system = "x86_64-linux";
- modules = [
- ./modules/installer/netboot/netboot-minimal.nix
- versionModule
- ];
- }).config.system.build;
- in
- pkgs.symlinkJoin {
- name="netboot";
- paths=[
- build.netbootRamdisk
- build.kernel
- build.netbootIpxeScript
- ];
- postBuild = ''
- mkdir -p $out/nix-support
- echo "file bzImage $out/bzImage" >> $out/nix-support/hydra-build-products
- echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
- echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
- '';
- };
+ netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot {
+ inherit system;
+ modules = [
+ ./modules/installer/netboot/netboot-minimal.nix
+ versionModule
+ ];
+ });
iso_minimal = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
@@ -132,7 +141,7 @@ in rec {
inherit system;
});
- iso_graphical = genAttrs [ "x86_64-linux" ] (system: makeIso {
+ iso_graphical = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix;
type = "graphical";
inherit system;
@@ -140,7 +149,7 @@ in rec {
# A variant with a more recent (but possibly less stable) kernel
# that might support more hardware.
- iso_minimal_new_kernel = genAttrs [ "x86_64-linux" ] (system: makeIso {
+ iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
type = "minimal-new-kernel";
inherit system;
@@ -148,7 +157,7 @@ in rec {
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
- ova = genAttrs [ "x86_64-linux" ] (system:
+ ova = forMatchingSystems [ "x86_64-linux" ] (system:
with import nixpkgs { inherit system; };
@@ -217,12 +226,16 @@ in rec {
tests.atd = callTest tests/atd.nix {};
tests.acme = callTest tests/acme.nix {};
tests.avahi = callTest tests/avahi.nix {};
+ tests.beegfs = callTest tests/beegfs.nix {};
tests.bittorrent = callTest tests/bittorrent.nix {};
tests.blivet = callTest tests/blivet.nix {};
tests.boot = callSubTests tests/boot.nix {};
tests.boot-stage1 = callTest tests/boot-stage1.nix {};
- tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
- tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable;
+ tests.borgbackup = callTest tests/borgbackup.nix {};
+ tests.buildbot = callTest tests/buildbot.nix {};
+ tests.cadvisor = callTestOnMatchingSystems ["x86_64-linux"] tests/cadvisor.nix {};
+ tests.ceph = callTestOnMatchingSystems ["x86_64-linux"] tests/ceph.nix {};
+ tests.chromium = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/chromium.nix {}).stable or {};
tests.cjdns = callTest tests/cjdns.nix {};
tests.cloud-init = callTest tests/cloud-init.nix {};
tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
@@ -236,23 +249,25 @@ in rec {
tests.containers-hosts = callTest tests/containers-hosts.nix {};
tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
tests.couchdb = callTest tests/couchdb.nix {};
- tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
- tests.docker-edge = hydraJob (import tests/docker-edge.nix { system = "x86_64-linux"; });
+ tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {};
+ tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {};
+ tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {};
tests.dovecot = callTest tests/dovecot.nix {};
- tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; };
+ tests.dnscrypt-proxy = callTestOnMatchingSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {};
tests.ecryptfs = callTest tests/ecryptfs.nix {};
- tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });
- tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops;
- tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;
- tests.elk = hydraJob (import tests/elk.nix { system = "x86_64-linux"; });
+ tests.etcd = callTestOnMatchingSystems ["x86_64-linux"] tests/etcd.nix {};
+ tests.ec2-nixops = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops or {};
+ tests.ec2-config = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config or {};
+ tests.elk = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/elk.nix {};
tests.env = callTest tests/env.nix {};
tests.ferm = callTest tests/ferm.nix {};
tests.firefox = callTest tests/firefox.nix {};
tests.firewall = callTest tests/firewall.nix {};
- tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });
+ tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {};
+ tests.fwupd = callTest tests/fwupd.nix {};
#tests.gitlab = callTest tests/gitlab.nix {};
tests.gitolite = callTest tests/gitolite.nix {};
- tests.glance = callTest tests/glance.nix {};
+ tests.gjs = callTest tests/gjs.nix {};
tests.gocd-agent = callTest tests/gocd-agent.nix {};
tests.gocd-server = callTest tests/gocd-server.nix {};
tests.gnome3 = callTest tests/gnome3.nix {};
@@ -261,14 +276,17 @@ in rec {
tests.graphite = callTest tests/graphite.nix {};
tests.hardened = callTest tests/hardened.nix { };
tests.hibernate = callTest tests/hibernate.nix {};
+ tests.home-assistant = callTest tests/home-assistant.nix { };
tests.hound = callTest tests/hound.nix {};
+ tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {};
tests.i3wm = callTest tests/i3wm.nix {};
- tests.initrd-network-ssh = callTest tests/initrd-network-ssh.nix {};
+ tests.initrd-network-ssh = callTest tests/initrd-network-ssh {};
tests.installer = callSubTests tests/installer.nix {};
tests.influxdb = callTest tests/influxdb.nix {};
tests.ipv6 = callTest tests/ipv6.nix {};
tests.jenkins = callTest tests/jenkins.nix {};
tests.plasma5 = callTest tests/plasma5.nix {};
+ tests.plotinus = callTest tests/plotinus.nix {};
tests.keymap = callSubTests tests/keymap.nix {};
tests.initrdNetwork = callTest tests/initrd-network.nix {};
tests.kafka_0_9 = callTest tests/kafka_0_9.nix {};
@@ -278,14 +296,14 @@ in rec {
tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
tests.kernel-latest = callTest tests/kernel-latest.nix {};
tests.kernel-lts = callTest tests/kernel-lts.nix {};
- tests.keystone = callTest tests/keystone.nix {};
- tests.kubernetes = hydraJob (import tests/kubernetes/default.nix { system = "x86_64-linux"; });
+ tests.kubernetes = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/default.nix {};
tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
tests.ldap = callTest tests/ldap.nix {};
#tests.lightdm = callTest tests/lightdm.nix {};
tests.login = callTest tests/login.nix {};
#tests.logstash = callTest tests/logstash.nix {};
tests.mathics = callTest tests/mathics.nix {};
+ tests.matrix-synapse = callTest tests/matrix-synapse.nix {};
tests.mesos = callTest tests/mesos.nix {};
tests.misc = callTest tests/misc.nix {};
tests.mongodb = callTest tests/mongodb.nix {};
@@ -298,6 +316,7 @@ in rec {
tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; };
tests.nat.firewall-conntrack = callTest tests/nat.nix { withFirewall = true; withConntrackHelpers = true; };
tests.nat.standalone = callTest tests/nat.nix { withFirewall = false; };
+ tests.netdata = callTest tests/netdata.nix { };
tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; };
tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
# TODO: put in networking.nix after the test becomes more complete
@@ -306,39 +325,55 @@ in rec {
tests.nfs4 = callTest tests/nfs.nix { version = 4; };
tests.nginx = callTest tests/nginx.nix { };
tests.nghttpx = callTest tests/nghttpx.nix { };
+ tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { };
+ tests.novacomd = callTestOnMatchingSystems ["x86_64-linux"] tests/novacomd.nix { };
tests.leaps = callTest tests/leaps.nix { };
tests.nsd = callTest tests/nsd.nix {};
tests.openssh = callTest tests/openssh.nix {};
+ tests.openldap = callTest tests/openldap.nix {};
+ tests.owncloud = callTest tests/owncloud.nix {};
tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
- #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
+ #tests.panamax = callTestOnMatchingSystems ["x86_64-linux"] tests/panamax.nix {};
tests.peerflix = callTest tests/peerflix.nix {};
tests.php-pcre = callTest tests/php-pcre.nix {};
tests.postgresql = callSubTests tests/postgresql.nix {};
tests.pgmanage = callTest tests/pgmanage.nix {};
tests.postgis = callTest tests/postgis.nix {};
+ tests.powerdns = callTest tests/powerdns.nix {};
#tests.pgjwt = callTest tests/pgjwt.nix {};
+ tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {};
tests.printing = callTest tests/printing.nix {};
tests.prometheus = callTest tests/prometheus.nix {};
+ tests.prosody = callTest tests/prosody.nix {};
tests.proxy = callTest tests/proxy.nix {};
- tests.pumpio = callTest tests/pump.io.nix {};
# tests.quagga = callTest tests/quagga.nix {};
tests.quake3 = callTest tests/quake3.nix {};
+ tests.rabbitmq = callTest tests/rabbitmq.nix {};
tests.radicale = callTest tests/radicale.nix {};
+ tests.rspamd = callSubTests tests/rspamd.nix {};
tests.runInMachine = callTest tests/run-in-machine.nix {};
+ tests.rxe = callTest tests/rxe.nix {};
tests.samba = callTest tests/samba.nix {};
tests.sddm = callSubTests tests/sddm.nix {};
tests.simple = callTest tests/simple.nix {};
tests.slim = callTest tests/slim.nix {};
tests.smokeping = callTest tests/smokeping.nix {};
tests.snapper = callTest tests/snapper.nix {};
+ tests.statsd = callTest tests/statsd.nix {};
+ tests.sudo = callTest tests/sudo.nix {};
+ tests.systemd = callTest tests/systemd.nix {};
tests.switchTest = callTest tests/switch-test.nix {};
tests.taskserver = callTest tests/taskserver.nix {};
tests.tomcat = callTest tests/tomcat.nix {};
tests.udisks2 = callTest tests/udisks2.nix {};
- tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; };
+ tests.vault = callTest tests/vault.nix {};
+ tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {};
tests.wordpress = callTest tests/wordpress.nix {};
+ tests.xautolock = callTest tests/xautolock.nix {};
tests.xfce = callTest tests/xfce.nix {};
tests.xmonad = callTest tests/xmonad.nix {};
+ tests.xrdp = callTest tests/xrdp.nix {};
+ tests.yabar = callTest tests/yabar.nix {};
tests.zookeeper = callTest tests/zookeeper.nix {};
/* Build a bunch of typical closures so that Hydra can keep track of
diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix
new file mode 100644
index 000000000000..433910feafe3
--- /dev/null
+++ b/nixos/tests/beegfs.nix
@@ -0,0 +1,115 @@
+import ./make-test.nix ({ pkgs, ... } :
+
+let
+ connAuthFile="beegfs/auth-def.key";
+
+ client = { config, pkgs, lib, ... } : {
+ networking.firewall.enable = false;
+ services.beegfsEnable = true;
+ services.beegfs.default = {
+ mgmtdHost = "mgmt";
+ connAuthFile = "/etc/${connAuthFile}";
+ client = {
+ mount = false;
+ enable = true;
+ };
+ };
+
+ fileSystems = pkgs.lib.mkVMOverride # FIXME: this should be creatd by the module
+ [ { mountPoint = "/beegfs";
+ device = "default";
+ fsType = "beegfs";
+ options = [ "cfgFile=/etc/beegfs/client-default.conf" "_netdev" ];
+ }
+ ];
+
+ environment.etc."${connAuthFile}" = {
+ enable = true;
+ text = "ThisIsALousySecret";
+ mode = "0600";
+ };
+ };
+
+
+ server = service : { config, pkgs, lib, ... } : {
+ networking.firewall.enable = false;
+ boot.initrd.postDeviceCommands = ''
+ ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
+ '';
+
+ virtualisation.emptyDiskImages = [ 4096 ];
+
+ fileSystems = pkgs.lib.mkVMOverride
+ [ { mountPoint = "/data";
+ device = "/dev/disk/by-label/data";
+ fsType = "ext4";
+ }
+ ];
+
+ environment.systemPackages = with pkgs; [ beegfs ];
+ environment.etc."${connAuthFile}" = {
+ enable = true;
+ text = "ThisIsALousySecret";
+ mode = "0600";
+ };
+
+ services.beegfsEnable = true;
+ services.beegfs.default = {
+ mgmtdHost = "mgmt";
+ connAuthFile = "/etc/${connAuthFile}";
+ "${service}" = {
+ enable = true;
+ storeDir = "/data";
+ };
+ };
+ };
+
+in
+{
+ name = "beegfs";
+
+ nodes = {
+ meta = server "meta";
+ mgmt = server "mgmtd";
+ storage1 = server "storage";
+ storage2 = server "storage";
+ client1 = client;
+ client2 = client;
+ };
+
+ testScript = ''
+ # Initalize the data directories
+ $mgmt->waitForUnit("default.target");
+ $mgmt->succeed("beegfs-setup-mgmtd -C -f -p /data");
+ $mgmt->succeed("systemctl start beegfs-mgmtd-default");
+
+ $meta->waitForUnit("default.target");
+ $meta->succeed("beegfs-setup-meta -C -f -s 1 -p /data");
+ $meta->succeed("systemctl start beegfs-meta-default");
+
+ $storage1->waitForUnit("default.target");
+ $storage1->succeed("beegfs-setup-storage -C -f -s 1 -i 1 -p /data");
+ $storage1->succeed("systemctl start beegfs-storage-default");
+
+ $storage2->waitForUnit("default.target");
+ $storage2->succeed("beegfs-setup-storage -C -f -s 2 -i 2 -p /data");
+ $storage2->succeed("systemctl start beegfs-storage-default");
+
+ #
+
+ # Basic test
+ $client1->waitForUnit("beegfs.mount");
+ $client1->succeed("beegfs-check-servers-default");
+ $client1->succeed("echo test > /beegfs/test");
+ $client2->waitForUnit("beegfs.mount");
+ $client2->succeed("test -e /beegfs/test");
+ $client2->succeed("cat /beegfs/test | grep test");
+
+ # test raid0/stripping
+ $client1->succeed("dd if=/dev/urandom bs=1M count=10 of=/beegfs/striped");
+ $client2->succeed("cat /beegfs/striped > /dev/null");
+
+ # check if fs is still healthy
+ $client1->succeed("beegfs-fsck-default --checkfs");
+ '';
+})
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 3a718a798315..50c98664660a 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -16,7 +16,7 @@ let
miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf"
''
ext_ifname=eth1
- listening_ip=${(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address}/24
+ listening_ip=${(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address}/24
allow 1024-65535 192.168.2.0/24 1024-65535
'';
@@ -56,7 +56,7 @@ in
{ environment.systemPackages = [ pkgs.transmission ];
virtualisation.vlans = [ 2 ];
networking.defaultGateway =
- (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address;
+ (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address;
networking.firewall.enable = false;
};
@@ -84,7 +84,7 @@ in
# Create the torrent.
$tracker->succeed("mkdir /tmp/data");
$tracker->succeed("cp ${file} /tmp/data/test.tar.bz2");
- $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -p -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent");
+ $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -p -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ipv4.addresses).address}:6969/announce -o /tmp/test.torrent");
$tracker->succeed("chmod 644 /tmp/test.torrent");
# Start the tracker. !!! use a less crappy tracker
diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix
index eeaca9f50edc..b2e74bff6fcd 100644
--- a/nixos/tests/boot-stage1.nix
+++ b/nixos/tests/boot-stage1.nix
@@ -9,6 +9,7 @@ import ./make-test.nix ({ pkgs, ... }: {
kver = config.boot.kernelPackages.kernel.modDirVersion;
ksrc = "${kdev}/lib/modules/${kver}/build";
hardeningDisable = [ "pic" ];
+ nativeBuildInputs = kdev.moduleBuildDependencies;
} ''
echo "obj-m += $name.o" > Makefile
echo "$source" > "$name.c"
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix
index 69ab4755e444..301d9d0f817f 100644
--- a/nixos/tests/boot.nix
+++ b/nixos/tests/boot.nix
@@ -1,7 +1,6 @@
{ system ? builtins.currentSystem }:
with import ../lib/testing.nix { inherit system; };
-with import ../lib/qemu-flags.nix;
with pkgs.lib;
let
@@ -25,6 +24,12 @@ let
my $machine = createMachine({ ${machineConfig}, qemuFlags => '-m 768' });
$machine->start;
$machine->waitForUnit("multi-user.target");
+ $machine->succeed("nix verify -r --no-trust /run/current-system");
+
+ # Test whether the channel got installed correctly.
+ $machine->succeed("nix-instantiate --dry-run '' -A hello");
+ $machine->succeed("nix-env --dry-run -iA nixos.procps");
+
$machine->shutdown;
'';
};
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
new file mode 100644
index 000000000000..36731773de27
--- /dev/null
+++ b/nixos/tests/borgbackup.nix
@@ -0,0 +1,162 @@
+import ./make-test.nix ({ pkgs, ... }:
+
+let
+ passphrase = "supersecret";
+ dataDir = "/ran:dom/data";
+ excludeFile = "not_this_file";
+ keepFile = "important_file";
+ keepFileData = "important_data";
+ localRepo = "/root/back:up";
+ archiveName = "my_archive";
+ remoteRepo = "borg@server:."; # No need to specify path
+ privateKey = pkgs.writeText "id_ed25519" ''
+ -----BEGIN OPENSSH PRIVATE KEY-----
+ b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+ QyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrwAAAJB+cF5HfnBe
+ RwAAAAtzc2gtZWQyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrw
+ AAAEBN75NsJZSpt63faCuaD75Unko0JjlSDxMhYHAPJk2/xXHxQHThDpD9/AMWNqQer3Tg
+ 9gXMb2lTZMn0pelo8xyvAAAADXJzY2h1ZXR6QGt1cnQ=
+ -----END OPENSSH PRIVATE KEY-----
+ '';
+ publicKey = ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHHxQHThDpD9/AMWNqQer3Tg9gXMb2lTZMn0pelo8xyv root@client
+ '';
+ privateKeyAppendOnly = pkgs.writeText "id_ed25519" ''
+ -----BEGIN OPENSSH PRIVATE KEY-----
+ b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+ QyNTUxOQAAACBacZuz1ELGQdhI7PF6dGFafCDlvh8pSEc4cHjkW0QjLwAAAJC9YTxxvWE8
+ cQAAAAtzc2gtZWQyNTUxOQAAACBacZuz1ELGQdhI7PF6dGFafCDlvh8pSEc4cHjkW0QjLw
+ AAAEAAhV7wTl5dL/lz+PF/d4PnZXuG1Id6L/mFEiGT1tZsuFpxm7PUQsZB2Ejs8Xp0YVp8
+ IOW+HylIRzhweORbRCMvAAAADXJzY2h1ZXR6QGt1cnQ=
+ -----END OPENSSH PRIVATE KEY-----
+ '';
+ publicKeyAppendOnly = ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFpxm7PUQsZB2Ejs8Xp0YVp8IOW+HylIRzhweORbRCMv root@client
+ '';
+
+in {
+ name = "borgbackup";
+ meta = with pkgs.stdenv.lib; {
+ maintainers = with maintainers; [ dotlambda ];
+ };
+
+ nodes = {
+ client = { config, pkgs, ... }: {
+ services.borgbackup.jobs = {
+
+ local = rec {
+ paths = dataDir;
+ repo = localRepo;
+ preHook = ''
+ # Don't append a timestamp
+ archiveName="${archiveName}"
+ '';
+ encryption = {
+ mode = "repokey";
+ inherit passphrase;
+ };
+ compression = "auto,zlib,9";
+ prune.keep = {
+ within = "1y";
+ yearly = 5;
+ };
+ exclude = [ "*/${excludeFile}" ];
+ postHook = "echo post";
+ startAt = [ ]; # Do not run automatically
+ };
+
+ remote = {
+ paths = dataDir;
+ repo = remoteRepo;
+ encryption.mode = "none";
+ startAt = [ ];
+ environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519";
+ };
+
+ remoteAppendOnly = {
+ paths = dataDir;
+ repo = remoteRepo;
+ encryption.mode = "none";
+ startAt = [ ];
+ environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly";
+ };
+
+ };
+ };
+
+ server = { config, pkgs, ... }: {
+ services.openssh = {
+ enable = true;
+ passwordAuthentication = false;
+ challengeResponseAuthentication = false;
+ };
+
+ services.borgbackup.repos.repo1 = {
+ authorizedKeys = [ publicKey ];
+ path = "/data/borgbackup";
+ };
+
+ # Second repo to make sure the authorizedKeys options are merged correctly
+ services.borgbackup.repos.repo2 = {
+ authorizedKeysAppendOnly = [ publicKeyAppendOnly ];
+ path = "/data/borgbackup";
+ quota = ".5G";
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $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("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}" ]]');
+ };
+
+ 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");
+
+ # 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 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");
+
+ # 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
+ };
+
+ '';
+})
diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix
new file mode 100644
index 000000000000..b9993062c079
--- /dev/null
+++ b/nixos/tests/ceph.nix
@@ -0,0 +1,140 @@
+import ./make-test.nix ({pkgs, ...}: rec {
+ name = "All-in-one-basic-ceph-cluster";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ lejonet ];
+ };
+
+ nodes = {
+ aio = { config, pkgs, ... }: {
+ virtualisation = {
+ emptyDiskImages = [ 20480 20480 ];
+ vlans = [ 1 ];
+ };
+
+ networking = {
+ firewall.allowPing = true;
+ useDHCP = false;
+ interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+ { address = "192.168.1.1"; prefixLength = 24; }
+ ];
+ };
+
+ environment.systemPackages = with pkgs; [
+ bash
+ sudo
+ ceph
+ xfsprogs
+ ];
+ nixpkgs.config.packageOverrides = super: {
+ ceph = super.ceph.override({ nss = super.nss; libxfs = super.libxfs; libaio = super.libaio; jemalloc = super.jemalloc; });
+ };
+
+ boot.kernelModules = [ "xfs" ];
+
+ services.ceph.enable = true;
+ services.ceph.global = {
+ fsid = "066ae264-2a5d-4729-8001-6ad265f50b03";
+ monInitialMembers = "aio";
+ monHost = "192.168.1.1";
+ };
+
+ services.ceph.mon = {
+ enable = true;
+ daemons = [ "aio" ];
+ };
+
+ services.ceph.mgr = {
+ enable = true;
+ daemons = [ "aio" ];
+ };
+
+ services.ceph.osd = {
+ enable = true;
+ daemons = [ "0" "1" ];
+ };
+ };
+ };
+
+ testScript = { nodes, ... }: ''
+ startAll;
+
+ $aio->waitForUnit("network.target");
+
+ # Create the ceph-related directories
+ $aio->mustSucceed(
+ "mkdir -p /var/lib/ceph/mgr/ceph-aio/",
+ "mkdir -p /var/lib/ceph/mon/ceph-aio/",
+ "mkdir -p /var/lib/ceph/osd/ceph-{0..1}/",
+ "chown ceph:ceph -R /var/lib/ceph/"
+ );
+
+ # Bootstrap ceph-mon daemon
+ $aio->mustSucceed(
+ "mkdir -p /var/lib/ceph/bootstrap-osd && chown ceph:ceph /var/lib/ceph/bootstrap-osd",
+ "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
+ "ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
+ "ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
+ "monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap",
+ "sudo -u ceph ceph-mon --mkfs -i aio --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
+ "touch /var/lib/ceph/mon/ceph-aio/done",
+ "systemctl start ceph-mon-aio"
+ );
+ $aio->waitForUnit("ceph-mon-aio");
+
+ # Can't check ceph status until a mon is up
+ $aio->succeed("ceph -s | grep 'mon: 1 daemons'");
+
+ # Start the ceph-mgr daemon, it has no deps and hardly any setup
+ $aio->mustSucceed(
+ "ceph auth get-or-create mgr.aio mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-aio/keyring",
+ "systemctl start ceph-mgr-aio"
+ );
+ $aio->waitForUnit("ceph-mgr-aio");
+ $aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'");
+
+ # Bootstrap both OSDs
+ $aio->mustSucceed(
+ "mkfs.xfs /dev/vdb",
+ "mkfs.xfs /dev/vdc",
+ "mount /dev/vdb /var/lib/ceph/osd/ceph-0",
+ "mount /dev/vdc /var/lib/ceph/osd/ceph-1",
+ "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-0/keyring --name osd.0 --add-key AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==",
+ "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-1/keyring --name osd.1 --add-key AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==",
+ "echo '{\"cephx_secret\": \"AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==\"}' | ceph osd new 55ba2294-3e24-478f-bee0-9dca4c231dd9 -i -",
+ "echo '{\"cephx_secret\": \"AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==\"}' | ceph osd new 5e97a838-85b6-43b0-8950-cb56d554d1e5 -i -"
+ );
+
+ # Initialize the OSDs with regular filestore
+ $aio->mustSucceed(
+ "ceph-osd -i 0 --mkfs --osd-uuid 55ba2294-3e24-478f-bee0-9dca4c231dd9",
+ "ceph-osd -i 1 --mkfs --osd-uuid 5e97a838-85b6-43b0-8950-cb56d554d1e5",
+ "chown -R ceph:ceph /var/lib/ceph/osd",
+ "systemctl start ceph-osd-0",
+ "systemctl start ceph-osd-1"
+ );
+
+ $aio->waitUntilSucceeds("ceph osd stat | grep '2 osds: 2 up, 2 in'");
+ $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active)'");
+ $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
+
+ $aio->mustSucceed(
+ "ceph osd pool create aio-test 100 100",
+ "ceph osd pool ls | grep 'aio-test'",
+ "ceph osd pool rename aio-test aio-other-test",
+ "ceph osd pool ls | grep 'aio-other-test'",
+ "ceph -s | grep '1 pools, 100 pgs'",
+ "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 aio-other-test size 2"
+ );
+ $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
+ $aio->waitUntilSucceeds("ceph -s | grep '100 active+clean'");
+ $aio->mustFail(
+ "ceph osd pool ls | grep 'aio-test'",
+ "ceph osd pool delete aio-other-test aio-other-test --yes-i-really-really-mean-it"
+ );
+ '';
+})
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index 466663799241..4d3b58abc6e5 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -12,7 +12,6 @@ let
# the sequence of address assignment less stochastic.
networking.useDHCP = false;
- networking.interfaces.eth1.prefixLength = 24;
# CJDNS output is incompatible with the XML log.
systemd.services.cjdns.serviceConfig.StandardOutput = "null";
#networking.firewall.enable = true;
@@ -49,7 +48,9 @@ import ./make-test.nix ({ pkgs, ...} : {
{ imports = [ basicConfig ];
- networking.interfaces.eth1.ipAddress = "192.168.0.2";
+ networking.interfaces.eth1.ipv4.addresses = [
+ { address = "192.168.0.2"; prefixLength = 24; }
+ ];
services.cjdns =
{ UDPInterface =
@@ -76,7 +77,9 @@ import ./make-test.nix ({ pkgs, ...} : {
CJDNS_ADMIN_PASSWORD=FOOBAR
'';
- networking.interfaces.eth1.ipAddress = "192.168.0.1";
+ networking.interfaces.eth1.ipv4.addresses = [
+ { address = "192.168.0.1"; prefixLength = 24; }
+ ];
services.cjdns =
{ authorizedPasswords = [ carolPassword ];
diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix
index c0add7eff360..2a258e4bff54 100644
--- a/nixos/tests/cloud-init.nix
+++ b/nixos/tests/cloud-init.nix
@@ -1,7 +1,6 @@
{ system ? builtins.currentSystem }:
with import ../lib/testing.nix { inherit system; };
-with import ../lib/qemu-flags.nix;
with pkgs.lib;
let
diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix
index 9b53d9d61a16..10cde45d18a8 100644
--- a/nixos/tests/common/letsencrypt.nix
+++ b/nixos/tests/common/letsencrypt.nix
@@ -138,8 +138,8 @@ let
boulder = let
owner = "letsencrypt";
repo = "boulder";
- rev = "9866abab8962a591f06db457a4b84c518cc88243";
- version = "20170510";
+ rev = "9c6a1f2adc4c26d925588f5ae366cfd4efb7813a";
+ version = "20180129";
in pkgs.buildGoPackage rec {
name = "${repo}-${version}";
@@ -147,7 +147,7 @@ let
src = pkgs.fetchFromGitHub {
name = "${name}-src";
inherit rev owner repo;
- sha256 = "170m5cjngbrm36wi7wschqw8jzs7kxpcyzmshq3pcrmcpigrhna1";
+ sha256 = "09kszswrifm9rc6idfaq0p1mz5w21as2qbc8gd5pphrq9cf9pn55";
};
postPatch = ''
@@ -168,6 +168,18 @@ let
cat "${snakeOilCa}/ca.pem" > test/test-ca.pem
'';
+ # Until vendored pkcs11 is go 1.9 compatible
+ preBuild = ''
+ rm -r go/src/github.com/letsencrypt/boulder/vendor/github.com/miekg/pkcs11
+ '';
+
+ extraSrcs = map mkGoDep [
+ { goPackagePath = "github.com/miekg/pkcs11";
+ rev = "6dbd569b952ec150d1425722dbbe80f2c6193f83";
+ sha256 = "1m8g6fx7df6hf6q6zsbyw1icjmm52dmsx28rgb0h930wagvngfwb";
+ }
+ ];
+
goPackagePath = "github.com/${owner}/${repo}";
buildInputs = [ pkgs.libtool ];
};
@@ -284,7 +296,11 @@ let
ocsp-updater.after = [ "boulder-publisher" ];
ocsp-responder.args = "--config ${cfgDir}/ocsp-responder.json";
ct-test-srv = {};
- mail-test-srv.args = "--closeFirst 5";
+ mail-test-srv.args = let
+ key = "${boulderSource}/test/mail-test-srv/minica-key.pem";
+ crt = "${boulderSource}/test/mail-test-srv/minica.pem";
+ in
+ "--closeFirst 5 --cert ${crt} --key ${key}";
};
commonPath = [ softhsm pkgs.mariadb goose boulder ];
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index b8d4759684cc..dfef46a2ada4 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -26,8 +26,8 @@ import ./make-test.nix ({ pkgs, ...} : {
};
networking.interfaces = {
br0 = {
- ip4 = [{ address = hostIp; prefixLength = 24; }];
- ip6 = [{ address = hostIp6; prefixLength = 7; }];
+ ipv4.addresses = [{ address = hostIp; prefixLength = 24; }];
+ ipv6.addresses = [{ address = hostIp6; prefixLength = 7; }];
};
};
diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix
index 6339c8c558b9..df3f3354b2d9 100644
--- a/nixos/tests/containers-extra_veth.nix
+++ b/nixos/tests/containers-extra_veth.nix
@@ -21,11 +21,11 @@ import ./make-test.nix ({ pkgs, ...} : {
};
networking.interfaces = {
br0 = {
- ip4 = [{ address = "192.168.0.1"; prefixLength = 24; }];
- ip6 = [{ address = "fc00::1"; prefixLength = 7; }];
+ ipv4.addresses = [{ address = "192.168.0.1"; prefixLength = 24; }];
+ ipv6.addresses = [{ address = "fc00::1"; prefixLength = 7; }];
};
br1 = {
- ip4 = [{ address = "192.168.1.1"; prefixLength = 24; }];
+ ipv4.addresses = [{ address = "192.168.1.1"; prefixLength = 24; }];
};
};
diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix
index c7a85f190a5d..df1ef6d14936 100644
--- a/nixos/tests/containers-hosts.nix
+++ b/nixos/tests/containers-hosts.nix
@@ -13,9 +13,9 @@ import ./make-test.nix ({ pkgs, ...} : {
virtualisation.vlans = [];
networking.bridges.br0.interfaces = [];
- networking.interfaces.br0 = {
- ip4 = [ { address = "10.11.0.254"; prefixLength = 24; } ];
- };
+ networking.interfaces.br0.ipv4.addresses = [
+ { address = "10.11.0.254"; prefixLength = 24; }
+ ];
# Force /etc/hosts to be the only source for host name resolution
environment.etc."nsswitch.conf".text = lib.mkForce ''
diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix
index 721f98481497..390dc4ad2c29 100644
--- a/nixos/tests/containers-macvlans.nix
+++ b/nixos/tests/containers-macvlans.nix
@@ -26,9 +26,9 @@ import ./make-test.nix ({ pkgs, ...} : {
interface = "eth1";
mode = "bridge";
};
- networking.interfaces.eth1.ip4 = lib.mkForce [];
+ networking.interfaces.eth1.ipv4.addresses = lib.mkForce [];
networking.interfaces.mv-eth1-host = {
- ip4 = [ { address = "192.168.1.1"; prefixLength = 24; } ];
+ ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ];
};
containers.test1 = {
@@ -37,7 +37,7 @@ import ./make-test.nix ({ pkgs, ...} : {
config = {
networking.interfaces.mv-eth1 = {
- ip4 = [ { address = containerIp1; prefixLength = 24; } ];
+ ipv4.addresses = [ { address = containerIp1; prefixLength = 24; } ];
};
};
};
@@ -48,7 +48,7 @@ import ./make-test.nix ({ pkgs, ...} : {
config = {
networking.interfaces.mv-eth1 = {
- ip4 = [ { address = containerIp2; prefixLength = 24; } ];
+ ipv4.addresses = [ { address = containerIp2; prefixLength = 24; } ];
};
};
};
diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix
index a3b0b29951bf..bd1228b8e37d 100644
--- a/nixos/tests/containers-physical_interfaces.nix
+++ b/nixos/tests/containers-physical_interfaces.nix
@@ -16,9 +16,9 @@ import ./make-test.nix ({ pkgs, ...} : {
interfaces = [ "eth1" ];
config = {
- networking.interfaces.eth1 = {
- ip4 = [ { address = "10.10.0.1"; prefixLength = 24; } ];
- };
+ networking.interfaces.eth1.ipv4.addresses = [
+ { address = "10.10.0.1"; prefixLength = 24; }
+ ];
networking.firewall.enable = false;
};
};
@@ -33,9 +33,9 @@ import ./make-test.nix ({ pkgs, ...} : {
config = {
networking.bridges.br0.interfaces = [ "eth1" ];
- networking.interfaces.br0 = {
- ip4 = [ { address = "10.10.0.2"; prefixLength = 24; } ];
- };
+ networking.interfaces.br0.ipv4.addresses = [
+ { address = "10.10.0.2"; prefixLength = 24; }
+ ];
networking.firewall.enable = false;
};
};
@@ -54,9 +54,9 @@ import ./make-test.nix ({ pkgs, ...} : {
interfaces = [ "eth1" ];
mode = "active-backup";
};
- networking.interfaces.bond0 = {
- ip4 = [ { address = "10.10.0.3"; prefixLength = 24; } ];
- };
+ networking.interfaces.bond0.ipv4.addresses = [
+ { address = "10.10.0.3"; prefixLength = 24; }
+ ];
networking.firewall.enable = false;
};
};
@@ -76,9 +76,9 @@ import ./make-test.nix ({ pkgs, ...} : {
mode = "active-backup";
};
networking.bridges.br0.interfaces = [ "bond0" ];
- networking.interfaces.br0 = {
- ip4 = [ { address = "10.10.0.4"; prefixLength = 24; } ];
- };
+ networking.interfaces.br0.ipv4.addresses = [
+ { address = "10.10.0.4"; prefixLength = 24; }
+ ];
networking.firewall.enable = false;
};
};
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index b5867c6f6ab1..5fb42f2272b3 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -11,7 +11,7 @@ let
# prevent make-test.nix to change IP
networking.interfaces = {
- eth1.ip4 = lib.mkOverride 0 [ ];
+ eth1.ipv4.addresses = lib.mkOverride 0 [ ];
};
};
in {
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
index 086d056c51cd..f68c9b07759b 100644
--- a/nixos/tests/containers-restart_networking.nix
+++ b/nixos/tests/containers-restart_networking.nix
@@ -11,7 +11,7 @@ let
config = {
networking.firewall.enable = false;
networking.firewall.allowPing = true;
- networking.interfaces.eth0.ip4 = [
+ networking.interfaces.eth0.ipv4.addresses = [
{ address = "192.168.1.122"; prefixLength = 24; }
];
};
@@ -33,8 +33,8 @@ in import ./make-test.nix ({ pkgs, lib, ...} :
rstp = false;
};
networking.interfaces = {
- eth1.ip4 = lib.mkOverride 0 [ ];
- br0.ip4 = [{ address = "192.168.1.1"; prefixLength = 24; }];
+ eth1.ipv4.addresses = lib.mkOverride 0 [ ];
+ br0.ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ];
};
};
@@ -44,8 +44,8 @@ in import ./make-test.nix ({ pkgs, lib, ...} :
rstp = false;
};
networking.interfaces = {
- eth1.ip4 = lib.mkOverride 0 [ ];
- br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }];
+ eth1.ipv4.addresses = lib.mkOverride 0 [ ];
+ br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
};
};
client_eth1_rstp = { lib, pkgs, ... }: client_base // {
@@ -54,8 +54,8 @@ in import ./make-test.nix ({ pkgs, lib, ...} :
rstp = true;
};
networking.interfaces = {
- eth1.ip4 = lib.mkOverride 0 [ ];
- br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }];
+ eth1.ipv4.addresses = lib.mkOverride 0 [ ];
+ br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
};
};
};
diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
index 564831fa2737..873dd364369f 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixos/tests/containers-tmpfs.nix
@@ -1,7 +1,7 @@
# Test for NixOS' container support.
import ./make-test.nix ({ pkgs, ...} : {
- name = "containers-bridge";
+ name = "containers-tmpfs";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ckampka ];
};
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
new file mode 100644
index 000000000000..9135bca0f4f6
--- /dev/null
+++ b/nixos/tests/docker-tools.nix
@@ -0,0 +1,49 @@
+# this test creates a simple GNU image with docker tools and sees if it executes
+
+import ./make-test.nix ({ pkgs, ... }: {
+ name = "docker-tools";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ ];
+ };
+
+ nodes = {
+ docker =
+ { config, pkgs, ... }: {
+ virtualisation = {
+ diskSize = 2048;
+ docker.enable = true;
+ };
+ };
+ };
+
+ testScript =
+ ''
+ $docker->waitForUnit("sockets.target");
+
+ $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
+ $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} /bin/bash --version");
+ $docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}");
+
+ # Check if the nix store is correctly initialized by listing dependencies of the installed Nix binary
+ $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nix}'");
+ $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.nix.imageName} /bin/nix-store -qR ${pkgs.nix}");
+ $docker->succeed("docker rmi ${pkgs.dockerTools.examples.nix.imageName}");
+
+ # To test the pullImage tool
+ $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nixFromDockerHub}'");
+ $docker->succeed("docker run --rm nixos/nix:1.11 nix-store --version");
+ $docker->succeed("docker rmi nixos/nix:1.11");
+
+ # To test runAsRoot and entry point
+ $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nginx}'");
+ $docker->succeed("docker run --name nginx -d -p 8000:80 ${pkgs.dockerTools.examples.nginx.imageName}");
+ $docker->waitUntilSucceeds('curl http://localhost:8000/');
+ $docker->succeed("docker rm --force nginx");
+ $docker->succeed("docker rmi '${pkgs.dockerTools.examples.nginx.imageName}'");
+
+ # An pulled image can be used as base image
+ $docker->succeed("docker load --input='${pkgs.dockerTools.examples.onTopOfPulledImage}'");
+ $docker->succeed("docker run --rm ontopofpulledimage hello");
+ $docker->succeed("docker rmi ontopofpulledimage");
+ '';
+})
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index 4ec7e56cc6cb..f585fa2ec237 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -1,7 +1,6 @@
{ system ? builtins.currentSystem }:
with import ../lib/testing.nix { inherit system; };
-with import ../lib/qemu-flags.nix;
with pkgs.lib;
let
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index 65ff1cac070b..ed656b3628b9 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -1,95 +1,107 @@
-# Test the ELK stack: Elasticsearch, Logstash and Kibana.
-
-import ./make-test.nix ({ pkgs, ...} :
+{ system ? builtins.currentSystem }:
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
let
esUrl = "http://localhost:9200";
-in {
- name = "ELK";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco chaoflow offline basvandijk ];
- };
- nodes = {
- one =
- { config, pkgs, ... }: {
- # Not giving the machine at least 2060MB results in elasticsearch failing with the following error:
- #
- # OpenJDK 64-Bit Server VM warning:
- # INFO: os::commit_memory(0x0000000085330000, 2060255232, 0)
- # failed; error='Cannot allocate memory' (errno=12)
- #
- # There is insufficient memory for the Java Runtime Environment to continue.
- # Native memory allocation (mmap) failed to map 2060255232 bytes for committing reserved memory.
- #
- # When setting this to 2500 I got "Kernel panic - not syncing: Out of
- # memory: compulsory panic_on_oom is enabled" so lets give it even a
- # bit more room:
- virtualisation.memorySize = 3000;
+ mkElkTest = name : elk : makeTest {
+ inherit name;
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ eelco chaoflow offline basvandijk ];
+ };
+ nodes = {
+ one =
+ { config, pkgs, ... }: {
+ # Not giving the machine at least 2060MB results in elasticsearch failing with the following error:
+ #
+ # OpenJDK 64-Bit Server VM warning:
+ # INFO: os::commit_memory(0x0000000085330000, 2060255232, 0)
+ # failed; error='Cannot allocate memory' (errno=12)
+ #
+ # There is insufficient memory for the Java Runtime Environment to continue.
+ # Native memory allocation (mmap) failed to map 2060255232 bytes for committing reserved memory.
+ #
+ # When setting this to 2500 I got "Kernel panic - not syncing: Out of
+ # memory: compulsory panic_on_oom is enabled" so lets give it even a
+ # bit more room:
+ virtualisation.memorySize = 3000;
- # For querying JSON objects returned from elasticsearch and kibana.
- environment.systemPackages = [ pkgs.jq ];
+ # For querying JSON objects returned from elasticsearch and kibana.
+ environment.systemPackages = [ pkgs.jq ];
- services = {
- logstash = {
- enable = true;
- package = pkgs.logstash5;
- inputConfig = ''
- exec { command => "echo -n flowers" interval => 1 type => "test" }
- exec { command => "echo -n dragons" interval => 1 type => "test" }
- '';
- filterConfig = ''
- if [message] =~ /dragons/ {
- drop {}
- }
- '';
- outputConfig = ''
- file {
- path => "/tmp/logstash.out"
- codec => line { format => "%{message}" }
- }
- elasticsearch {
- hosts => [ "${esUrl}" ]
- }
- '';
- };
+ services = {
+ logstash = {
+ enable = true;
+ package = elk.logstash;
+ inputConfig = ''
+ exec { command => "echo -n flowers" interval => 1 type => "test" }
+ exec { command => "echo -n dragons" interval => 1 type => "test" }
+ '';
+ filterConfig = ''
+ if [message] =~ /dragons/ {
+ drop {}
+ }
+ '';
+ outputConfig = ''
+ file {
+ path => "/tmp/logstash.out"
+ codec => line { format => "%{message}" }
+ }
+ elasticsearch {
+ hosts => [ "${esUrl}" ]
+ }
+ '';
+ };
- elasticsearch = {
- enable = true;
- package = pkgs.elasticsearch5;
- };
+ elasticsearch = {
+ enable = true;
+ package = elk.elasticsearch;
+ };
- kibana = {
- enable = true;
- package = pkgs.kibana5;
- elasticsearch.url = esUrl;
+ kibana = {
+ enable = true;
+ package = elk.kibana;
+ elasticsearch.url = esUrl;
+ };
};
};
- };
- };
+ };
- testScript = ''
- startAll;
+ testScript = ''
+ startAll;
- $one->waitForUnit("elasticsearch.service");
+ $one->waitForUnit("elasticsearch.service");
- # Continue as long as the status is not "red". The status is probably
- # "yellow" instead of "green" because we are using a single elasticsearch
- # node which elasticsearch considers risky.
- #
- # TODO: extend this test with multiple elasticsearch nodes and see if the status turns "green".
- $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_cluster/health' | jq .status | grep -v red");
+ # Continue as long as the status is not "red". The status is probably
+ # "yellow" instead of "green" because we are using a single elasticsearch
+ # node which elasticsearch considers risky.
+ #
+ # TODO: extend this test with multiple elasticsearch nodes and see if the status turns "green".
+ $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_cluster/health' | jq .status | grep -v red");
- # Perform some simple logstash tests.
- $one->waitForUnit("logstash.service");
- $one->waitUntilSucceeds("cat /tmp/logstash.out | grep flowers");
- $one->waitUntilSucceeds("cat /tmp/logstash.out | grep -v dragons");
+ # Perform some simple logstash tests.
+ $one->waitForUnit("logstash.service");
+ $one->waitUntilSucceeds("cat /tmp/logstash.out | grep flowers");
+ $one->waitUntilSucceeds("cat /tmp/logstash.out | grep -v dragons");
- # See if kibana is healthy.
- $one->waitForUnit("kibana.service");
- $one->waitUntilSucceeds("curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green");
+ # See if kibana is healthy.
+ $one->waitForUnit("kibana.service");
+ $one->waitUntilSucceeds("curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green");
- # See if logstash messages arive in elasticsearch.
- $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0");
- $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0");
- '';
-})
+ # See if logstash messages arive in elasticsearch.
+ $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0");
+ $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0");
+ '';
+ };
+in mapAttrs mkElkTest {
+ "ELK-5" = {
+ elasticsearch = pkgs.elasticsearch5;
+ logstash = pkgs.logstash5;
+ kibana = pkgs.kibana5;
+ };
+ "ELK-6" = {
+ elasticsearch = pkgs.elasticsearch6;
+ logstash = pkgs.logstash6;
+ kibana = pkgs.kibana6;
+ };
+}
diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index 8f2a8c01eebc..bb7daae118c0 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -11,8 +11,8 @@ import ./make-test.nix ({ pkgs, ...} : {
with pkgs.lib;
{
networking = {
- interfaces.eth1.ip6 = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ];
- interfaces.eth1.ip4 = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ];
+ interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ];
+ interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ];
};
};
server =
@@ -20,8 +20,8 @@ import ./make-test.nix ({ pkgs, ...} : {
with pkgs.lib;
{
networking = {
- interfaces.eth1.ip6 = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
- interfaces.eth1.ip4 = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
+ interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
+ interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
};
services = {
diff --git a/nixos/tests/fwupd.nix b/nixos/tests/fwupd.nix
new file mode 100644
index 000000000000..bf4ef25130b3
--- /dev/null
+++ b/nixos/tests/fwupd.nix
@@ -0,0 +1,19 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }: {
+ name = "fwupd";
+
+ meta = {
+ maintainers = pkgs.fwupd.meta.maintainers;
+ };
+
+ machine = { config, pkgs, ... }: {
+ services.fwupd.enable = 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/gjs.nix b/nixos/tests/gjs.nix
new file mode 100644
index 000000000000..e6002ef98dd0
--- /dev/null
+++ b/nixos/tests/gjs.nix
@@ -0,0 +1,19 @@
+# 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/glance.nix b/nixos/tests/glance.nix
deleted file mode 100644
index 992b77227a4b..000000000000
--- a/nixos/tests/glance.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ system ? builtins.currentSystem }:
-
-with import ../lib/testing.nix { inherit system; };
-with pkgs.lib;
-
-let
- glanceMysqlPassword = "glanceMysqlPassword";
- glanceAdminPassword = "glanceAdminPassword";
-
- createDb = pkgs.writeText "db-provisionning.sql" ''
- create database keystone;
- GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY 'keystone';
- GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY 'keystone';
-
- create database glance;
- GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'localhost' IDENTIFIED BY '${glanceMysqlPassword}';
- GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' IDENTIFIED BY '${glanceMysqlPassword}';
- '';
-
- image =
- (import ../lib/eval-config.nix {
- inherit system;
- modules = [ ../../nixos/modules/virtualisation/nova-image.nix ];
- }).config.system.build.novaImage;
-
- # The admin keystone account
- adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=keystone OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
-
-in makeTest {
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ lewo ];
- };
- machine =
- { config, pkgs, ... }:
- {
- services.mysql.enable = true;
- services.mysql.package = pkgs.mysql;
- services.mysql.initialScript = createDb;
-
- virtualisation = {
- openstack.keystone = {
- enable = true;
- database.password = { value = "keystone"; storage = "fromNixStore"; };
- adminToken = { value = "adminToken"; storage = "fromNixStore"; };
- bootstrap.enable = true;
- bootstrap.adminPassword = { value = "keystone"; storage = "fromNixStore"; };
- };
-
- openstack.glance = {
- enable = true;
- database.password = { value = glanceMysqlPassword; storage = "fromNixStore"; };
- servicePassword = { value = glanceAdminPassword; storage = "fromNixStore"; };
-
- bootstrap = {
- enable = true;
- keystoneAdminPassword = { value = "keystone"; storage = "fromNixStore"; };
- };
- };
-
- memorySize = 2096;
- diskSize = 4 * 1024;
- };
-
- environment.systemPackages = with pkgs.pythonPackages; with pkgs; [
- openstackclient
- ];
- };
-
- testScript =
- ''
- $machine->waitForUnit("glance-api.service");
-
- # Since Glance api can take time to start, we retry until success
- $machine->waitUntilSucceeds("${adminOpenstackCmd} image create nixos --file ${image}/nixos.img --disk-format qcow2 --container-format bare --public");
- $machine->succeed("${adminOpenstackCmd} image list") =~ /nixos/ or die;
- '';
-}
diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix
index 16b8181498a6..d45776c3ee29 100644
--- a/nixos/tests/grafana.nix
+++ b/nixos/tests/grafana.nix
@@ -20,6 +20,6 @@ import ./make-test.nix ({ lib, ... }:
$machine->start;
$machine->waitForUnit("grafana.service");
$machine->waitForOpenPort(3000);
- $machine->succeed("curl -sS http://127.0.0.1:3000/");
+ $machine->succeed("curl -sSfL http://127.0.0.1:3000/");
'';
})
diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix
new file mode 100644
index 000000000000..4f30f01e4032
--- /dev/null
+++ b/nixos/tests/hocker-fetchdocker/default.nix
@@ -0,0 +1,15 @@
+import ../make-test.nix ({ pkgs, ...} : {
+ name = "test-hocker-fetchdocker";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ ixmatus ];
+ };
+
+ machine = import ./machine.nix;
+
+ testScript = ''
+ startAll;
+
+ $machine->waitForUnit("sockets.target");
+ $machine->waitUntilSucceeds("docker run registry-1.docker.io/v2/library/hello-world:latest");
+ '';
+})
diff --git a/nixos/tests/hocker-fetchdocker/hello-world-container.nix b/nixos/tests/hocker-fetchdocker/hello-world-container.nix
new file mode 100644
index 000000000000..a127875264e9
--- /dev/null
+++ b/nixos/tests/hocker-fetchdocker/hello-world-container.nix
@@ -0,0 +1,19 @@
+{ fetchDockerConfig, fetchDockerLayer, fetchdocker }:
+fetchdocker rec {
+ name = "hello-world";
+ registry = "https://registry-1.docker.io/v2/";
+ repository = "library";
+ imageName = "hello-world";
+ tag = "latest";
+ imageConfig = fetchDockerConfig {
+ inherit tag registry repository imageName;
+ sha256 = "1ivbd23hyindkahzfw4kahgzi6ibzz2ablmgsz6340vc6qr1gagj";
+ };
+ imageLayers = let
+ layer0 = fetchDockerLayer {
+ inherit registry repository imageName;
+ layerDigest = "ca4f61b1923c10e9eb81228bd46bee1dfba02b9c7dac1844527a734752688ede";
+ sha256 = "1plfd194fwvsa921ib3xkhms1yqxxrmx92r2h7myj41wjaqn2kya";
+ };
+ in [ layer0 ];
+ }
diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix
new file mode 100644
index 000000000000..12c58a012243
--- /dev/null
+++ b/nixos/tests/hocker-fetchdocker/machine.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, ... }:
+{ nixpkgs.config.packageOverrides = pkgs': {
+ hello-world-container = pkgs'.callPackage ./hello-world-container.nix { };
+ };
+
+ virtualisation.docker = {
+ enable = true;
+ package = pkgs.docker;
+ };
+
+ systemd.services.docker-load-fetchdocker-image = {
+ description = "Docker load hello-world-container";
+ wantedBy = [ "multi-user.target" ];
+ wants = [ "docker.service" "local-fs.target" ];
+ after = [ "docker.service" "local-fs.target" ];
+
+ script = ''
+ ${pkgs.hello-world-container}/compositeImage.sh | ${pkgs.docker}/bin/docker load
+ '';
+
+ serviceConfig = {
+ Type = "oneshot";
+ };
+ };
+}
+
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
new file mode 100644
index 000000000000..2e45dc78471f
--- /dev/null
+++ b/nixos/tests/home-assistant.nix
@@ -0,0 +1,76 @@
+import ./make-test.nix ({ pkgs, ... }:
+
+let
+ configDir = "/var/lib/foobar";
+ apiPassword = "secret";
+
+in {
+ name = "home-assistant";
+ meta = with pkgs.stdenv.lib; {
+ maintainers = with maintainers; [ dotlambda ];
+ };
+
+ nodes = {
+ hass =
+ { config, pkgs, ... }:
+ {
+ environment.systemPackages = with pkgs; [
+ mosquitto
+ ];
+ services.home-assistant = {
+ inherit configDir;
+ enable = true;
+ package = pkgs.home-assistant.override {
+ extraPackages = ps: with ps; [ hbmqtt ];
+ };
+ config = {
+ homeassistant = {
+ name = "Home";
+ time_zone = "UTC";
+ latitude = "0.0";
+ longitude = "0.0";
+ elevation = 0;
+ };
+ frontend = { };
+ http.api_password = apiPassword;
+ mqtt = { }; # Use hbmqtt as broker
+ binary_sensor = [
+ {
+ platform = "mqtt";
+ state_topic = "home-assistant/test";
+ payload_on = "let_there_be_light";
+ payload_off = "off";
+ }
+ ];
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+ $hass->waitForUnit("home-assistant.service");
+
+ # Since config is specified using a Nix attribute set,
+ # configuration.yaml is a link to the Nix store
+ $hass->succeed("test -L ${configDir}/configuration.yaml");
+
+ # Check that Home Assistant's web interface and API can be reached
+ $hass->waitForOpenPort(8123);
+ $hass->succeed("curl --fail http://localhost:8123/states");
+ $hass->succeed("curl --fail -H 'x-ha-access: ${apiPassword}' http://localhost:8123/api/ | grep -qF 'API running'");
+
+ # Toggle a binary sensor using MQTT
+ $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'");
+ $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${apiPassword}' -m let_there_be_light");
+ $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'");
+
+ # Check that no errors were logged
+ $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR");
+
+ # Print log to ease debugging
+ my $log = $hass->succeed("cat ${configDir}/home-assistant.log");
+ print "\n### home-assistant.log ###\n";
+ print "$log\n";
+ '';
+})
diff --git a/nixos/tests/initrd-network-ssh.nix b/nixos/tests/initrd-network-ssh/default.nix
similarity index 62%
rename from nixos/tests/initrd-network-ssh.nix
rename to nixos/tests/initrd-network-ssh/default.nix
index 596610493921..b1f3d147e862 100644
--- a/nixos/tests/initrd-network-ssh.nix
+++ b/nixos/tests/initrd-network-ssh/default.nix
@@ -1,19 +1,6 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ../make-test.nix ({ pkgs, lib, ... }:
-let
- keys = pkgs.runCommand "gen-keys" {
- outputs = [ "out" "dbPub" "dbPriv" "sshPub" "sshPriv" ];
- buildInputs = with pkgs; [ dropbear openssh ];
- }
- ''
- touch $out
- dropbearkey -t rsa -f $dbPriv -s 4096 | sed -n 2p > $dbPub
- ssh-keygen -q -t rsa -b 4096 -N "" -f client
- mv client $sshPriv
- mv client.pub $sshPub
- '';
-
-in {
+{
name = "initrd-network-ssh";
meta = with lib.maintainers; {
maintainers = [ willibutz ];
@@ -24,17 +11,15 @@ in {
{ config, pkgs, ... }:
{
boot.kernelParams = [
- "ip=${
- (head config.networking.interfaces.eth1.ip4).address
- }:::255.255.255.0::eth1:none"
+ "ip=${config.networking.primaryIPAddress}:::255.255.255.0::eth1:none"
];
boot.initrd.network = {
enable = true;
ssh = {
enable = true;
- authorizedKeys = [ "${readFile keys.sshPub}" ];
+ authorizedKeys = [ "${readFile ./openssh.pub}" ];
port = 22;
- hostRSAKey = keys.dbPriv;
+ hostRSAKey = ./dropbear.priv;
};
};
boot.initrd.preLVMCommands = ''
@@ -56,7 +41,7 @@ in {
"${toString (head (splitString " " (
toString (elemAt (splitString "\n" config.networking.extraHosts) 2)
)))} "
- "${readFile keys.dbPub}"
+ "${readFile ./dropbear.pub}"
];
};
};
@@ -65,7 +50,7 @@ in {
testScript = ''
startAll;
$client->waitForUnit("network.target");
- $client->copyFileFromHost("${keys.sshPriv}","/etc/sshKey");
+ $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'");
diff --git a/nixos/tests/initrd-network-ssh/dropbear.priv b/nixos/tests/initrd-network-ssh/dropbear.priv
new file mode 100644
index 000000000000..af340535f0a3
Binary files /dev/null and b/nixos/tests/initrd-network-ssh/dropbear.priv differ
diff --git a/nixos/tests/initrd-network-ssh/dropbear.pub b/nixos/tests/initrd-network-ssh/dropbear.pub
new file mode 100644
index 000000000000..385c625522aa
--- /dev/null
+++ b/nixos/tests/initrd-network-ssh/dropbear.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzJ0OniLB91MpPC86I1m3wwJeAc+Gme7bAuaLIU/cSfPwxT5NO7MfCp0Pu94gYDKtDXMs/wXg0bTAVDeAFFkdIj6kBBumEmQLCTL48q2UxDIXVLT/E/AAgj6q7WwgCg7fwm4Vjn4z7aUyBx8EfRy+5/SQyeYla3D/lFYgMi5x4D6J+yeR+JPAptDE/IR5IizNV7mY0ZcoXYyHrrehI1tTYEEqjX13ZqS4OCBFWwHe1QHhRNM+jHhcATbgikjAj8FyFPtLvc+dSVtkuhQktQl36Bi8zMUQcV6+mM7Ln6DBcDlM9urHKLYPTWmUAyhxM955iglOn5z0RaAIcyNMT6hz0rHaNf0BIlmbXoTC0XGjHh/OnoOEC/zg0JqgQTnPiU45K4TnRSSXp2GfiDfiQAK0+HaXACkjuFR68u7WCZpB1Bse1OgKNClFqtRhIr5DilUb2/e5DCCmFkddMUcjmYqzZdbXNt7fo8CFULe+mbiCp8+tMg4aRTaDZ/Hk93nCvGE5TP2ypEMbfL6nRVKvXOjhdvSQQgKwx+O003FDEHCSG0Bpageh7yVpna+SPrbGklce7MjTpbx3iIwmvKpQ6asnK1L3KkahpY1S3NhQ+/S3Gs8KWQ5LAU+d3xiPX3jfIVHsCIIyxHDbwcJvxM4MFBFQpqRMD6E+LoM9RHjl4C9k2iQ== tmtynkky@duuni
diff --git a/nixos/tests/initrd-network-ssh/generate-keys.nix b/nixos/tests/initrd-network-ssh/generate-keys.nix
new file mode 100644
index 000000000000..0183e12d7a88
--- /dev/null
+++ b/nixos/tests/initrd-network-ssh/generate-keys.nix
@@ -0,0 +1,12 @@
+with import ../../.. {};
+
+runCommand "gen-keys" {
+ buildInputs = [ dropbear openssh ];
+ }
+ ''
+ mkdir $out
+ dropbearkey -t rsa -f $out/dropbear.priv -s 4096 | sed -n 2p > $out/dropbear.pub
+ ssh-keygen -q -t rsa -b 4096 -N "" -f client
+ mv client $out/openssh.priv
+ mv client.pub $out/openssh.pub
+ ''
diff --git a/nixos/tests/initrd-network-ssh/openssh.priv b/nixos/tests/initrd-network-ssh/openssh.priv
new file mode 100644
index 000000000000..816d65435fd7
--- /dev/null
+++ b/nixos/tests/initrd-network-ssh/openssh.priv
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIJKAIBAAKCAgEA7+9A2PCPOTAlFmrablrUWA+VZdAuLfM6JXeHsOF7ZbC2F6lv
+WmvDM925DQqhiAjcgWnt5WHWS5Y+b7lGnuzT7fyKegXd80nCRmqlpSG3srX0/lxR
+aQAJLzfoDjcsF+ceswQo6GSsYnCHVxMNs007gbbVY3f7o+sWZtLdxJPD2iHvl5Zr
+LK0d1RLMmU6cfIhIABlL0S8EWiv29RROepsCQnS0dnK2b+von1SCYoggvAMe2ToA
+IAJ8+uqaYfGAyn9q8fjZiRHxLmKDq90tKoCUL5r/2dmEIE+t8T/3PfHoq1QzZts9
+W9idhBdT21dEXBtGyoMtckp5njk5m82LQDYiOXkuSoIUhSOteh5g7fBv1BtVSERx
+Jg3UeJjPeGKFwdnzapmAKC2w/6V8xcIINNA+fhZA7B9fD1RAi2TECZ+gyMYDc4T+
+USlMSm9cfvSOrf2+5ngtFb84nHjqvClxCMLu+bCWK8HamqUzhE/a5LbR+48E7PyG
+s3KV+sWFN9KOnakTjj/6iQhXZRhgeAK39F2XTk5Ms5Y+BRSStnMoMZA2grIV+jHi
+1zbWokVqXPI5YRo5isR/PgtKAV6FfNWumcYoFJ9F40pMHQ6hJVEmtrCBx7EApSl3
+mSGbQJUmilLC51qNhwQRbD//ZtpIrN82HTMKzZ6kj7kDCdsff+wsnkIXmmMCAwEA
+AQKCAgA4tMINw6UF7hQF3VEsnbjr6xrzCiWv5HlMm5htPI1OdlpC81+G7ksfOfrf
+UzDkFrwOtftsqBfem268Nvyy2OQprfMIbdSMCFWrEM9/XJ2u1gRGDYmMGF8TUtI8
+cduw9oWx53zHl+uKBHBoKu+k/c7flFeQf63wisIroRCawhWau0SF/h3sXCndzuie
+Hw8q+4aQx2m80bDkotlmCNuXbIU3MZ/pEql9gDLlXTLHmMaryM0EqAmZhx0ErGe6
+WDqJIV4kPB0loSDwRoY6GzbugZ8ENUzcruTkQhCpIOYNNNw5idfwKkaxK1vm+SBv
+iYt1fVjYyfH2vhVKSNoNsaGEloa1u4Dymt/FpFztEpRzHXcw93N8BdLxJ4OUhzm2
+iAbpiyjniTIeAVVi7BUwLXh5WAx8nT0eeb1zKoZg1p1ciK5cYl1Uel7j8xRycsSW
+3YgmtuPqY4Agbc9v3eXbQZNDk48JFMEqpIxk97FAkRYpzfxg5Qq14WJCp60CkdRt
+T60hXy8lT/BcI8OWLfGJuBbsVLNRiC7PpwqRKQAinXSv134FpP7jrhpkMybs2oIS
+5obRG7J5OfOTp925erG5mrpwqa3BPkgqx347Wj9z8quOZyuhi+XaPvqmPtvs5JOl
+4RCqjt6RQlHm7xos9ZZGI4jDAIFaFWgyVZrYplOgwxWma4DTgQKCAQEA9+tizQRU
+lF0lxNcEPvsFnYJo80Y+MQK9VdtlhR19YuSfwP1NCaMG1MhQ+PVBVmepOwJMRJR7
+9PLfOouNMfixKBGP12dtStMuh7jowq/BxhRI6JWp3RhTZ1yJ9ouzHze7IDrEBa6w
+p0hUu9H0Sbt51LXbC3JmTyhbdhfry559DfyGW1Ma/bv/pihL9B5Y7sNf1thNp1gi
+GbQ9B+o2Yyw8ZD8zY+sl+aYDSWyCtcBV/KXEF74Bkfs/a5ExJ00X0jYj/TAp2ray
+T4PY0FR8wN/O10bFLP9j+Xa/ywbcPhoj8nvVRIg9VfWT/QaEd+KR0EZVxdjCCqne
+enbSQksTpAZNwQKCAQEA98E+BMmS+yHUVUhNZABtQ5avwuV4+DoSN8KTp3xwQ0CH
+m9fWxSDs12FdyMhDxrJPeywvHtZ18/7cl3dr8wnFVE0s4ongnRDXsNk5xN6J3AaO
+KqW4HF9cbwZqzLILy8TrO+EK/EQV9FypbrxqvxAlP1kezIA2CJNzVRAgimSuV/H7
+05HTnp5W06fjtEf8U1CUrdNetoSROUo1j/IMGPYGlsBFYAGrj5y/BlKd+3T3kjRp
+Xje7HpiykjrZHn0WDp04Ln+u9nveEewXmHKch313emt7HpW0xspp8JM8OZtEKozk
+D5PfYdBfMJJOUlqovCCzTTJ6kNOahknKXFeO/qs5IwKCAQEAjF0/zhWikXF/fcfD
+Bql2z2vTYdEmSvdjHSYff1Nn90K71DdVk5wytOxJM/sfp/z+yoMNjVKIL/IGQw5Z
+va4xFx+CUhGjxlZ0pLEjT37U9gHsGYsK5jvslLvG/MixfH5AOwoqi5ERQVTpbIF9
+jvVPEAh6YSu/ExglWGJIxTsRUIblxvTxdjEnl/p+rlM0RNJnA6vpo1J51BXA7CdF
+7bZQ5u0Feo/bK1I70ClYg/DGfkmYEV0pZG5cxNkqfDbgwsqWa7YGLGd94xkh+ymq
+jETqxeWyozxhbQ83nYpfzeVc7t//qlJ8b5uf0wUKoRmtNr9rtp13lzP/21REzPXW
+w+oxwQKCAQAoAf2Y2lAw25KlPuq4ZlU+n9u8FkBFnWMJvBMJ7c9XHNmJMf6NkLaO
+RTvWy3geYvbwxf7J9QnRH+vRTciR05cY+Olxn6A03N5nwXxRrToH3MsiWeZ0NnX/
+u8KNUYcUHbV60ulqOThuYHQ/3I9EUUAijaqqjV2sXts19ke68W0x6HKpBJhuudT9
+ktPzbdhyP8Xyl/pocNnerXwexZBsi3Ye6+eIDFz+8OnsBHVcgNPluS72tvsxgqj7
+ciNTiBGCxKKo55eCWBhRPpXE2WUrf/hGPYsBMl2h6FfZMH1+M/N7B4tgdJmS+woU
+Ftws8lTjJEiwA6HFN1ZxrwLNjJobx9yPAoIBAE0igsBuWWn6rXeOPylYg4264XOq
+8gb94pte2n9amDgCzyCn8m6AL3snLC/AoCD19DK+gyK0ukoesXPa3iX6w2xv69ZC
+urDx36Jhd4zrJb4QsFPoeKfDP+UvNVZaS41vipRRzY/y11em15prUZ4U8FA/UT1Y
+FzkBo9r6iUZRnyBLppMuEfWASDtuRNmeIHynoT1AcQOH3l9vR210iEpmAuJr0CYA
+bvTuz3UzzGGEAuIUvuaiRtkfKY52jBmiEr7SSPCr1HvLj3Ccz8bgjgR2kiXmcU50
+1zLnaPAD44LZ/0Fjqj+PimQGT6K7CNXPllmYh7MvoU52g3SVPf6rHlIR0Nc=
+-----END RSA PRIVATE KEY-----
diff --git a/nixos/tests/initrd-network-ssh/openssh.pub b/nixos/tests/initrd-network-ssh/openssh.pub
new file mode 100644
index 000000000000..5b72b8085f27
--- /dev/null
+++ b/nixos/tests/initrd-network-ssh/openssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDv70DY8I85MCUWatpuWtRYD5Vl0C4t8zold4ew4XtlsLYXqW9aa8Mz3bkNCqGICNyBae3lYdZLlj5vuUae7NPt/Ip6Bd3zScJGaqWlIbeytfT+XFFpAAkvN+gONywX5x6zBCjoZKxicIdXEw2zTTuBttVjd/uj6xZm0t3Ek8PaIe+XlmssrR3VEsyZTpx8iEgAGUvRLwRaK/b1FE56mwJCdLR2crZv6+ifVIJiiCC8Ax7ZOgAgAnz66pph8YDKf2rx+NmJEfEuYoOr3S0qgJQvmv/Z2YQgT63xP/c98eirVDNm2z1b2J2EF1PbV0RcG0bKgy1ySnmeOTmbzYtANiI5eS5KghSFI616HmDt8G/UG1VIRHEmDdR4mM94YoXB2fNqmYAoLbD/pXzFwgg00D5+FkDsH18PVECLZMQJn6DIxgNzhP5RKUxKb1x+9I6t/b7meC0VvziceOq8KXEIwu75sJYrwdqapTOET9rkttH7jwTs/IazcpX6xYU30o6dqROOP/qJCFdlGGB4Arf0XZdOTkyzlj4FFJK2cygxkDaCshX6MeLXNtaiRWpc8jlhGjmKxH8+C0oBXoV81a6ZxigUn0XjSkwdDqElUSa2sIHHsQClKXeZIZtAlSaKUsLnWo2HBBFsP/9m2kis3zYdMwrNnqSPuQMJ2x9/7CyeQheaYw== tmtynkky@duuni
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 6c7fd6c575bf..f67011b4412c 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -1,7 +1,6 @@
{ system ? builtins.currentSystem }:
with import ../lib/testing.nix { inherit system; };
-with import ../lib/qemu-flags.nix;
with pkgs.lib;
let
@@ -70,11 +69,17 @@ let
let
iface = if grubVersion == 1 then "ide" else "virtio";
isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
+
+ # FIXME don't duplicate the -enable-kvm etc. flags here yet again!
qemuFlags =
(if system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
- (optionalString (system == "x86_64-linux") "-cpu kvm64 ");
+ (optionalString (system == "x86_64-linux") "-cpu kvm64 ") +
+ (optionalString (system == "aarch64-linux") "-enable-kvm -machine virt,gic-version=host -cpu host ");
+
hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", ''
- + optionalString isEfi ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '';
+ + optionalString isEfi (if pkgs.stdenv.isAarch64
+ then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", ''
+ else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '');
in
''
$machine->start;
@@ -146,7 +151,7 @@ let
# Check that the daemon works, and that non-root users can run builds (this will build a new profile generation through the daemon)
$machine->succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2");
- # We need to a writable nix-store on next boot.
+ # We need a writable Nix store on next boot.
$machine->copyFileFromHost(
"${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier grubUseEfi extraConfig; forceGrubReinstallCount = 1; } }",
"/etc/nixos/configuration.nix");
@@ -196,8 +201,7 @@ let
};
nodes = {
- # The configuration of the machine used to run "nixos-install". It
- # also has a web server that simulates cache.nixos.org.
+ # The configuration of the machine used to run "nixos-install".
machine =
{ config, lib, pkgs, ... }:
@@ -209,7 +213,6 @@ let
virtualisation.diskSize = 8 * 1024;
virtualisation.memorySize = 1024;
- virtualisation.writableStore = true;
# Use a small /dev/vdb as the root disk for the
# installer. This ensures the target disk (/dev/vda) is
@@ -246,6 +249,11 @@ let
++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
nix.binaryCaches = mkForce [ ];
+ nix.extraOptions =
+ ''
+ hashed-mirrors =
+ connect-timeout = 1
+ '';
};
};
@@ -510,10 +518,10 @@ in {
. " mklabel msdos"
. " mkpart primary ext2 1M 100MB" # /boot
. " mkpart extended 100M -1s"
- . " mkpart logical 102M 1602M" # md0 (root), first device
- . " mkpart logical 1603M 3103M" # md0 (root), second device
- . " mkpart logical 3104M 3360M" # md1 (swap), first device
- . " mkpart logical 3361M 3617M", # md1 (swap), second device
+ . " mkpart logical 102M 2102M" # md0 (root), first device
+ . " mkpart logical 2103M 4103M" # md0 (root), second device
+ . " mkpart logical 4104M 4360M" # md1 (swap), first device
+ . " mkpart logical 4361M 4617M", # md1 (swap), second device
"udevadm settle",
"ls -l /dev/vda* >&2",
"cat /proc/partitions >&2",
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index 060f63216796..7a98fd85cfda 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -47,7 +47,7 @@ import ./make-test.nix ({ pkgs, ...} : {
# Detection).
sub waitForAddress {
my ($machine, $iface, $scope) = @_;
- $machine->waitUntilSucceeds("[ `ip -o -6 addr show dev $iface scope $scope | grep -v tentative | wc -l` -eq 1 ]");
+ $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;
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index a9833058f378..ed55b2ff5871 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -36,6 +36,9 @@ import ./make-test.nix ({ pkgs, ...} : {
startAll;
$master->waitForUnit("jenkins");
+
+ $master->mustSucceed("curl http://localhost:8080 | grep 'Authentication required'");
+
print $master->execute("sudo -u jenkins groups");
$master->mustSucceed("sudo -u jenkins groups | grep jenkins | grep users");
@@ -44,4 +47,4 @@ import ./make-test.nix ({ pkgs, ...} : {
$slave->mustFail("systemctl is-enabled jenkins.service");
'';
-})
\ No newline at end of file
+})
diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix
index c431c1a34174..caa5f7107c23 100644
--- a/nixos/tests/keymap.nix
+++ b/nixos/tests/keymap.nix
@@ -46,41 +46,11 @@ let
in makeTest {
name = "keymap-${layout}";
+ machine.services.xserver.desktopManager.xterm.enable = false;
machine.i18n.consoleKeyMap = mkOverride 900 layout;
machine.services.xserver.layout = mkOverride 900 layout;
machine.imports = [ ./common/x11.nix extraConfig ];
- machine.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" <waitForUnit("keystone-all.service");
-
- # Verify that admin ccount is working
- $machine->succeed("${adminOpenstackCmd} token issue");
-
- # Try to create a new user
- $machine->succeed("${adminOpenstackCmd} project create --domain default --description 'Demo Project' demo");
- $machine->succeed("${adminOpenstackCmd} user create --domain default --password demo demo");
- $machine->succeed("${adminOpenstackCmd} role create user");
- $machine->succeed("${adminOpenstackCmd} role add --project demo --user demo user");
-
- # Verify this new account is working
- $machine->succeed("${demoOpenstackCmd} token issue");
- '';
-}
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
index acf2e0250819..27b99aacab7d 100644
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@@ -1,14 +1,13 @@
{ system ? builtins.currentSystem }:
with import ../../lib/testing.nix { inherit system; };
-with import ../../lib/qemu-flags.nix;
with pkgs.lib;
let
mkKubernetesBaseTest =
{ name, domain ? "my.zyx", test, machines
, pkgs ? import { inherit system; }
- , certs ? import ./certs.nix { inherit pkgs; externalDomain = domain; }
+ , certs ? import ./certs.nix { inherit pkgs; externalDomain = domain; kubelets = attrNames machines; }
, extraConfiguration ? null }:
let
masterName = head (filter (machineName: any (role: role == "master") machines.${machineName}.roles) (attrNames machines));
diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix
index f108e35b98cd..d3eff910c467 100644
--- a/nixos/tests/kubernetes/certs.nix
+++ b/nixos/tests/kubernetes/certs.nix
@@ -2,7 +2,8 @@
pkgs ? import {},
internalDomain ? "cloud.yourdomain.net",
externalDomain ? "myawesomecluster.cluster.yourdomain.net",
- serviceClusterIp ? "10.0.0.1"
+ serviceClusterIp ? "10.0.0.1",
+ kubelets
}:
let
runWithCFSSL = name: cmd:
@@ -123,9 +124,10 @@ let
};
apiserver-client = {
- kubelet = createClientCertKey {
+ kubelet = hostname: createClientCertKey {
inherit ca;
- cn = "apiserver-client-kubelet";
+ name = "apiserver-client-kubelet-${hostname}";
+ cn = "system:node:${hostname}.${externalDomain}";
groups = ["system:nodes"];
};
@@ -175,10 +177,9 @@ in {
paths = [
(writeCFSSL (noKey ca))
(writeCFSSL kubelet)
- (writeCFSSL apiserver-client.kubelet)
(writeCFSSL apiserver-client.kube-proxy)
(writeCFSSL etcd-client)
- ];
+ ] ++ map (hostname: writeCFSSL (apiserver-client.kubelet hostname)) kubelets;
};
admin = writeCFSSL apiserver-client.admin;
diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix
index 74d98dabec8d..8c488d271bcd 100644
--- a/nixos/tests/kubernetes/dns.nix
+++ b/nixos/tests/kubernetes/dns.nix
@@ -3,7 +3,7 @@ with import ./base.nix { inherit system; };
let
domain = "my.zyx";
- certs = import ./certs.nix { externalDomain = domain; };
+ certs = import ./certs.nix { externalDomain = domain; kubelets = [ "machine1" "machine2" ]; };
redisPod = pkgs.writeText "redis-pod.json" (builtins.toJSON {
kind = "Pod";
diff --git a/nixos/tests/kubernetes/kubernetes-common.nix b/nixos/tests/kubernetes/kubernetes-common.nix
index 00a5c9aba4e3..ddf427e1b01a 100644
--- a/nixos/tests/kubernetes/kubernetes-common.nix
+++ b/nixos/tests/kubernetes/kubernetes-common.nix
@@ -29,8 +29,8 @@ let
tlsKeyFile = "${certs.worker}/kubelet-key.pem";
hostname = "${config.networking.hostName}.${config.networking.domain}";
kubeconfig = {
- certFile = "${certs.worker}/apiserver-client-kubelet.pem";
- keyFile = "${certs.worker}/apiserver-client-kubelet-key.pem";
+ certFile = "${certs.worker}/apiserver-client-kubelet-${config.networking.hostName}.pem";
+ keyFile = "${certs.worker}/apiserver-client-kubelet-${config.networking.hostName}-key.pem";
};
};
controllerManager = {
diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix
index f3e26aa7e74d..ee4ba310ad50 100644
--- a/nixos/tests/make-test.nix
+++ b/nixos/tests/make-test.nix
@@ -2,4 +2,4 @@ f: { system ? builtins.currentSystem, ... } @ args:
with import ../lib/testing.nix { inherit system; };
-makeTest (if builtins.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f)
+makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f)
diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix
new file mode 100644
index 000000000000..113fb622588b
--- /dev/null
+++ b/nixos/tests/matrix-synapse.nix
@@ -0,0 +1,30 @@
+import ./make-test.nix ({ pkgs, ... } : {
+
+ name = "matrix-synapse";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ corngood ];
+ };
+
+ nodes = {
+ server_postgres = args: {
+ services.matrix-synapse.enable = true;
+ services.matrix-synapse.database_type = "psycopg2";
+ };
+
+ server_sqlite = args: {
+ services.matrix-synapse.enable = true;
+ services.matrix-synapse.database_type = "sqlite3";
+ };
+ };
+
+ testScript = ''
+ startAll;
+ $server_postgres->waitForUnit("matrix-synapse.service");
+ $server_postgres->waitUntilSucceeds("curl -Lk https://localhost:8448/");
+ $server_postgres->requireActiveUnit("postgresql.service");
+ $server_sqlite->waitForUnit("matrix-synapse.service");
+ $server_sqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/");
+ $server_sqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]");
+ '';
+
+})
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 79290861cb0b..4fd9466dc502 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -1,11 +1,13 @@
# Miscellaneous small tests that don't warrant their own VM run.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test.nix ({ pkgs, ...} : rec {
name = "misc";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
+ foo = pkgs.writeText "foo" "Hello World";
+
machine =
{ config, lib, pkgs, ... }:
with lib;
@@ -27,10 +29,17 @@ import ./make-test.nix ({ pkgs, ...} : {
security.sudo = { enable = true; wheelNeedsPassword = false; };
boot.kernel.sysctl."vm.swappiness" = 1;
boot.kernelParams = [ "vsyscall=emulate" ];
+ system.extraDependencies = [ foo ];
};
testScript =
''
+ subtest "nix-db", sub {
+ my $json = $machine->succeed("nix path-info --json ${foo}");
+ $json =~ /"narHash":"sha256:0afw0d9j1hvwiz066z93jiddc33nxg6i6qyp26vnqyglpyfivlq5"/ or die "narHash not set";
+ $json =~ /"narSize":128/ or die "narSize not set";
+ };
+
subtest "nixos-version", sub {
$machine->succeed("[ `nixos-version | wc -w` = 2 ]");
};
@@ -115,11 +124,6 @@ import ./make-test.nix ({ pkgs, ...} : {
$machine->succeed("nix-store -qR /run/current-system | grep nixos-");
};
- # Test sudo
- subtest "sudo", sub {
- $machine->succeed("su - sybil -c 'sudo true'");
- };
-
# Test sysctl
subtest "sysctl", sub {
$machine->waitForUnit("systemd-sysctl.service");
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index a12b7645bc28..7057158a829b 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -35,7 +35,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
{ virtualisation.vlans = [ 1 ];
networking.firewall.allowPing = true;
networking.defaultGateway =
- (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address;
+ (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address;
}
(lib.optionalAttrs withConntrackHelpers {
networking.firewall.connectionTrackingModules = [ "ftp" ];
diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix
new file mode 100644
index 000000000000..58733c1b3379
--- /dev/null
+++ b/nixos/tests/netdata.nix
@@ -0,0 +1,31 @@
+# This test runs netdata and checks for data via apps.plugin
+
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "netdata";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ cransom ];
+ };
+
+ nodes = {
+ netdata =
+ { config, pkgs, ... }:
+ {
+ environment.systemPackages = with pkgs; [ curl jq ];
+ services.netdata.enable = true;
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $netdata->waitForUnit("netdata.service");
+ # 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);
+ '';
+})
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 7708775f73f3..5cb40af5799e 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -21,10 +21,8 @@ let
firewall.allowedUDPPorts = [ 547 ];
interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n:
nameValuePair "eth${toString n}" {
- ipAddress = "192.168.${toString n}.1";
- prefixLength = 24;
- ipv6Address = "fd00:1234:5678:${toString n}::1";
- ipv6PrefixLength = 64;
+ ipv4.addresses = [ { address = "192.168.${toString n}.1"; prefixLength = 24; } ];
+ ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ];
})));
};
services.dhcpd4 = {
@@ -90,12 +88,12 @@ let
firewall.allowPing = true;
useDHCP = false;
defaultGateway = "192.168.1.1";
- interfaces.eth1.ip4 = mkOverride 0 [
+ interfaces.eth1.ipv4.addresses = mkOverride 0 [
{ address = "192.168.1.2"; prefixLength = 24; }
{ address = "192.168.1.3"; prefixLength = 32; }
{ address = "192.168.1.10"; prefixLength = 32; }
];
- interfaces.eth2.ip4 = mkOverride 0 [
+ interfaces.eth2.ipv4.addresses = mkOverride 0 [
{ address = "192.168.2.2"; prefixLength = 24; }
];
};
@@ -143,12 +141,12 @@ let
firewall.allowPing = true;
useDHCP = true;
interfaces.eth1 = {
- ip4 = mkOverride 0 [ ];
- ip6 = mkOverride 0 [ ];
+ ipv4.addresses = mkOverride 0 [ ];
+ ipv6.addresses = mkOverride 0 [ ];
};
interfaces.eth2 = {
- ip4 = mkOverride 0 [ ];
- ip6 = mkOverride 0 [ ];
+ ipv4.addresses = mkOverride 0 [ ];
+ ipv6.addresses = mkOverride 0 [ ];
};
};
};
@@ -198,10 +196,10 @@ let
firewall.allowPing = true;
useDHCP = false;
interfaces.eth1 = {
- ip4 = mkOverride 0 [ ];
+ ipv4.addresses = mkOverride 0 [ ];
useDHCP = true;
};
- interfaces.eth2.ip4 = mkOverride 0 [ ];
+ interfaces.eth2.ipv4.addresses = mkOverride 0 [ ];
};
};
testScript = { nodes, ... }:
@@ -241,9 +239,9 @@ let
interfaces = [ "eth1" "eth2" ];
driverOptions.mode = "balance-rr";
};
- interfaces.eth1.ip4 = mkOverride 0 [ ];
- interfaces.eth2.ip4 = mkOverride 0 [ ];
- interfaces.bond.ip4 = mkOverride 0
+ interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
+ interfaces.eth2.ipv4.addresses = mkOverride 0 [ ];
+ interfaces.bond.ipv4.addresses = mkOverride 0
[ { inherit address; prefixLength = 30; } ];
};
};
@@ -274,7 +272,7 @@ let
useNetworkd = networkd;
firewall.allowPing = true;
useDHCP = false;
- interfaces.eth1.ip4 = mkOverride 0
+ interfaces.eth1.ipv4.addresses = mkOverride 0
[ { inherit address; prefixLength = 24; } ];
};
};
@@ -289,9 +287,9 @@ let
firewall.allowPing = true;
useDHCP = false;
bridges.bridge.interfaces = [ "eth1" "eth2" ];
- interfaces.eth1.ip4 = mkOverride 0 [ ];
- interfaces.eth2.ip4 = mkOverride 0 [ ];
- interfaces.bridge.ip4 = mkOverride 0
+ interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
+ interfaces.eth2.ipv4.addresses = mkOverride 0 [ ];
+ interfaces.bridge.ipv4.addresses = mkOverride 0
[ { address = "192.168.1.1"; prefixLength = 24; } ];
};
};
@@ -328,7 +326,7 @@ let
firewall.allowPing = true;
useDHCP = true;
macvlans.macvlan.interface = "eth1";
- interfaces.eth1.ip4 = mkOverride 0 [ ];
+ interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
};
};
testScript = { nodes, ... }:
@@ -369,9 +367,9 @@ let
local = address4;
dev = "eth1";
};
- interfaces.eth1.ip4 = mkOverride 0
+ interfaces.eth1.ipv4.addresses = mkOverride 0
[ { address = address4; prefixLength = 24; } ];
- interfaces.sit.ip6 = mkOverride 0
+ interfaces.sit.ipv6.addresses = mkOverride 0
[ { address = address6; prefixLength = 64; } ];
};
};
@@ -410,9 +408,9 @@ let
id = 1;
interface = "eth0";
};
- interfaces.eth0.ip4 = mkOverride 0 [ ];
- interfaces.eth1.ip4 = mkOverride 0 [ ];
- interfaces.vlan.ip4 = mkOverride 0
+ interfaces.eth0.ipv4.addresses = mkOverride 0 [ ];
+ interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
+ interfaces.vlan.ipv4.addresses = mkOverride 0
[ { inherit address; prefixLength = 24; } ];
};
};
@@ -433,6 +431,169 @@ let
$client2->succeed("ip addr show dev vlan >&2");
'';
};
+ virtual = {
+ name = "Virtual";
+ machine = {
+ networking.interfaces."tap0" = {
+ ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ];
+ ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ];
+ virtual = true;
+ };
+ networking.interfaces."tun0" = {
+ ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
+ ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ];
+ virtual = true;
+ };
+ };
+
+ testScript = ''
+ my $targetList = <<'END';
+ tap0: tap UNKNOWN_FLAGS:800 user 0
+ tun0: tun UNKNOWN_FLAGS:800 user 0
+ END
+
+ # Wait for networking to come up
+ $machine->start;
+ $machine->waitForUnit("network.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"
+ );
+
+ # Test interfaces clean up
+ $machine->succeed("systemctl stop network-addresses-tap0");
+ $machine->succeed("systemctl stop network-addresses-tun0");
+ my $residue = $machine->succeed("ip tuntap list");
+ $residue eq "" or die(
+ "Some virtual interface has not been properly cleaned:\n",
+ "$residue\n"
+ );
+ '';
+ };
+ privacy = {
+ name = "Privacy";
+ nodes.router = { config, pkgs, ... }: {
+ virtualisation.vlans = [ 1 ];
+ boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;
+ networking = {
+ useNetworkd = networkd;
+ interfaces.eth1.ipv6.addresses = singleton {
+ address = "fd00:1234:5678:1::1";
+ prefixLength = 64;
+ };
+ };
+ services.radvd = {
+ enable = true;
+ config = ''
+ interface eth1 {
+ AdvSendAdvert on;
+ AdvManagedFlag on;
+ AdvOtherConfigFlag on;
+
+ prefix fd00:1234:5678:1::/64 {
+ AdvAutonomous on;
+ AdvOnLink on;
+ };
+ };
+ '';
+ };
+ };
+ nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+ virtualisation.vlans = [ 1 ];
+ networking = {
+ useNetworkd = networkd;
+ useDHCP = true;
+ interfaces.eth1 = {
+ preferTempAddress = true;
+ ipv4.addresses = mkOverride 0 [ ];
+ ipv6.addresses = mkOverride 0 [ ];
+ };
+ };
+ };
+ testScript = { nodes, ... }:
+ ''
+ startAll;
+
+ $client->waitForUnit("network.target");
+ $router->waitForUnit("network-online.target");
+
+ # Wait until we have an ip address
+ $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'");
+
+ # Test vlan 1
+ $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
+
+ # Test address used is temporary
+ $client->waitUntilSucceeds("! ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'");
+ '';
+ };
+ routes = {
+ name = "routes";
+ machine = {
+ networking.useDHCP = false;
+ networking.interfaces."eth0" = {
+ ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
+ ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ];
+ ipv6.routes = [
+ { address = "fdfd:b3f0::"; prefixLength = 48; }
+ { address = "2001:1470:fffd:2098::"; prefixLength = 64; via = "fdfd:b3f0::1"; }
+ ];
+ ipv4.routes = [
+ { address = "10.0.0.0"; prefixLength = 16; options = { mtu = "1500"; }; }
+ { address = "192.168.2.0"; prefixLength = 24; via = "192.168.1.1"; }
+ ];
+ };
+ virtualisation.vlans = [ ];
+ };
+
+ testScript = ''
+ my $targetIPv4Table = <<'END';
+ 10.0.0.0/16 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
+ END
+
+ my $targetIPv6Table = <<'END';
+ 2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium
+ 2001:1470:fffd:2098::/64 via fdfd:b3f0::1 metric 1024 pref medium
+ fdfd:b3f0::/48 metric 1024 pref medium
+ END
+
+ $machine->start;
+ $machine->waitForUnit("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"
+ );
+
+ # 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"
+ );
+ '';
+ };
};
in mapAttrs (const (attrs: makeTest (attrs // {
diff --git a/nixos/tests/nix-ssh-serve.nix b/nixos/tests/nix-ssh-serve.nix
new file mode 100644
index 000000000000..aa366d8612d7
--- /dev/null
+++ b/nixos/tests/nix-ssh-serve.nix
@@ -0,0 +1,39 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+let inherit (import ./ssh-keys.nix pkgs)
+ snakeOilPrivateKey snakeOilPublicKey;
+ ssh-config = builtins.toFile "ssh.conf" ''
+ UserKnownHostsFile=/dev/null
+ StrictHostKeyChecking=no
+ '';
+in
+ { name = "nix-ssh-serve";
+ meta.maintainers = [ lib.maintainers.shlevy ];
+ nodes =
+ { server.nix.sshServe =
+ { enable = true;
+ keys = [ snakeOilPublicKey ];
+ protocol = "ssh-ng";
+ };
+ server.nix.package = pkgs.nixUnstable;
+ client.nix.package = pkgs.nixUnstable;
+ };
+ testScript = ''
+ startAll;
+
+ $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("nix-store --add /etc/machine-id > mach-id-path");
+
+ $server->waitForUnit("sshd");
+
+ $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");
+ '';
+ }
+)
diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix
new file mode 100644
index 000000000000..21b86f6dae27
--- /dev/null
+++ b/nixos/tests/novacomd.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "novacomd";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ dtzWill ];
+ };
+
+ machine = { config, pkgs, ... }: {
+ services.novacomd.enable = true;
+ };
+
+ testScript = ''
+ startAll;
+
+ $machine->waitForUnit("novacomd.service");
+
+ # Check status and try connecting with novacom
+ $machine->succeed("systemctl status novacomd.service >&2");
+ $machine->succeed("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");
+ $machine->succeed("novacom -l");
+ '';
+})
diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix
index 0b1082056f6f..ad4d4f822435 100644
--- a/nixos/tests/nsd.nix
+++ b/nixos/tests/nsd.nix
@@ -15,25 +15,31 @@ in import ./make-test.nix ({ pkgs, ...} : {
clientv4 = { lib, nodes, ... }: {
imports = [ common ];
networking.nameservers = lib.mkForce [
- nodes.server.config.networking.interfaces.eth1.ipAddress
+ (lib.head nodes.server.config.networking.interfaces.eth1.ipv4.addresses).address
+ ];
+ networking.interfaces.eth1.ipv4.addresses = [
+ { address = "192.168.0.2"; prefixLength = 24; }
];
- networking.interfaces.eth1.ipAddress = "192.168.0.2";
- networking.interfaces.eth1.prefixLength = 24;
};
clientv6 = { lib, nodes, ... }: {
imports = [ common ];
networking.nameservers = lib.mkForce [
- nodes.server.config.networking.interfaces.eth1.ipv6Address
+ (lib.head nodes.server.config.networking.interfaces.eth1.ipv6.addresses).address
+ ];
+ networking.interfaces.eth1.ipv4.addresses = [
+ { address = "dead:beef::2"; prefixLength = 24; }
];
- networking.interfaces.eth1.ipv6Address = "dead:beef::2";
};
server = { lib, ... }: {
imports = [ common ];
- networking.interfaces.eth1.ipAddress = "192.168.0.1";
- networking.interfaces.eth1.prefixLength = 24;
- networking.interfaces.eth1.ipv6Address = "dead:beef::1";
+ networking.interfaces.eth1.ipv4.addresses = [
+ { address = "192.168.0.1"; prefixLength = 24; }
+ ];
+ networking.interfaces.eth1.ipv6.addresses = [
+ { address = "dead:beef::1"; prefixLength = 64; }
+ ];
services.nsd.enable = true;
services.nsd.interfaces = lib.mkForce [];
services.nsd.zones."example.com.".data = ''
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
new file mode 100644
index 000000000000..1178701c609e
--- /dev/null
+++ b/nixos/tests/openldap.nix
@@ -0,0 +1,35 @@
+import ./make-test.nix {
+ name = "dovecot";
+
+ machine = { pkgs, ... }: {
+ services.openldap = {
+ enable = true;
+ extraConfig = ''
+ include ${pkgs.openldap}/etc/schema/core.schema
+ include ${pkgs.openldap}/etc/schema/cosine.schema
+ include ${pkgs.openldap}/etc/schema/inetorgperson.schema
+ include ${pkgs.openldap}/etc/schema/nis.schema
+ database bdb
+ suffix dc=example
+ directory /var/db/openldap
+ rootdn cn=root,dc=example
+ rootpw notapassword
+ '';
+ declarativeContents = ''
+ dn: dc=example
+ objectClass: domain
+ dc: example
+
+ dn: ou=users,dc=example
+ objectClass: organizationalUnit
+ ou: users
+ '';
+ };
+ };
+
+ testScript = ''
+ $machine->succeed('systemctl status openldap.service');
+ $machine->waitForUnit('openldap.service');
+ $machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"');
+ '';
+}
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 291544996889..b2d254e9d9d9 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -1,20 +1,7 @@
import ./make-test.nix ({ pkgs, ... }:
-let
- snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" ''
- -----BEGIN EC PRIVATE KEY-----
- MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49
- AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN
- r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA==
- -----END EC PRIVATE KEY-----
- '';
-
- snakeOilPublicKey = pkgs.lib.concatStrings [
- "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"
- "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
- "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil"
- ];
-
+let inherit (import ./ssh-keys.nix pkgs)
+ snakeOilPrivateKey snakeOilPublicKey;
in {
name = "openssh";
meta = with pkgs.stdenv.lib.maintainers; {
diff --git a/nixos/tests/owncloud.nix b/nixos/tests/owncloud.nix
new file mode 100644
index 000000000000..0dcdea40b064
--- /dev/null
+++ b/nixos/tests/owncloud.nix
@@ -0,0 +1,39 @@
+import ./make-test.nix ({ pkgs, ... }:
+
+{
+ name = "owncloud";
+ nodes =
+ { web =
+ { config, pkgs, ... }:
+ {
+ services.postgresql.enable = true;
+ services.httpd = {
+ enable = true;
+ logPerVirtualHost = true;
+ adminAddr = "example@example.com";
+ virtualHosts = [
+ {
+ hostName = "owncloud";
+ extraSubservices =
+ [
+ {
+ serviceType = "owncloud";
+ adminPassword = "secret";
+ dbPassword = "secret";
+ }
+ ];
+ }
+ ];
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $web->waitForUnit("postgresql");
+ $web->waitForUnit("httpd");
+
+ $web->succeed("curl -L 127.0.0.1:80");
+ '';
+})
diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix
new file mode 100644
index 000000000000..557d65f7960a
--- /dev/null
+++ b/nixos/tests/plotinus.nix
@@ -0,0 +1,27 @@
+import ./make-test.nix ({ pkgs, ... }: {
+ name = "plotinus";
+ meta = {
+ maintainers = pkgs.plotinus.meta.maintainers;
+ };
+
+ machine =
+ { config, pkgs, ... }:
+
+ { imports = [ ./common/x11.nix ];
+ programs.plotinus.enable = true;
+ environment.systemPackages = [ pkgs.gnome3.gnome-calculator pkgs.xdotool ];
+ };
+
+ testScript =
+ ''
+ $machine->waitForX;
+ $machine->execute("xterm -e 'gnome-calculator' &");
+ $machine->waitForWindow(qr/Calculator/);
+ $machine->execute("xdotool key ctrl+shift+p");
+ $machine->sleep(1); # wait for the popup
+ $machine->execute("xdotool key p r e f e r e n c e s Return");
+ $machine->waitForWindow(qr/Preferences/);
+ $machine->screenshot("screen");
+ '';
+
+})
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index f6ce3fe38ed3..7fe905eb4254 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.postgresql = let mypg = pkgs.postgresql100; in {
enable = true;
package = mypg;
- extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ];
+ extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ];
};
};
};
diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix
new file mode 100644
index 000000000000..0d5b0f715f52
--- /dev/null
+++ b/nixos/tests/powerdns.nix
@@ -0,0 +1,12 @@
+import ./make-test.nix ({ pkgs, ... }: {
+ name = "powerdns";
+
+ nodes.server = { config, pkgs, ... }: {
+ services.powerdns.enable = true;
+ };
+
+ testScript = ''
+ $server->waitForUnit("pdns");
+ $server->succeed("${pkgs.dnsutils}/bin/dig version.bind txt chaos \@127.0.0.1");
+ '';
+})
diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix
new file mode 100644
index 000000000000..b4c2039923cf
--- /dev/null
+++ b/nixos/tests/predictable-interface-names.nix
@@ -0,0 +1,27 @@
+{ system ? builtins.currentSystem
+, pkgs ? import ../.. { inherit system; }
+}:
+with import ../lib/testing.nix { inherit system; };
+let boolToString = x: if x then "yes" else "no"; in
+let testWhenSetTo = predictable: withNetworkd:
+makeTest {
+ name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}";
+ meta = {};
+
+ machine = { config, pkgs, ... }: {
+ networking.usePredictableInterfaceNames = pkgs.stdenv.lib.mkForce predictable;
+ networking.useNetworkd = withNetworkd;
+ networking.dhcpcd.enable = !withNetworkd;
+ };
+
+ testScript = ''
+ print $machine->succeed("ip link");
+ $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}");
+ $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}");
+ '';
+}; in
+with pkgs.stdenv.lib.lists;
+with pkgs.stdenv.lib.attrsets;
+listToAttrs (map (drv: nameValuePair drv.name drv) (
+crossLists testWhenSetTo [[true false] [true false]]
+))
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index e44e5bf11d33..989008830613 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -39,7 +39,9 @@ import ./make-test.nix ({pkgs, ... }: {
$client->waitForUnit("cups.service");
$client->sleep(10); # wait until cups is fully initialized
$client->succeed("lpstat -r") =~ /scheduler is running/ or die;
+ # Test that UNIX socket is used for connections.
$client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
+ # Test that HTTP server is available too.
$client->succeed("curl --fail http://localhost:631/");
$client->succeed("curl --fail http://server:631/");
$server->fail("curl --fail --connect-timeout 2 http://client:631/");
diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix
new file mode 100644
index 000000000000..fcebfaf74e12
--- /dev/null
+++ b/nixos/tests/prosody.nix
@@ -0,0 +1,75 @@
+import ./make-test.nix {
+ name = "prosody";
+
+ machine = { config, pkgs, ... }: {
+ services.prosody = {
+ enable = true;
+ # TODO: use a self-signed certificate
+ c2sRequireEncryption = false;
+ };
+ environment.systemPackages = let
+ sendMessage = pkgs.writeScriptBin "send-message" ''
+ #!/usr/bin/env python3
+ # Based on the sleekxmpp send_client example, look there for more details:
+ # https://github.com/fritzy/SleekXMPP/blob/develop/examples/send_client.py
+ import sleekxmpp
+
+ class SendMsgBot(sleekxmpp.ClientXMPP):
+ """
+ A basic SleekXMPP bot that will log in, send a message,
+ and then log out.
+ """
+ def __init__(self, jid, password, recipient, message):
+ sleekxmpp.ClientXMPP.__init__(self, jid, password)
+
+ self.recipient = recipient
+ self.msg = message
+
+ self.add_event_handler("session_start", self.start, threaded=True)
+
+ def start(self, event):
+ self.send_presence()
+ self.get_roster()
+
+ self.send_message(mto=self.recipient,
+ mbody=self.msg,
+ mtype='chat')
+
+ self.disconnect(wait=True)
+
+
+ if __name__ == '__main__':
+ xmpp = SendMsgBot("test1@localhost", "test1", "test2@localhost", "Hello World!")
+ xmpp.register_plugin('xep_0030') # Service Discovery
+ xmpp.register_plugin('xep_0199') # XMPP Ping
+
+ # TODO: verify certificate
+ # If you want to verify the SSL certificates offered by a server:
+ # xmpp.ca_certs = "path/to/ca/cert"
+
+ if xmpp.connect(('localhost', 5222)):
+ xmpp.process(block=True)
+ else:
+ print("Unable to connect.")
+ sys.exit(1)
+ '';
+ in [ (pkgs.python3.withPackages (ps: [ ps.sleekxmpp ])) sendMessage ];
+ };
+
+ testScript = ''
+ $machine->waitForUnit('prosody.service');
+ $machine->succeed('prosodyctl status') =~ /Prosody is running/;
+
+ # set password to 'test' (it's asked twice)
+ $machine->succeed('yes test1 | prosodyctl adduser test1@localhost');
+ # set password to 'y'
+ $machine->succeed('yes | prosodyctl adduser test2@localhost');
+ # correct password to 'test2'
+ $machine->succeed('yes test2 | prosodyctl passwd test2@localhost');
+
+ $machine->succeed("send-message");
+
+ $machine->succeed('prosodyctl deluser test1@localhost');
+ $machine->succeed('prosodyctl deluser test2@localhost');
+ '';
+}
diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix
deleted file mode 100644
index 0991ed3fce1f..000000000000
--- a/nixos/tests/pump.io.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-# This test runs pump.io with mongodb, listing on port 443.
-
-import ./make-test.nix ({ pkgs, ...} : let
- snakeOilKey = ''
- -----BEGIN PRIVATE KEY-----
- MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqVemio78R41Tz
- MnR2zFD/wFT0iScOpFkuytNmuPf28FLaa9wSBWmuAGbEi7wBIfw8/bUqFBTQp2G1
- m1cmcCKxhmvvOkGs89eM131s1lW/bXU3zYso4e7724kHwU65jRlQs6cFWIlmW7V5
- 3HQobP05dy+zPpujPPSlOQ0qYViR1s+RgZI8r0wS2ZDsliNtQwBLJSIvX6XVnXLo
- F/HmF4/ySJ9pL2AxQXCwZE8SfCzHpArs9COIqTaAuwB79kxWSFQJewmab74BXiM6
- 9FMCtHON24Pl7OR9sRJHH8rMEzUumppmUeCNEzABjzQQ7svR18cmbzRWetp0tT9Y
- 7rj6URHHAgMBAAECggEAGmbCldDnlrAzxJY3cwpsK5f2EwkHIr/aiuQpLCzTUlUh
- onVBYRGxtaSeSSyXcV2BKTrxz5nZOBYZkPqI4Y5T8kwxgpz2/QW2jUABUtNN6yPe
- HU4gma+bSTJX5PnTZ/M0z0tpQezdLx5b3I2M+48ZGMUegZvcp8qU6N8U6VK5VbFD
- DMTGL4b+Kc9HScRkCJjU3FfQcqf9Ml5w9jzHSeHImYEDrG0nX8N8EImRCBXbgxCl
- 5XT1h6LFUGdr+N6n2w56+6l8OZZVmwj1NdF6NJybUQl4Y7b0niA+5czzjRt/YUjZ
- HW0fXmx3XlbYGWYdMdS+VaIW6pkUpm8kZkqjngqLwQKBgQDfhbFQmg9lsJQ8/dQZ
- WzRNsozHKWkQiZbW5sXBWygJbAB3Hc8gvQkuZe9TVyF99cznRj6ro6pGZjP0rTdY
- 3ACTL+ygRArcIR6VsJCIr6nPvBLpOoNb8TQeKPmHC2gnSP9zaT/K2lldYISKNaYQ
- 0seB2gvZhIgMgWtZtmb3jdgl9wKBgQDDFdknXgvFgB+y96//9wTu2WWuE5yQ5yB7
- utAcHNO9rx5X1tJqxymYh+iE8HUN25By+96SpNMQFI+0wNGVB00YWNBKtyepimWN
- EUCojTy+MIXIjrLcvviEePsI4TPWYf8XtZeiYtcczYrt/wPQUYaDb8LBRfpIfmhr
- rCGW93s+sQKBgEDOKTeeQyKPjJsWWL01RTfVsZ04s155FcOeyu0heb0plAT1Ho12
- YUgTg8zc8Tfs4QiYxCjNXdvlW+Dvq6FWv8/s0CUzNRbXf1+U/oKys4AoHi+CqH0q
- tJqd9KKjuwHQ10dl13n/znMVPbg4j7pG8lMCnfblxvAhQbeT+8yAUo/HAoGBAL3t
- /n4KXNGK3NHDvXEp0H6t3wWsiEi3DPQJO+Wy1x8caCFCv5c/kaqz3tfWt0+njSm1
- N8tzdx13tzVWaHV8Jz3l8dxcFtxEJnxB6L5wy0urOAS7kT3DG3b1xgmuH2a//7fY
- jumE60NahcER/2eIh7pdS7IZbAO6NfVmH0m4Zh/xAoGAbquh60sAfLC/1O2/4Xom
- PHS7z2+TNpwu4ou3nspxfigNQcTWzzzTVFLnaTPg+HKbLRXSWysjssmmj5u3lCyc
- S2M9xuhApa9CrN/udz4gEojRVsTla/gyLifIZ3CtTn2QEQiIJEMxM+59KAlkgUBo
- 9BeZ03xTaEZfhVZ9bEN30Ak=
- -----END PRIVATE KEY-----
- '';
-
- snakeOilCert = ''
- -----BEGIN CERTIFICATE-----
- MIICvjCCAaagAwIBAgIJANhA6+PPhomZMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
- BAMMDGIwOTM0YWMwYWZkNTAeFw0xNTExMzAxNzQ3MzVaFw0yNTExMjcxNzQ3MzVa
- MBcxFTATBgNVBAMMDGIwOTM0YWMwYWZkNTCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBAKpV6aKjvxHjVPMydHbMUP/AVPSJJw6kWS7K02a49/bwUtpr3BIF
- aa4AZsSLvAEh/Dz9tSoUFNCnYbWbVyZwIrGGa+86Qazz14zXfWzWVb9tdTfNiyjh
- 7vvbiQfBTrmNGVCzpwVYiWZbtXncdChs/Tl3L7M+m6M89KU5DSphWJHWz5GBkjyv
- TBLZkOyWI21DAEslIi9fpdWdcugX8eYXj/JIn2kvYDFBcLBkTxJ8LMekCuz0I4ip
- NoC7AHv2TFZIVAl7CZpvvgFeIzr0UwK0c43bg+Xs5H2xEkcfyswTNS6ammZR4I0T
- MAGPNBDuy9HXxyZvNFZ62nS1P1juuPpREccCAwEAAaMNMAswCQYDVR0TBAIwADAN
- BgkqhkiG9w0BAQsFAAOCAQEAd2w9rxi6qF9WV8L3rHnTE7uu0ldtdgJlCASx6ouj
- TleOnjfEg+kH8r8UbmRV5vsTDn1Qp5JGDYxfytRUQwLb1zTLde0xotx37E3LY8Wr
- sD6Al4t8sHywB/hc5dy29TgG0iyG8LKZrkwytLvDZ814W3OwpN2rpEz6pdizdHNn
- jsoDEngZiDHvLjIyE0cDkFXkeYMGXOnBUeOcu4nfu4C5eKs3nXGGAcNDbDRIuLoE
- BZExUBY+YSs6JBvh5tvRqLVW0Dz0akEcjb/jhwS2LmDip8Pdoxx4Q1jPKEu38zrr
- Vd5WD2HJhLb9u0UxVp9vfWIUDgydopV5ZmWCQ5YvNepb1w==
- -----END CERTIFICATE-----
- '';
-in {
- name = "pumpio";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ rvl ];
- };
-
- nodes = {
- one =
- { config, pkgs, ... }:
- {
- services = {
- pumpio = {
- port = 443;
- enable = true;
- sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert;
- sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey;
- secretFile = pkgs.writeText "secretFile" "test123";
- site = "test";
- };
- mongodb.enable = true;
- mongodb.extraConfig = ''
- storage.journal.enabled: false
- '';
- };
- systemd.services.mongodb.unitConfig.Before = "pump.io.service";
- systemd.services."pump.io".unitConfig.Requires = "mongodb.service";
- };
- };
-
- testScript = ''
- startAll;
-
- $one->waitForUnit("pump.io.service");
- $one->waitUntilSucceeds("curl -k https://localhost");
- '';
-})
diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix
index b9644b4768c0..613180942c41 100644
--- a/nixos/tests/quagga.nix
+++ b/nixos/tests/quagga.nix
@@ -8,7 +8,7 @@
import ./make-test.nix ({ pkgs, ... }:
let
- ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ip4).address;
+ ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ipv4.addresses).address;
ospfConf = ''
interface eth2
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index f694fc75ef77..8ac0639c6a8c 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -20,7 +20,7 @@ let
'';
};
# WARNING: DON'T DO THIS IN PRODUCTION!
- # This puts secrets (albeit hashed) directly into the Nix store for ease of testing.
+ # This puts unhashed secrets directly into the Nix store for ease of testing.
environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} ''
${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password}
'';
diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix
new file mode 100644
index 000000000000..6b2e2dd3a531
--- /dev/null
+++ b/nixos/tests/rspamd.nix
@@ -0,0 +1,140 @@
+{ system ? builtins.currentSystem }:
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+let
+ initMachine = ''
+ startAll
+ $machine->waitForUnit("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}\" ]]");
+ '';
+ simple = name: socketActivation: enableIPv6: makeTest {
+ name = "rspamd-${name}";
+ machine = {
+ services.rspamd = {
+ enable = true;
+ socketActivation = socketActivation;
+ };
+ networking.enableIPv6 = enableIPv6;
+ };
+ testScript = ''
+ startAll
+ $machine->waitForUnit("multi-user.target");
+ $machine->waitForOpenPort(11334);
+ $machine->waitForUnit("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.conf"));
+ $machine->log($machine->succeed("systemctl cat rspamd.service"));
+ ${if socketActivation then ''
+ $machine->log($machine->succeed("systemctl cat rspamd-controller-1.socket"));
+ $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket"));
+ '' else ''
+ $machine->fail("systemctl cat rspamd-controller-1.socket");
+ $machine->fail("systemctl cat rspamd-normal-1.socket");
+ ''}
+ $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"));
+ ''}
+ '';
+ };
+in
+{
+ simple = simple "simple" false true;
+ ipv4only = simple "ipv4only" false false;
+ simple-socketActivated = simple "simple-socketActivated" true true;
+ ipv4only-socketActivated = simple "ipv4only-socketActivated" true false;
+ deprecated = makeTest {
+ name = "rspamd-deprecated";
+ machine = {
+ services.rspamd = {
+ enable = true;
+ bindSocket = [ "/run/rspamd.sock mode=0600 user=root group=root" ];
+ bindUISocket = [ "/run/rspamd-worker.sock mode=0666 user=root group=root" ];
+ };
+ };
+
+ testScript = ''
+ ${initMachine}
+ $machine->waitForFile("/run/rspamd.sock");
+ ${checkSocket "/run/rspamd.sock" "root" "root" "600" }
+ ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
+ $machine->log($machine->succeed("cat /etc/rspamd.conf"));
+ $machine->fail("systemctl cat rspamd-normal-1.socket");
+ $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"));
+ '';
+ };
+
+ bindports = makeTest {
+ name = "rspamd-bindports";
+ machine = {
+ services.rspamd = {
+ enable = true;
+ socketActivation = false;
+ workers.normal.bindSockets = [{
+ socket = "/run/rspamd.sock";
+ mode = "0600";
+ owner = "root";
+ group = "root";
+ }];
+ workers.controller.bindSockets = [{
+ socket = "/run/rspamd-worker.sock";
+ mode = "0666";
+ owner = "root";
+ group = "root";
+ }];
+ };
+ };
+
+ testScript = ''
+ ${initMachine}
+ $machine->waitForFile("/run/rspamd.sock");
+ ${checkSocket "/run/rspamd.sock" "root" "root" "600" }
+ ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
+ $machine->log($machine->succeed("cat /etc/rspamd.conf"));
+ $machine->fail("systemctl cat rspamd-normal-1.socket");
+ $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"));
+ '';
+ };
+ socketActivated = makeTest {
+ name = "rspamd-socketActivated";
+ machine = {
+ services.rspamd = {
+ enable = true;
+ workers.normal.bindSockets = [{
+ socket = "/run/rspamd.sock";
+ mode = "0600";
+ owner = "root";
+ group = "root";
+ }];
+ workers.controller.bindSockets = [{
+ socket = "/run/rspamd-worker.sock";
+ mode = "0666";
+ owner = "root";
+ group = "root";
+ }];
+ };
+ };
+
+ testScript = ''
+ startAll
+ $machine->waitForFile("/run/rspamd.sock");
+ ${checkSocket "/run/rspamd.sock" "root" "root" "600" }
+ ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
+ $machine->log($machine->succeed("cat /etc/rspamd.conf"));
+ $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket"));
+ $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"));
+ '';
+ };
+}
diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix
new file mode 100644
index 000000000000..cfe64a75a635
--- /dev/null
+++ b/nixos/tests/rxe.nix
@@ -0,0 +1,53 @@
+import ./make-test.nix ({ pkgs, ... } :
+
+let
+ node = { config, pkgs, lib, ... } : {
+ networking = {
+ firewall = {
+ allowedUDPPorts = [ 4791 ]; # open RoCE port
+ allowedTCPPorts = [ 4800 ]; # port for test utils
+ };
+ rxe = {
+ enable = true;
+ interfaces = [ "eth1" ];
+ };
+ };
+
+ environment.systemPackages = with pkgs; [ rdma-core screen ];
+ };
+
+in {
+ name = "rxe";
+
+ nodes = {
+ server = node;
+ client = node;
+ };
+
+ testScript = ''
+ # Test if rxe interface comes up
+ $server->waitForUnit("default.target");
+ $server->succeed("systemctl status rxe.service");
+ $server->succeed("ibv_devices | grep rxe0");
+
+ $client->waitForUnit("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");
+
+ $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");
+ '';
+})
+
+
diff --git a/nixos/tests/ssh-keys.nix b/nixos/tests/ssh-keys.nix
new file mode 100644
index 000000000000..07d422196efa
--- /dev/null
+++ b/nixos/tests/ssh-keys.nix
@@ -0,0 +1,15 @@
+pkgs:
+{ snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" ''
+ -----BEGIN EC PRIVATE KEY-----
+ MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49
+ AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN
+ r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA==
+ -----END EC PRIVATE KEY-----
+ '';
+
+ snakeOilPublicKey = pkgs.lib.concatStrings [
+ "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"
+ "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
+ "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil"
+ ];
+}
diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix
new file mode 100644
index 000000000000..a9d7dc61cb60
--- /dev/null
+++ b/nixos/tests/statsd.nix
@@ -0,0 +1,40 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+
+with lib;
+
+{
+ name = "statsd";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ ma27 ];
+ };
+
+ nodes.statsd1 = {
+ services.statsd.enable = true;
+ services.statsd.backends = [ "statsd-influxdb-backend" "console" ];
+ services.statsd.extraConfig = ''
+ influxdb: {
+ username: "root",
+ password: "root",
+ database: "statsd"
+ }
+ '';
+
+ services.influxdb.enable = true;
+
+ systemd.services.influx-init = {
+ description = "Setup Influx Test Base";
+ after = [ "influxdb.service" ];
+ before = [ "statsd.service" ];
+
+ script = ''
+ echo "CREATE DATABASE statsd" | ${pkgs.influxdb}/bin/influx
+ '';
+ };
+ };
+
+ testScript = ''
+ $statsd1->start();
+ $statsd1->waitForUnit("statsd.service");
+ $statsd1->succeed("nc -z 127.0.0.1 8126");
+ '';
+})
diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix
new file mode 100644
index 000000000000..35addb0ee805
--- /dev/null
+++ b/nixos/tests/sudo.nix
@@ -0,0 +1,93 @@
+# Some tests to ensure sudo is working properly.
+
+let
+ password = "helloworld";
+
+in
+ import ./make-test.nix ({ pkgs, ...} : {
+ name = "sudo";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ lschuermann ];
+ };
+
+ machine =
+ { config, lib, pkgs, ... }:
+ with lib;
+ {
+ users.extraGroups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; };
+ users.users = {
+ test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; };
+ test1 = { isNormalUser = true; password = password; };
+ test2 = { isNormalUser = true; extraGroups = [ "foobar" ]; password = password; };
+ test3 = { isNormalUser = true; extraGroups = [ "barfoo" ]; };
+ test4 = { isNormalUser = true; extraGroups = [ "baz" ]; };
+ test5 = { isNormalUser = true; };
+ };
+
+ security.sudo = {
+ enable = true;
+ wheelNeedsPassword = false;
+
+ extraRules = [
+ # SUDOERS SYNTAX CHECK (Test whether the module produces a valid output;
+ # errors being detected by the visudo checks.
+
+ # These should not create any entries
+ { users = [ "notest1" ]; commands = [ ]; }
+ { commands = [ { command = "ALL"; options = [ ]; } ]; }
+
+ # Test defining commands with the options syntax, though not setting any options
+ { users = [ "notest2" ]; commands = [ { command = "ALL"; options = [ ]; } ]; }
+
+
+ # CONFIGURATION FOR TEST CASES
+ { users = [ "test1" ]; groups = [ "foobar" ]; commands = [ "ALL" ]; }
+ { groups = [ "barfoo" 1337 ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" "NOSETENV" ]; } ]; }
+ { users = [ "test5" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" "SETENV" ]; } ]; runAs = "test1:barfoo"; }
+ ];
+ };
+ };
+
+ testScript =
+ ''
+ subtest "users in wheel group should have passwordless sudo", sub {
+ $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\"");
+ };
+
+ subtest "test1 user should not be able to use sudo without password", sub {
+ $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");
+ };
+
+ subtest "users in group 'barfoo' should be able to use sudo without password", sub {
+ $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");
+ };
+
+ subtest "test5 user should be able to run commands under test1", sub {
+ $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");
+ };
+
+ subtest "test5 user should be able to keep his environment", sub {
+ $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");
+ };
+ '';
+ })
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
new file mode 100644
index 000000000000..2df6f341c4ef
--- /dev/null
+++ b/nixos/tests/systemd.nix
@@ -0,0 +1,66 @@
+import ./make-test.nix {
+ name = "systemd";
+
+ machine = { lib, ... }: {
+ imports = [ common/user-account.nix common/x11.nix ];
+
+ virtualisation.emptyDiskImages = [ 512 ];
+
+ fileSystems = lib.mkVMOverride {
+ "/test-x-initrd-mount" = {
+ device = "/dev/vdb";
+ fsType = "ext2";
+ autoFormat = true;
+ noCheck = true;
+ options = [ "x-initrd.mount" ];
+ };
+ };
+
+ systemd.extraConfig = "DefaultEnvironment=\"XXX_SYSTEM=foo\"";
+ systemd.user.extraConfig = "DefaultEnvironment=\"XXX_USER=bar\"";
+ services.journald.extraConfig = "Storage=volatile";
+ services.xserver.displayManager.auto.user = "alice";
+
+ systemd.services.testservice1 = {
+ description = "Test Service 1";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig.Type = "oneshot";
+ script = ''
+ if [ "$XXX_SYSTEM" = foo ]; then
+ touch /system_conf_read
+ fi
+ '';
+ };
+
+ systemd.user.services.testservice2 = {
+ description = "Test Service 2";
+ wantedBy = [ "default.target" ];
+ serviceConfig.Type = "oneshot";
+ script = ''
+ if [ "$XXX_USER" = bar ]; then
+ touch "$HOME/user_conf_read"
+ fi
+ '';
+ };
+ };
+
+ testScript = ''
+ $machine->waitForX;
+
+ # Regression test for https://github.com/NixOS/nixpkgs/issues/35415
+ subtest "configuration files are recognized by systemd", sub {
+ $machine->succeed('test -e /system_conf_read');
+ $machine->succeed('test -e /home/alice/user_conf_read');
+ $machine->succeed('test -z $(ls -1 /var/log/journal)');
+ };
+
+ # Regression test for https://github.com/NixOS/nixpkgs/issues/35268
+ subtest "file system with x-initrd.mount is not unmounted", sub {
+ $machine->shutdown;
+ $machine->waitForUnit('multi-user.target');
+ # If the file system was unmounted during the shutdown the file system
+ # has a last mount time, because the file system wasn't checked.
+ $machine->fail('dumpe2fs /dev/vdb | grep -q "^Last mount time: *n/a"');
+ };
+ '';
+}
diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix
new file mode 100644
index 000000000000..515d5c8bac25
--- /dev/null
+++ b/nixos/tests/vault.nix
@@ -0,0 +1,23 @@
+import ./make-test.nix ({ pkgs, ... }:
+{
+ name = "vault";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ lnl7 ];
+ };
+ machine = { config, pkgs, ... }: {
+ environment.systemPackages = [ pkgs.vault ];
+ environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
+ services.vault.enable = true;
+ };
+
+ testScript =
+ ''
+ startAll;
+
+ $machine->waitForUnit('multi-user.target');
+ $machine->waitForUnit('vault.service');
+ $machine->waitForOpenPort(8200);
+ $machine->succeed('vault operator init');
+ $machine->succeed('vault status | grep Sealed | grep true');
+ '';
+})
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index c519d7dae8be..249571fcedec 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -43,6 +43,9 @@ let
"init=${pkgs.writeScript "mini-init.sh" miniInit}"
];
+ # XXX: Remove this once TSS location detection has been fixed in VirtualBox
+ boot.kernelPackages = pkgs.linuxPackages_4_9;
+
fileSystems."/" = {
device = "vboxshare";
fsType = "vboxsf";
@@ -109,9 +112,6 @@ let
} ''
${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
- . /sys/class/block/vda1/uevent
- mknod /dev/vda1 b $MAJOR $MINOR
-
${pkgs.e2fsprogs}/sbin/mkfs.ext4 /dev/vda1
${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
mkdir /mnt
diff --git a/nixos/tests/xautolock.nix b/nixos/tests/xautolock.nix
new file mode 100644
index 000000000000..ee46d9e05b06
--- /dev/null
+++ b/nixos/tests/xautolock.nix
@@ -0,0 +1,24 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+
+with lib;
+
+{
+ name = "xautolock";
+ meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
+
+ nodes.machine = {
+ imports = [ ./common/x11.nix ./common/user-account.nix ];
+
+ services.xserver.displayManager.auto.user = "bob";
+ services.xserver.xautolock.enable = true;
+ services.xserver.xautolock.time = 1;
+ };
+
+ testScript = ''
+ $machine->start;
+ $machine->waitForX;
+ $machine->mustFail("pgrep xlock");
+ $machine->sleep(120);
+ $machine->mustSucceed("pgrep xlock");
+ '';
+})
diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix
new file mode 100644
index 000000000000..40ca91e8064d
--- /dev/null
+++ b/nixos/tests/yabar.nix
@@ -0,0 +1,25 @@
+import ./make-test.nix ({ pkgs, lib }:
+
+with lib;
+
+{
+ name = "yabar";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ ma27 ];
+ };
+
+ nodes.yabar = {
+ imports = [ ./common/x11.nix ./common/user-account.nix ];
+
+ services.xserver.displayManager.auto.user = "bob";
+
+ programs.yabar.enable = true;
+ };
+
+ testScript = ''
+ $yabar->start;
+ $yabar->waitForX;
+
+ $yabar->waitForUnit("yabar.service", "bob");
+ '';
+})
diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix
new file mode 100644
index 000000000000..cfbb1f24b198
--- /dev/null
+++ b/pkgs/applications/altcoins/aeon/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }:
+
+let
+ version = "0.9.14.0";
+in
+stdenv.mkDerivation {
+ name = "aeon-${version}";
+
+ src = fetchFromGitHub {
+ owner = "aeonix";
+ repo = "aeon";
+ rev = "v${version}";
+ sha256 = "0pl9nfhihj0wsdgvvpv5f14k4m2ikk8s3xw6nd8ymbnpxfzyxynr";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ boost miniupnpc openssl unbound ];
+
+ installPhase = ''
+ install -D src/aeond "$out/bin/aeond"
+ install src/simpleminer "$out/bin/aeon-simpleminer"
+ install src/simplewallet "$out/bin/aeon-simplewallet"
+ install src/connectivity_tool "$out/bin/aeon-connectivity-tool"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Private, secure, untraceable currency";
+ homepage = http://www.aeon.cash/;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.aij ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index 011e3cd7c874..219ab5d4f805 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
- version = "0.16.0";
+ version = "0.16.2";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
- sha256 = "0wwcgvd8zgl5qh6z1sa3kdv1lr9cwwbs9j2gaad5mqr9sfwbbxdh";
+ sha256 = "0d5npn4p321jqsbqjxkbv0ncvs2hp9vdp30np6n8n53f896cxl92";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 9a2145d91cfb..31c8ed6fc8d0 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version;
- version = "1.3.6";
+ version = "1.3.8";
src = fetchFromGitHub {
owner = "bitcoinclassic";
repo = "bitcoinclassic";
rev = "v${version}";
- sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07";
+ sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch
new file mode 100644
index 000000000000..1b74a48a84aa
--- /dev/null
+++ b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch
@@ -0,0 +1,38 @@
+--- a/src/txmempool.h
++++ b/src/txmempool.h
+@@ -204,7 +204,7 @@
+ class CompareTxMemPoolEntryByDescendantScore
+ {
+ public:
+- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+ {
+ bool fUseADescendants = UseDescendantScore(a);
+ bool fUseBDescendants = UseDescendantScore(b);
+@@ -226,7 +226,7 @@
+ }
+
+ // Calculate which score to use for an entry (avoiding division).
+- bool UseDescendantScore(const CTxMemPoolEntry &a)
++ bool UseDescendantScore(const CTxMemPoolEntry &a) const
+ {
+ double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants();
+ double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize();
+@@ -241,7 +241,7 @@
+ class CompareTxMemPoolEntryByScore
+ {
+ public:
+- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+ {
+ double f1 = (double)a.GetModifiedFee() * b.GetTxSize();
+ double f2 = (double)b.GetModifiedFee() * a.GetTxSize();
+@@ -255,7 +255,7 @@
+ class CompareTxMemPoolEntryByEntryTime
+ {
+ public:
+- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+ {
+ return a.GetTime() < b.GetTime();
+ }
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index 9eb1e54b9093..d9040377ebe3 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version;
- version = "1.0.2.0";
+ version = "1.0.3.0";
src = fetchFromGitHub {
owner = "bitcoinunlimited";
repo = "bitcoinunlimited";
rev = "v${version}";
- sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q";
+ sha256 = "0l02a7h502msrp4c02wgm7f3159ap8l61k4890vas99gq7ywxkcx";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
@@ -21,8 +21,13 @@ stdenv.mkDerivation rec {
miniupnpc utillinux protobuf libevent ]
++ optionals withGui [ qt4 qrencode ];
+ patches = [
+ ./bitcoin-unlimited-const-comparators.patch
+ ];
+
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];
+ enableParallelBuilding = true;
meta = {
description = "Peer-to-peer electronic cash system (Unlimited client)";
diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index 388676198044..ccc55d17bcf6 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version;
- version = "0.11G2";
+ version = "0.11H";
src = fetchFromGitHub {
owner = "bitcoinxt";
repo = "bitcoinxt";
rev = "v${version}";
- sha256 = "071rljvsabyc9j64v248qfb7zfqpfl84hpsnvlavin235zljq8qs";
+ sha256 = "1v43bynmidn2zdpky939km721x3ks91bzyh4200gji61qzsmyg62";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 63c45b3ba07f..0acd616eeaff 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -5,13 +5,13 @@
with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.15.1";
+ version = "0.16.0";
src = fetchurl {
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
- sha256 = "1d22fgwdcn343kd95lh389hj417zwbmnhi29cij8n7wc0nz2vpil";
+ sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec{
homepage = http://www.bitcoin.org/;
maintainers = with maintainers; [ roconnor AndersonTorres ];
license = licenses.mit;
- platforms = platforms.unix;
+ # bitcoin needs hexdump to build, which doesn't seem to build on darwin at the moment.
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix
index 8ade6fb5251f..95e03ee6a213 100644
--- a/pkgs/applications/altcoins/btc1.nix
+++ b/pkgs/applications/altcoins/btc1.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec{
name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "1.14.5";
+ version = "1.15.1";
src = fetchurl {
url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz";
- sha256 = "1az6bbblh3adgcs16r9cjz8jacg6sbwfpg8zzfzkbp9h9j85ass5";
+ sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix
index 0136ab18ceac..01c47b320de5 100644
--- a/pkgs/applications/altcoins/cryptop/default.nix
+++ b/pkgs/applications/altcoins/cryptop/default.nix
@@ -1,16 +1,15 @@
-{ lib, python2}:
+{ lib, buildPythonApplication, fetchPypi, requests, requests-cache }:
-python2.pkgs.buildPythonApplication rec {
+buildPythonApplication rec {
pname = "cryptop";
- version = "0.1.0";
- name = "${pname}-${version}";
+ version = "0.2.0";
- src = python2.pkgs.fetchPypi {
+ src = fetchPypi {
inherit pname version;
- sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh";
+ sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb";
};
- propagatedBuildInputs = [ python2.pkgs.requests ];
+ propagatedBuildInputs = [ requests requests-cache ];
# No tests in archive
doCheck = false;
diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix
index ff0f2407cfec..b2f2a457a99d 100644
--- a/pkgs/applications/altcoins/dashpay.nix
+++ b/pkgs/applications/altcoins/dashpay.nix
@@ -2,26 +2,26 @@
, openssl, db48, boost, zlib, miniupnpc
, qrencode, glib, protobuf, yasm, libevent
, utillinux
-, enable_Upnp ? false
+, enable_Upnp ? false
, disable_Wallet ? false
, disable_Daemon ? false }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "dashpay-${version}";
- version = "0.12.1.3";
+ version = "0.12.2.3";
src = fetchFromGitHub {
owner = "dashpay";
repo= "dash";
rev = "v${version}";
- sha256 = "0h0fxhh30wy5vp06l1mkswhz565qs6j9y0dm84fmn28rdfvhv2aj";
+ sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ glib openssl db48 yasm boost zlib libevent
+ buildInputs = [ glib openssl db48 yasm boost zlib libevent
miniupnpc protobuf qrencode utillinux ];
-
+
configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ]
++ optional enable_Upnp "--enable-upnp-default"
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
with instant transactions. It allows you to keep your finances
private as you make transactions without waits, similar to cash.
'';
- homepage = http://dashpay.io;
+ homepage = https://www.dash.org;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/altcoins/dcrd.nix
new file mode 100644
index 000000000000..8a8c4a7f1021
--- /dev/null
+++ b/pkgs/applications/altcoins/dcrd.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }:
+
+buildGoPackage rec {
+ name = "dcrd-${version}";
+ version = "1.1.2";
+ rev = "refs/tags/v${version}";
+ goPackagePath = "github.com/decred/dcrd";
+
+ buildInputs = [ go git dep cacert ];
+
+ GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+ NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+ src = fetchgit {
+ inherit rev;
+ url = "https://${goPackagePath}";
+ sha256 = "0xcynipdn9zmmralxj0hjrwyanvhkwfj2b1vvjk5zfc95s2xc1q9";
+ };
+
+ preBuild = ''
+ export CWD=$(pwd)
+ cd go/src/github.com/decred/dcrd
+ dep ensure
+ go install . ./cmd/...
+ cd $CWD
+ '';
+
+ meta = {
+ homepage = "https://decred.org";
+ description = "Decred daemon in Go (golang)";
+ license = with lib.licenses; [ isc ];
+ };
+}
diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/altcoins/dcrwallet.nix
new file mode 100644
index 000000000000..aa6e8a0315e7
--- /dev/null
+++ b/pkgs/applications/altcoins/dcrwallet.nix
@@ -0,0 +1,42 @@
+{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }:
+
+buildGoPackage rec {
+ name = "dcrwallet-${version}";
+ version = "1.1.2";
+ rev = "refs/tags/v${version}";
+ goPackagePath = "github.com/decred/dcrwallet";
+
+ buildInputs = [ go git dep cacert ];
+
+ GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+ NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+ src = fetchgit {
+ inherit rev;
+ url = "https://${goPackagePath}";
+ sha256 = "058im4vmcmxcl5ir14h17wik5lagp2ay0p8qc3r99qmpfwvvz39x";
+ };
+
+ preBuild = ''
+ export CWD=$(pwd)
+ cd go/src/github.com/decred/dcrwallet
+ dep ensure
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+ go build
+ '';
+
+ installPhase = ''
+ mkdir -pv $bin/bin
+ cp -v dcrwallet $bin/bin
+ '';
+
+
+ meta = {
+ homepage = "https://decred.org";
+ description = "Decred daemon in Go (golang)";
+ license = with lib.licenses; [ isc ];
+ };
+}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index bccb6a34e8e3..d7cce586b9b7 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,29 +1,40 @@
-{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2 }:
+{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
rec {
+ aeon = callPackage ./aeon { };
+
bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
- bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; };
- bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; };
+ bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; };
+ bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; };
bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; };
bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; };
- bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; };
- bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
+ bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; };
+ bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; };
- bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; };
- bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
+ bitcoin-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; };
+ bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; };
- btc1 = callPackage ./btc1.nix { withGui = true; };
- btc1d = callPackage ./btc1.nix { withGui = false; };
+ btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; };
+ btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; };
+
+ cryptop = python3.pkgs.callPackage ./cryptop { };
dashpay = callPackage ./dashpay.nix { };
- dogecoin = callPackage ./dogecoin.nix { withGui = true; };
- dogecoind = callPackage ./dogecoin.nix { withGui = false; };
+ dcrd = callPackage ./dcrd.nix { };
+ dcrwallet = callPackage ./dcrwallet.nix { };
+
+ dero = callPackage ./dero.nix { };
+
+ dogecoin = callPackage ./dogecoin.nix { boost = boost165; withGui = true; };
+ dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; };
+
+ ethsign = callPackage ./ethsign { };
freicoin = callPackage ./freicoin.nix { boost = boost155; };
go-ethereum = callPackage ./go-ethereum.nix {
@@ -32,14 +43,13 @@ rec {
};
go-ethereum-classic = callPackage ./go-ethereum-classic { };
- hivemind = callPackage ./hivemind.nix { withGui = true; };
- hivemindd = callPackage ./hivemind.nix { withGui = false; };
-
litecoin = callPackage ./litecoin.nix { withGui = true; };
litecoind = callPackage ./litecoin.nix { withGui = false; };
- memorycoin = callPackage ./memorycoin.nix { withGui = true; };
- memorycoind = callPackage ./memorycoin.nix { withGui = false; };
+ masari = callPackage ./masari.nix { };
+
+ memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; };
+ memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; };
namecoin = callPackage ./namecoin.nix { withGui = true; };
namecoind = callPackage ./namecoin.nix { withGui = false; };
@@ -51,13 +61,15 @@ rec {
hevm = (haskellPackages.callPackage ./hevm.nix {});
- primecoin = callPackage ./primecoin.nix { withGui = true; };
- primecoind = callPackage ./primecoin.nix { withGui = false; };
-
stellar-core = callPackage ./stellar-core.nix { };
+ sumokoin = callPackage ./sumokoin.nix { };
+
zcash = callPackage ./zcash {
withGui = false;
openssl = openssl_1_1_0;
};
+
+ parity = callPackage ./parity { };
+ parity-beta = callPackage ./parity/beta.nix { };
}
diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix
new file mode 100644
index 000000000000..dff7bc0b0dc4
--- /dev/null
+++ b/pkgs/applications/altcoins/dero.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost
+, libunwind, lmdb, miniupnpc, readline }:
+
+stdenv.mkDerivation rec {
+ name = "dero-${version}";
+ version = "0.11.6";
+
+ src = fetchFromGitHub {
+ owner = "deroproject";
+ repo = "dero";
+ rev = "v${version}";
+ sha256 = "0jc5rh2ra4wra04dwv9sydid5ij5930s38mhzq3qkdjyza1ahmsr";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "Secure, private blockchain with smart contracts based on Monero";
+ homepage = "https://dero.io/";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fpletz ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix
index e8fb1c49828e..81b4cb52948f 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/pkgs/applications/altcoins/ethabi.nix
@@ -4,16 +4,16 @@ with rustPlatform;
buildRustPackage rec {
name = "ethabi-${version}";
- version = "1.0.4";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "paritytech";
repo = "ethabi";
- rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f";
- sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd";
+ rev = "v${version}";
+ sha256 = "0kxflixmgycdh7sv73zf2mrkbcfzzw7f5sjbsjks9crc9cvjqi6p";
};
- cargoSha256 = "0i9617qwc6d4jvlbydwk03rcsnyvxzpbn2ms10ds4r6x7jy2a4sy";
+ cargoSha256 = "18rigpsmfiv6im2sspnxadgqrlfdp9dd75ji8s56ksc9g7hrc3wz";
cargoBuildFlags = ["--features cli"];
diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix
new file mode 100644
index 000000000000..b7d14a43921b
--- /dev/null
+++ b/pkgs/applications/altcoins/ethsign/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit, clang }:
+
+buildGoPackage rec {
+ name = "ethsign-${version}";
+ version = "0.8.2";
+
+ goPackagePath = "github.com/dapphub/ethsign";
+ hardeningDisable = ["fortify"];
+
+ src = fetchFromGitHub {
+ owner = "dapphub";
+ repo = "ethsign";
+ rev = "v${version}";
+ sha256 = "1gd0bq5x49sjm83r2wivjf03dxvhdli6cvwb9b853wwcvy4inmmh";
+ };
+
+ extraSrcs = [
+ {
+ goPackagePath = "github.com/ethereum/go-ethereum";
+ src = fetchFromGitHub {
+ owner = "ethereum";
+ repo = "go-ethereum";
+ rev = "v1.7.3";
+ sha256 = "1w6rbq2qpjyf2v9mr18yiv2af1h2sgyvgrdk4bd8ixgl3qcd5b11";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/urfave/cli.v1";
+ src = fetchFromGitHub {
+ owner = "urfave";
+ repo = "cli";
+ rev = "v1.19.1";
+ sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ src = fetchgit {
+ url = "https://go.googlesource.com/crypto";
+ rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122";
+ sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ src = fetchgit {
+ url = "https://go.googlesource.com/sys";
+ rev = "53aa286056ef226755cd898109dbcdaba8ac0b81";
+ sha256 = "1yd17ccklby099cpdcsgx6lf0lj968hsnppp16mwh9009ldf72r1";
+ };
+ }
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = http://github.com/dapphub/ethsign;
+ description = "Make raw signed Ethereum transactions";
+ license = [licenses.gpl3];
+ };
+}
diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix
index a44dbbd62ce6..b753e2d48c97 100644
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/pkgs/applications/altcoins/freicoin.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "freicoin";
repo = "freicoin";
rev = "v${version}";
- sha256 = "1m5pcnfhwhcj7q00p2sy3h73rkdm3w6grmljgiq53gshcj08cq1z";
+ sha256 = "1v1qwv4x5agjba82s1vknmdgq67y26wzdwbmwwqavv7f7y3y860h";
};
qmakeFlags = ["USE_UPNP=-"];
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 04e68b1f1282..84e0a32e7b2e 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "go-ethereum-${version}";
- version = "1.7.2";
+ version = "1.8.2";
goPackagePath = "github.com/ethereum/go-ethereum";
# Fix for usb-related segmentation faults on darwin
@@ -12,11 +12,22 @@ buildGoPackage rec {
# Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
hardeningDisable = [ "fortify" ];
+ # Only install binaries in $out, source is not interesting and takes ~50M
+ outputs = [ "out" ];
+ preFixup = ''
+ export bin="''${out}"
+ '';
+ installPhase = ''
+ mkdir -p $out/bin $out
+ dir="$NIX_BUILD_TOP/go/bin"
+ [ -e "$dir" ] && cp -r $dir $out
+ '';
+
src = fetchFromGitHub {
owner = "ethereum";
repo = "go-ethereum";
rev = "v${version}";
- sha256 = "11n77zlf8qixhx26sqf33v911716msi6h0z4ng8gxhzhznrn2nrd";
+ sha256 = "19ryfy9dsmgk3kimkmq2hif1di4binqg9718xrmirf063rajk02a";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/altcoins/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix
deleted file mode 100644
index 208a2d3915f0..000000000000
--- a/pkgs/applications/altcoins/hivemind.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
-, withGui }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "hivemind" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "unstable";
-
- src = fetchFromGitHub {
- owner = "bitcoin-hivemind";
- repo = "hivemind";
- rev = "147973cfe76867410578d91d6f0a8df105cab4e0";
- sha256 = "1ndqqma1b0sh2gn7cl8d9fg44q0g2g42jr2y0nifkjgfjn3c7l5h";
- };
-
- nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ openssl db48 boost zlib
- miniupnpc protobuf libevent]
- ++ optionals stdenv.isLinux [ utillinux ]
- ++ optionals withGui [ qt4 qrencode ];
-
- configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
- "--with-incompatible-bdb"
- ] ++ optionals withGui [ "--with-gui=qt4" ];
-
- meta = {
- description = "Peer-to-Peer oracle protocol";
- longDescription= ''
- Hivemind is a Peer-to-Peer Oracle Protocol which absorbs accurate data
- into a blockchain so that Bitcoin-users can speculate in Prediction
- Markets.
- '';
- homepage = https://bitcoinhivemind.com;
- maintainers = with maintainers; [ canndrew ];
- license = licenses.mit;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index ac42caa80999..12cf5dcb71c1 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.14.2";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "litecoin-project";
repo = "litecoin";
rev = "v${version}";
- sha256 = "1smadd5d2mpz2v3pyk7wqm60vdp81zqr4m3z4wfvnlz62m1m800y";
+ sha256 = "01q0lj0grabyfh67ar984m9lv9xs0rakadkci8jpfbp8xw166r40";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/altcoins/masari.nix
new file mode 100644
index 000000000000..02a6d25df516
--- /dev/null
+++ b/pkgs/applications/altcoins/masari.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost
+, lmdb, miniupnpc, readline }:
+
+stdenv.mkDerivation rec {
+ name = "masari-${version}";
+ version = "0.1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "masari-project";
+ repo = "masari";
+ rev = "v${version}";
+ sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol";
+ homepage = "https://www.getmasari.org/";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fpletz ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix
index 24b891d60eb2..b9335dbabe52 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/pkgs/applications/altcoins/memorycoin.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec{
then "install -D bitcoin-qt $out/bin/memorycoin-qt"
else "install -D bitcoind $out/bin/memorycoind";
+ # `make build/version.o`:
+ # make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop.
+ enableParallelBuilding = false;
+
meta = {
description = "Peer-to-peer, CPU-based electronic cash system";
longDescription= ''
@@ -47,6 +51,6 @@ stdenv.mkDerivation rec{
homepage = http://www.bitcoin.org/;
maintainers = with maintainers; [ AndersonTorres ];
license = licenses.mit;
- platforms = platforms.unix;
+ platforms = subtractLists [ "aarch64-linux" ] platforms.unix;
};
}
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
new file mode 100644
index 000000000000..0d2899b2e649
--- /dev/null
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, fetchFromGitHub
+, makeWrapper, makeDesktopItem
+, qtbase, qmake, qtmultimedia, qttools
+, qtgraphicaleffects, qtdeclarative
+, qtlocation, qtquickcontrols, qtwebchannel
+, qtwebengine, qtx11extras, qtxmlpatterns
+, monero, unbound, readline, boost, libunwind
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "monero-gui-${version}";
+ version = "0.11.1.0";
+
+ src = fetchFromGitHub {
+ owner = "monero-project";
+ repo = "monero-gui";
+ rev = "v${version}";
+ sha256 = "01d7apwrv8j8bh7plvvhlnll3ransaha3n6rx19nkgvfn319hswq";
+ };
+
+ nativeBuildInputs = [ qmake ];
+
+ buildInputs = [
+ qtbase qtmultimedia qtgraphicaleffects
+ qtdeclarative qtlocation qtquickcontrols
+ qtwebchannel qtwebengine qtx11extras
+ qtxmlpatterns monero unbound readline
+ boost libunwind makeWrapper
+ ];
+
+ patches = [
+ ./move-log-file.patch
+ ./move-translations-dir.patch
+ ];
+
+ postPatch = ''
+ echo '
+ var GUI_VERSION = "${version}";
+ var GUI_MONERO_VERSION = "${getVersion monero}";
+ ' > version.js
+ substituteInPlace monero-wallet-gui.pro \
+ --replace '$$[QT_INSTALL_BINS]/lrelease' '${getDev qttools}/bin/lrelease'
+ substituteInPlace src/daemon/DaemonManager.cpp \
+ --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin'
+ '';
+
+ makeFlags = [ "INSTALL_ROOT=$(out)" ];
+
+ preBuild = ''
+ sed -i s#/opt/monero-wallet-gui##g Makefile
+ make -C src/zxcvbn-c
+ '';
+
+ desktopItem = makeDesktopItem {
+ name = "monero-wallet-gui";
+ exec = "monero-wallet-gui";
+ icon = "monero";
+ desktopName = "Monero Wallet";
+ genericName = "Wallet";
+ categories = "Application;Network;Utility;";
+ };
+
+ postInstall = ''
+ # install desktop entry
+ mkdir -p $out/share/applications
+ cp ${desktopItem}/share/applications/* $out/share/applications
+
+ # install translations
+ cp -r release/bin/translations $out/share/
+
+ # install icons
+ for n in 16 24 32 48 64 96 128 256; do
+ size=$n"x"$n
+ mkdir -p $out/share/icons/hicolor/$size/apps
+ cp $src/images/appicons/$size.png \
+ $out/share/icons/hicolor/$size/apps/monero.png
+ done;
+ '';
+
+ meta = {
+ description = "Private, secure, untraceable currency";
+ homepage = https://getmonero.org/;
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ rnhmjoj ];
+ };
+}
diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
new file mode 100644
index 000000000000..928fb32911f5
--- /dev/null
+++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
@@ -0,0 +1,42 @@
+diff --git a/main.cpp b/main.cpp
+index 1a9a979..2316929 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -74,10 +74,6 @@ int main(int argc, char *argv[])
+ // qDebug() << "High DPI auto scaling - enabled";
+ //#endif
+
+- // Log settings
+- Monero::Wallet::init(argv[0], "monero-wallet-gui");
+-// qInstallMessageHandler(messageHandler);
+-
+ MainApp app(argc, argv);
+
+ qDebug() << "app startd";
+@@ -86,6 +82,13 @@ int main(int argc, char *argv[])
+ app.setOrganizationDomain("getmonero.org");
+ app.setOrganizationName("monero-project");
+
++ // Log settings
++ QString logfile =
++ QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
++ + "/monero-wallet-gui.log";
++ Monero::Wallet::init(argv[0], logfile.toUtf8().constData());
++
++
+ filter *eventFilter = new filter;
+ app.installEventFilter(eventFilter);
+
+diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
+index 8525bf3..6967b24 100644
+--- a/src/libwalletqt/Wallet.cpp
++++ b/src/libwalletqt/Wallet.cpp
+@@ -613,7 +613,7 @@ QString Wallet::getDaemonLogPath() const
+
+ QString Wallet::getWalletLogPath() const
+ {
+- return QCoreApplication::applicationDirPath() + "/monero-wallet-gui.log";
++ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/monero-wallet-gui.log";
+ }
+
+ Wallet::Wallet(Monero::Wallet *w, QObject *parent)
diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
new file mode 100644
index 000000000000..29bb56301547
--- /dev/null
+++ b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
@@ -0,0 +1,14 @@
+diff --git a/TranslationManager.cpp b/TranslationManager.cpp
+index fa39d35..5a410f7 100644
+--- a/TranslationManager.cpp
++++ b/TranslationManager.cpp
+@@ -29,7 +29,7 @@ bool TranslationManager::setLanguage(const QString &language)
+ #ifdef Q_OS_MACX
+ QString dir = qApp->applicationDirPath() + "/../Resources/translations";
+ #else
+- QString dir = qApp->applicationDirPath() + "/translations";
++ QString dir = qApp->applicationDirPath() + "/../share/translations";
+ #endif
+
+ QString filename = "monero-core_" + language;
+
diff --git a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch
new file mode 100644
index 000000000000..5436332db802
--- /dev/null
+++ b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch
@@ -0,0 +1,78 @@
+diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
+index 63908005..f6656d5c 100644
+--- a/src/wallet/CMakeLists.txt
++++ b/src/wallet/CMakeLists.txt
+@@ -86,43 +86,40 @@ target_link_libraries(wallet
+ ${EXTRA_LIBRARIES})
+ add_dependencies(wallet version)
+
+-if (NOT BUILD_GUI_DEPS)
+- set(wallet_rpc_sources
+- wallet_rpc_server.cpp)
++set(wallet_rpc_sources
++ wallet_rpc_server.cpp)
+
+- set(wallet_rpc_headers)
++set(wallet_rpc_headers)
+
+- set(wallet_rpc_private_headers
+- wallet_rpc_server.h)
++set(wallet_rpc_private_headers
++ wallet_rpc_server.h)
+
+- monero_private_headers(wallet_rpc_server
+- ${wallet_rpc_private_headers})
+- monero_add_executable(wallet_rpc_server
+- ${wallet_rpc_sources}
+- ${wallet_rpc_headers}
+- ${wallet_rpc_private_headers})
+-
+- target_link_libraries(wallet_rpc_server
+- PRIVATE
+- wallet
+- epee
+- rpc
+- cryptonote_core
+- cncrypto
+- common
+- ${Boost_CHRONO_LIBRARY}
+- ${Boost_PROGRAM_OPTIONS_LIBRARY}
+- ${Boost_FILESYSTEM_LIBRARY}
+- ${Boost_THREAD_LIBRARY}
+- ${CMAKE_THREAD_LIBS_INIT}
+- ${EXTRA_LIBRARIES})
+- add_dependencies(wallet_rpc_server version)
+- set_property(TARGET wallet_rpc_server
+- PROPERTY
+- OUTPUT_NAME "monero-wallet-rpc")
+- install(TARGETS wallet_rpc_server DESTINATION bin)
+-endif()
++monero_private_headers(wallet_rpc_server
++ ${wallet_rpc_private_headers})
++monero_add_executable(wallet_rpc_server
++ ${wallet_rpc_sources}
++ ${wallet_rpc_headers}
++ ${wallet_rpc_private_headers})
+
++target_link_libraries(wallet_rpc_server
++ PRIVATE
++ wallet
++ epee
++ rpc
++ cryptonote_core
++ cncrypto
++ common
++ ${Boost_CHRONO_LIBRARY}
++ ${Boost_PROGRAM_OPTIONS_LIBRARY}
++ ${Boost_FILESYSTEM_LIBRARY}
++ ${Boost_THREAD_LIBRARY}
++ ${CMAKE_THREAD_LIBS_INIT}
++ ${EXTRA_LIBRARIES})
++add_dependencies(wallet_rpc_server version)
++set_property(TARGET wallet_rpc_server
++ PROPERTY
++ OUTPUT_NAME "monero-wallet-rpc")
++install(TARGETS wallet_rpc_server DESTINATION bin)
+
+ # build and install libwallet_merged only if we building for GUI
+ if (BUILD_GUI_DEPS)
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
new file mode 100644
index 000000000000..57a058bada6b
--- /dev/null
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchpatch, fetchFromGitHub, cmake
+, boost, miniupnpc, openssl, pkgconfig, unbound
+, IOKit
+}:
+
+stdenv.mkDerivation rec {
+ name = "monero-${version}";
+ version = "0.11.1.0";
+
+ src = fetchFromGitHub {
+ owner = "monero-project";
+ repo = "monero";
+ rev = "v${version}";
+ sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ boost miniupnpc openssl unbound ]
+ ++ stdenv.lib.optional stdenv.isDarwin IOKit;
+
+ patches = [
+ ./build-wallet-rpc.patch # fixed in next release
+ ];
+
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=Release"
+ "-DBUILD_GUI_DEPS=ON"
+ ];
+
+ doCheck = false;
+
+ installPhase = ''
+ make install
+ install -Dt "$out/bin/" \
+ bin/monero-blockchain-export \
+ bin/monero-blockchain-import \
+ bin/monero-wallet-rpc
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Private, secure, untraceable currency";
+ homepage = https://getmonero.org/;
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.ehmry ];
+ };
+}
diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix
index 83bead0adac5..f73495811695 100644
--- a/pkgs/applications/altcoins/namecoin.nix
+++ b/pkgs/applications/altcoins/namecoin.nix
@@ -3,14 +3,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "nc0.13.0rc1";
+ version = "nc0.15.99-name-tab-beta2";
name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
src = fetchFromGitHub {
owner = "namecoin";
repo = "namecoin-core";
rev = version;
- sha256 = "17zz0rm3js285w2assxp8blfx830rs0ambcsaqqfli9mnaik3m39";
+ sha256 = "1r0v0yvlazmidxp6xhapbdawqb8fhzrdp11d4an5vgxa208s6wdf";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
new file mode 100644
index 000000000000..ee4203fa88c9
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -0,0 +1,7 @@
+let
+ version = "1.9.4";
+ sha256 = "00b6wsyc2chmdkhfhi9h1i06hpcjj2abcx3qdc6k39clgha0081f";
+ cargoSha256 = "0pyb1mpykdp6i7c30lm5fprrxg3zanak44g28cygzli3l9l3xiy3";
+ patches = [ ./patches/vendored-sources-1.9.patch ];
+in
+ import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
new file mode 100644
index 000000000000..fe2c2c628275
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -0,0 +1,7 @@
+let
+ version = "1.8.11";
+ sha256 = "1vabkglmmbx9jccwsqwvwck1brdjack3sw6iwsxy01wsc2jam56k";
+ cargoSha256 = "1l5hx77glclpwd9i35rr3lxfxshsf1bsxvs2chsp2vwjy06knjmi";
+ patches = [ ./patches/vendored-sources-1.8.patch ];
+in
+ import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix
new file mode 100644
index 000000000000..9c9d1d4293e0
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/parity.nix
@@ -0,0 +1,38 @@
+{ version
+, sha256
+, cargoSha256
+, patches
+}:
+
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, pkgconfig
+, openssl
+, systemd
+}:
+
+rustPlatform.buildRustPackage rec {
+ name = "parity-${version}";
+ inherit cargoSha256 patches;
+
+ src = fetchFromGitHub {
+ owner = "paritytech";
+ repo = "parity";
+ rev = "v${version}";
+ inherit sha256;
+ };
+
+ buildInputs = [ pkgconfig systemd.lib systemd.dev openssl openssl.dev ];
+
+ # Some checks failed
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Fast, light, robust Ethereum implementation";
+ homepage = http://parity.io;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.akru ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch
new file mode 100644
index 000000000000..3239df63de30
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch
@@ -0,0 +1,100 @@
+diff --git a/.cargo/config b/.cargo/config
+new file mode 100644
+index 000000000..8dddda426
+--- /dev/null
++++ b/.cargo/config
+@@ -0,0 +1,94 @@
++[source."https://github.com/alexcrichton/mio-named-pipes"]
++git = "https://github.com/alexcrichton/mio-named-pipes"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/nikvolf/parity-tokio-ipc"]
++git = "https://github.com/nikvolf/parity-tokio-ipc"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/nikvolf/tokio-named-pipes"]
++git = "https://github.com/nikvolf/tokio-named-pipes"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/bn"]
++git = "https://github.com/paritytech/bn"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/hidapi-rs"]
++git = "https://github.com/paritytech/hidapi-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/hyper"]
++git = "https://github.com/paritytech/hyper"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/js-precompiled.git"]
++git = "https://github.com/paritytech/js-precompiled.git"
++branch = "stable"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/jsonrpc.git"]
++git = "https://github.com/paritytech/jsonrpc.git"
++branch = "parity-1.8"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/libusb-rs"]
++git = "https://github.com/paritytech/libusb-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/libusb-sys"]
++git = "https://github.com/paritytech/libusb-sys"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/nanomsg.rs.git"]
++git = "https://github.com/paritytech/nanomsg.rs.git"
++branch = "parity-1.7"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-ctrlc.git"]
++git = "https://github.com/paritytech/rust-ctrlc.git"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-rocksdb"]
++git = "https://github.com/paritytech/rust-rocksdb"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-secp256k1"]
++git = "https://github.com/paritytech/rust-secp256k1"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-snappy"]
++git = "https://github.com/paritytech/rust-snappy"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/trezor-sys"]
++git = "https://github.com/paritytech/trezor-sys"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/wasm-utils"]
++git = "https://github.com/paritytech/wasm-utils"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/tailhook/rotor"]
++git = "https://github.com/tailhook/rotor"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/tomusdrw/ws-rs"]
++git = "https://github.com/tomusdrw/ws-rs"
++branch = "master"
++replace-with = "vendored-sources"
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
new file mode 100644
index 000000000000..d1f6520d706b
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
@@ -0,0 +1,107 @@
+diff --git a/.cargo/config b/.cargo/config
+new file mode 100644
+index 000000000..0efb69724
+--- /dev/null
++++ b/.cargo/config
+@@ -0,0 +1,100 @@
++
++[source."https://github.com/alexcrichton/mio-named-pipes"]
++git = "https://github.com/alexcrichton/mio-named-pipes"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"]
++git = "https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"]
++git = "https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/nikvolf/parity-tokio-ipc"]
++git = "https://github.com/nikvolf/parity-tokio-ipc"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/nikvolf/tokio-named-pipes"]
++git = "https://github.com/nikvolf/tokio-named-pipes"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/bn"]
++git = "https://github.com/paritytech/bn"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/hidapi-rs"]
++git = "https://github.com/paritytech/hidapi-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/hyper"]
++git = "https://github.com/paritytech/hyper"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/jsonrpc.git"]
++git = "https://github.com/paritytech/jsonrpc.git"
++branch = "parity-1.9"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/libusb-rs"]
++git = "https://github.com/paritytech/libusb-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/libusb-sys"]
++git = "https://github.com/paritytech/libusb-sys"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-ctrlc.git"]
++git = "https://github.com/paritytech/rust-ctrlc.git"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-rocksdb"]
++git = "https://github.com/paritytech/rust-rocksdb"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-secp256k1"]
++git = "https://github.com/paritytech/rust-secp256k1"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-snappy"]
++git = "https://github.com/paritytech/rust-snappy"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/trezor-sys"]
++git = "https://github.com/paritytech/trezor-sys"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/wasm-utils"]
++git = "https://github.com/paritytech/wasm-utils"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/pepyakin/wasmi"]
++git = "https://github.com/pepyakin/wasmi"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/tailhook/rotor"]
++git = "https://github.com/tailhook/rotor"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/tomusdrw/ws-rs"]
++git = "https://github.com/tomusdrw/ws-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix
deleted file mode 100644
index b1e3dc2dd93d..000000000000
--- a/pkgs/applications/altcoins/primecoin.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, openssl, db48, boost
-, zlib, qt4, qmake4Hook, utillinux, protobuf, qrencode
-, withGui }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec{
-
- name = "primecoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.8.6";
-
- src = fetchurl {
- url = "https://github.com/primecoin/primecoin/archive/v${version}.tar.gz";
- sha256 = "0cixnkici74204s9d5iqj5sccib5a8dig2p2fp1axdjifpg787i3";
- };
-
- qmakeFlags = ["USE_UPNP=-"];
- makeFlags = ["USE_UPNP=-"];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ openssl db48 boost zlib utillinux protobuf ]
- ++ optionals withGui [ qt4 qmake4Hook qrencode ];
-
- configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
- ++ optionals withGui [ "--with-gui=qt4" ];
-
- preBuild = "unset AR;"
- + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile"));
-
- installPhase =
- if withGui
- then "install -D bitcoin-qt $out/bin/primecoin-qt"
- else "install -D bitcoind $out/bin/primecoind";
-
- meta = {
- description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers";
- longDescription= ''
- Primecoin is an innovative cryptocurrency, a form of digital
- currency secured by cryptography and issued through a
- decentralized mining market. Derived from Satoshi Nakamoto's
- Bitcoin, Primecoin introduces an unique form of proof-of-work
- based on prime numbers.
-
- The innovative prime proof-of-work in Primecoin not only
- provides security and minting to the network, but also generates
- a special form of prime number chains of interest to mathematical
- research. Thus primecoin network is energy-multiuse, compared to
- bitcoin.
- '';
- homepage = http://primecoin.io/;
- maintainers = with maintainers; [ AndersonTorres ];
- license = licenses.mit;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix
index b2f5cfdea067..334ec9277e1b 100644
--- a/pkgs/applications/altcoins/seth.nix
+++ b/pkgs/applications/altcoins/seth.nix
@@ -1,22 +1,24 @@
{ stdenv, makeWrapper, lib, fetchFromGitHub
-, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which }:
+, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which
+, nodejs, ethsign
+}:
stdenv.mkDerivation rec {
name = "seth-${version}";
- version = "0.5.6";
+ version = "0.6.3";
src = fetchFromGitHub {
owner = "dapphub";
repo = "seth";
rev = "v${version}";
- sha256 = "1zl70xy7njjwy4k4g84v7lpf9a2nnnbxh4mkpw7jzqfs2mr636z6";
+ sha256 = "0la2nfqsscpbq6zwa6hsd73nimdnrhilrmgyy77yr3jca2wjhsjk";
};
nativeBuildInputs = [makeWrapper];
buildPhase = "true";
makeFlags = ["prefix=$(out)"];
postInstall = let path = lib.makeBinPath [
- bc coreutils curl ethabi git gnused jshon perl solc which
+ bc coreutils curl ethabi git gnused jshon perl solc which nodejs ethsign
]; in ''
wrapProgram "$out/bin/seth" --prefix PATH : "${path}"
'';
diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/altcoins/sumokoin.nix
new file mode 100644
index 000000000000..026008b2761a
--- /dev/null
+++ b/pkgs/applications/altcoins/sumokoin.nix
@@ -0,0 +1,35 @@
+{ lib, stdenv, fetchFromGitHub, cmake, unbound, openssl, boost
+, libunwind, lmdb, miniupnpc }:
+
+stdenv.mkDerivation rec {
+ name = "sumokoin-${version}";
+ version = "0.2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "sumoprojects";
+ repo = "sumokoin";
+ rev = "v${version}";
+ sha256 = "0ndgcawhxh3qb3llrrilrwzhs36qpxv7f53rxgcansbff9b3za6n";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ unbound openssl boost libunwind lmdb miniupnpc ];
+
+ postPatch = ''
+ substituteInPlace src/blockchain_db/lmdb/db_lmdb.cpp --replace mdb_size_t size_t
+ '';
+
+ cmakeFlags = [
+ "-DLMDB_INCLUDE=${lmdb}/include"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "Sumokoin is a fork of Monero and a truely fungible cryptocurrency";
+ homepage = "https://www.sumokoin.org/";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fpletz ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix
index aa912f04efb5..6a8fba3c2bb7 100644
--- a/pkgs/applications/altcoins/zcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/default.nix
@@ -2,36 +2,35 @@
, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
, withGui }:
-let libsnark = callPackage ./libsnark { inherit boost openssl; };
- librustzcash = callPackage ./librustzcash {};
+let librustzcash = callPackage ./librustzcash {};
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "1.0.12";
+ version = "1.0.13";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "v${version}";
- sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s";
+ sha256 = "05y7wxs66anxr5akbf05r36mmjfzqpwawn6vyh3jhpva51hzzzyz";
};
- enableParallelBuilding = true;
+ # 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 libsnark openssl wget db62 boost zlib
+ buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib
protobuf libevent libsodium librustzcash ]
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qt4 qrencode ];
- configureFlags = [ "LIBSNARK_INCDIR=${libsnark}/include/libsnark"
- "--with-boost-libdir=${boost.out}/lib"
+ configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
] ++ optionals withGui [ "--with-gui=qt4" ];
patchPhase = ''
- sed -i"" '/^\[LIBSNARK_INCDIR/d' configure.ac
sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac
sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am
'';
@@ -45,6 +44,6 @@ stdenv.mkDerivation rec {
homepage = https://z.cash/;
maintainers = with maintainers; [ rht ];
license = licenses.mit;
- platforms = platforms.unix;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix
deleted file mode 100644
index 303b3bc171ef..000000000000
--- a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, xbyak, gmp, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- name = "ate-pairing-unstable-${version}";
- version = "2016-05-03";
-
- src = fetchFromGitHub {
- owner = "herumi";
- repo = "ate-pairing";
- rev = "dcb9da999b1113f90b115bccb6f4b57ddf3a8452";
- sha256 = "0jr6r1cma414k8mhsyp7n8hqaqxi7zklsp6820a095sbb3zajckh";
- };
-
- buildInputs = [ gmp xbyak ];
-
- installPhase = ''
- mkdir -p $out
- cp -r lib $out
- cp -r include $out
- '';
-
- meta = with stdenv.lib; {
- description = "Optimal Ate Pairing over Barreto-Naehrig Curves";
- homepage = https://github.com/herumi/ate-pairing;
- maintainers = with maintainers; [ rht ];
- license = licenses.bsd3;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/altcoins/zcash/libsnark/default.nix b/pkgs/applications/altcoins/zcash/libsnark/default.nix
deleted file mode 100644
index be885493dcda..000000000000
--- a/pkgs/applications/altcoins/zcash/libsnark/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, libsodium, callPackage, boost, zlib, openssl, gmp, procps, fetchFromGitHub }:
-
-let atePairing = callPackage ./ate-pairing.nix { inherit xbyak; };
- mie = callPackage ./mie.nix { };
- xbyak = callPackage ./xbyak.nix {};
-in
-stdenv.mkDerivation rec{
- name = "libsnark-unstable-${version}";
- version = "2017-02-09";
-
- src = fetchFromGitHub {
- owner = "zcash";
- repo = "libsnark";
- rev = "9ada3f84ab484c57b2247c2f41091fd6a0916573";
- sha256 = "0vhslcb9rwqab9szavyn856z4h9w1syiamfcixqmj0s908zzlaaq";
- };
-
- buildInputs = [ libsodium atePairing mie xbyak zlib openssl boost gmp ];
-
- makeFlags = [
- "PREFIX=$(out)"
- "CURVE=ALT_BN128"
- "NO_SUPERCOP=1"
- "STATIC=1"
- ];
-
- buildPhase = ''
- CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" \
- make lib \
- CURVE=ALT_BN128 \
- MULTICORE=1 \
- STATIC=1 \
- NO_PROCPS=1 \
- NO_GTEST=1 \
- FEATUREFLAGS=-DMONTGOMERY_OUTPUT \
- '';
-
- meta = with stdenv.lib; {
- description = "a C++ library for zkSNARK proofs";
- homepage = https://github.com/zcash/libsnark;
- maintainers = with maintainers; [ rht ];
- license = licenses.mit;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/altcoins/zcash/libsnark/mie.nix b/pkgs/applications/altcoins/zcash/libsnark/mie.nix
deleted file mode 100644
index a66ff128293e..000000000000
--- a/pkgs/applications/altcoins/zcash/libsnark/mie.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- name = "mie-unstable-${version}";
- version = "2016-05-10";
-
- src = fetchFromGitHub {
- owner = "herumi";
- repo = "mie";
- rev = "704b625b7770a8e1eab26ac65d1fed14c2fcf090";
- sha256 = "144bpmgfs2m4qqv7a2mccgi1aq5jmlr25gnk78ryq09z8cyv88y2";
- };
-
- phases = ["unpackPhase" "installPhase"];
-
- installPhase = ''
- mkdir -p $out
- cp -r include $out
- '';
-
- meta = with stdenv.lib; {
- homepage = https://github.com/herumi/mie;
- maintainers = with maintainers; [ rht ];
- license = licenses.bsd3;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
deleted file mode 100644
index 88d432fd1637..000000000000
--- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- name = "xbyak-unstable-${version}";
- version = "2016-05-03";
-
- src = fetchFromGitHub {
- owner = "herumi";
- repo = "xbyak";
- rev = "b6133a02dd6b7116bea31d0e6b7142bf97f071aa";
- sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn";
- };
-
- dontBuild = true;
-
- installPhase = ''
- mkdir -p $out/include
- cp -r xbyak $out/include
- '';
-
- meta = with stdenv.lib; {
- description = "JIT assembler for x86, x64";
- homepage = https://github.com/herumi/xbyak;
- maintainers = with maintainers; [ rht ];
- license = licenses.bsd3;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index 224ae9f6f6f8..dfa27aa9f2eb 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }:
stdenv.mkDerivation rec {
- version = "15.12";
+ version = "16.06";
name = "mma-${version}";
src = fetchurl {
url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
- sha256 = "0k37kcrfaxmwjb8xb1cbqinrkx3g50dbvwqbvwl3l762j4vr8jgx";
+ sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww";
};
buildInputs = [ makeWrapper python alsaUtils timidity ];
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index ad12609429f5..d09a10a15b2c 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -28,6 +28,6 @@ in stdenv.mkDerivation rec {
description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
- platforms = platforms.linux;
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix
index a22866dc031a..32ae107ed9cb 100644
--- a/pkgs/applications/audio/aacgain/default.nix
+++ b/pkgs/applications/audio/aacgain/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation {
name = "aacgain-1.9.0";
@@ -12,7 +12,19 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
+ postPatch = ''
+ (
+ cd mp4v2
+ patch -p0 < ${fetchpatch {
+ name = "fix_missing_ptr_deref.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_missing_ptr_deref.patch?h=aacgain-cvs&id=e1a19c920f57063e64bab75cb0d8624731f6e3d7";
+ sha256 = "1cq7r005nvmwdjb25z80grcam7jv6k57jnl2bh349mg3ajmslbq9";
+ }}
+ )
+ '';
+
configurePhase = ''
+ runHook preConfigure
cd mp4v2
./configure
@@ -21,9 +33,11 @@ stdenv.mkDerivation {
cd ..
./configure
+ runHook postConfigure
'';
buildPhase = ''
+ runHook preBuild
cd mp4v2
make libmp4v2.la
@@ -32,18 +46,18 @@ stdenv.mkDerivation {
cd ..
make
+ runHook postBuild
'';
installPhase = ''
- strip -s aacgain/aacgain
- install -vD aacgain/aacgain "$out/bin/aacgain"
+ install -D aacgain/aacgain "$out/bin/aacgain"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "ReplayGain for AAC files";
homepage = https://github.com/mulx/aacgain;
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.robbinch ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.robbinch ];
};
}
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index a23af5b5caf8..b74d85b9dbfa 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3
+{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3
, lame, flac, eject, mkcue, glyr
, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
, makeWrapper }:
@@ -42,7 +42,7 @@ in
postFixup = ''
for cmd in abcde cddb-tool abcde-musicbrainz-tool; do
wrapProgram "$out/bin/$cmd" --prefix PATH ":" \
- ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]}
+ ${stdenv.lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]}
done
'';
diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix
index 5a6901a94348..c37963c77f3e 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/pkgs/applications/audio/airwave/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub, file, gcc_multi, libX11, makeWrapper
+{ stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper
, overrideCC, qt5, requireFile, unzip, wine
}:
@@ -13,14 +13,12 @@ let
sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s";
};
- stdenv_multi = overrideCC stdenv gcc_multi;
-
vst-sdk = stdenv.mkDerivation rec {
- name = "vstsdk366_27_06_2016_build_61";
+ name = "vstsdk368_08_11_2017_build_121";
src = requireFile {
name = "${name}.zip";
url = "http://www.steinberg.net/en/company/developers.html";
- sha256 = "05gsr13bpi2hhp34rvhllsvmn44rqvmjdpg9fsgfzgylfkz0kiki";
+ sha256 = "e0f235d8826d70f1ae0ae5929cd198acae1ecff74612fde5c60cbfb45c2f4a70";
};
nativeBuildInputs = [ unzip ];
installPhase = "cp -r . $out";
@@ -38,7 +36,7 @@ let
in
-stdenv_multi.mkDerivation {
+multiStdenv.mkDerivation {
name = "airwave-${version}";
src = airwave-src;
@@ -54,7 +52,7 @@ stdenv_multi.mkDerivation {
# For airwave-host-32.exe.so, point wineg++ to 32-bit versions of
# these libraries, as $NIX_LDFLAGS contains only 64-bit ones.
substituteInPlace src/host/CMakeLists.txt --replace '-m32' \
- '-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${stdenv_multi.cc.libc.out}/lib/32'
+ '-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${multiStdenv.cc.libc.out}/lib/32'
'';
# libstdc++.so link gets lost in 64-bit executables during
@@ -64,7 +62,7 @@ stdenv_multi.mkDerivation {
# Cf. https://github.com/phantom-code/airwave/issues/57
hardeningDisable = [ "format" ];
- cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}";
+ cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK";
postInstall = ''
mv $out/bin $out/libexec
diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix
index 115df15d2a57..f84958e1f820 100644
--- a/pkgs/applications/audio/aj-snapshot/default.nix
+++ b/pkgs/applications/audio/aj-snapshot/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = packageName + "-" + version ;
packageName = "aj-snapshot" ;
- version = "0.9.7";
+ version = "0.9.8";
src = fetchurl {
url = "mirror://sourceforge/${packageName}/${name}.tar.bz2";
- sha256 = "0yxccgp9qw2cyqv719wlbq8wfsr5ga8czvwa7bmb8dh5s11n3rn8";
+ sha256 = "0wilky1g2mb88v2z0520s7sw1dsn10iwanc8id5p6z1xsnhg7b6p";
};
doCheck = false;
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = http://aj-snapshot.sourceforge.net/;
license = licenses.gpl2;
- maintainers = [ maintainers.palo ];
+ maintainers = [ maintainers.mrVanDalo ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
deleted file mode 100644
index 022e33991f98..000000000000
--- a/pkgs/applications/audio/amarok/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig
-, qtscriptgenerator, gettext, curl , libxml2, mysql, taglib
-, taglib_extras, loudmouth , kdelibs4, qca2, libmtp, liblastfm, libgpod
-, phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null
-, lz4, lzo, snappy, libaio, pcre
-}:
-
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
-
- pname = "amarok";
- version = "2.8.0";
-
- src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
- sha256 = "1ilf9wdp3wna5pmvxill8x08rb9gw86qkc2zwm3xk9hpy8l9pf7l";
- };
-
- QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
-
- nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
- buildInputs = [
- qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/
- taglib taglib_extras loudmouth kdelibs4 phonon strigi soprano qca2
- libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
- lz4 lzo snappy libaio pcre
- ];
-
- # This is already fixed upstream, will be release in 2.9
- preConfigure = ''
- sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
- '';
-
- cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
-
- enableParallelBuilding = true;
-
- propagatedUserEnvPkgs = [ qtscriptgenerator ];
-
- meta = {
- repositories.git = git://anongit.kde.org/amarok.git;
- description = "Popular music player for KDE";
- license = "GPL";
- homepage = https://amarok.kde.org;
- inherit (kdelibs4.meta) platforms;
- };
-}
diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix
index a96aa3ed65d0..a4ac2943bfbc 100644
--- a/pkgs/applications/audio/amarok/kf5.nix
+++ b/pkgs/applications/audio/amarok/kf5.nix
@@ -3,7 +3,7 @@
, qca-qt5, qjson, qtscript, qtwebkit
, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor
, phonon, plasma-framework, threadweaver
-, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mariadb, pcre, snappy, taglib, taglib_extras
+, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
}:
let
@@ -26,7 +26,8 @@ in mkDerivation {
qca-qt5 qjson qtscript qtwebkit
kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor
phonon plasma-framework threadweaver
- curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mariadb pcre snappy taglib taglib_extras
+ curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
+ pcre snappy taglib taglib_extras
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix
index afb3c8342731..a99fb80df723 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt,
- libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify,
+ libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify,
libsoup, avahi, taglib
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gettext gtk2 expat intltool libgcrypt libunique gnutls
- libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib
+ libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib
];
meta = {
diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix
index 99d6357e9216..bb0615df25b8 100644
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/pkgs/applications/audio/asunder/default.nix
@@ -12,11 +12,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.8";
+ version = "2.9.2";
name = "asunder-${version}";
src = fetchurl {
url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2";
- sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq";
+ sha256 = "0vjbxrrjih4c673sc39wj5whp81xp9kmnwqxwzfnmhkky970rg5r";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 8242d035e5b8..6890b53f407d 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -1,23 +1,23 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
-, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib
+, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib
, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
-, libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
+, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
, neon, faad2, lame, libnotify, libsidplayfp
}:
stdenv.mkDerivation rec {
name = "audacious-${version}";
- version = "3.8.2";
+ version = "3.9";
src = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
- sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf";
+ sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm";
};
pluginsSrc = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2";
- sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq";
+ sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra";
};
nativeBuildInputs = [
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gettext glib gtk3 libmowgli dbus_glib libxml2
+ gettext glib gtk3 libmowgli dbus-glib libxml2
xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
- libpulseaudio fluidsynth libmad libogg libvorbis libcdio082
+ libpulseaudio fluidsynth libmad libogg libvorbis libcdio
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
libmodplug libsamplerate soxr lirc curl wavpack neon faad2
lame libnotify libsidplayfp
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index 803b0115fbdf..8910fdc1b0a8 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -1,27 +1,32 @@
{
- mkDerivation, lib, fetchurl,
+ mkDerivation, lib, fetchurl, fetchpatch,
gettext, pkgconfig,
qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
- libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug,
+ libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug,
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
wavpack
}:
let
- version = "3.8.2";
+ version = "3.9";
sources = {
"audacious-${version}" = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
- sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx";
+ sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d";
};
"audacious-plugins-${version}" = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
- sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp";
+ sha256 = "1f17r7ar0mngcf7z41s6xh073vjafw3i7iy9ijb0cd6bi48g5xwb";
};
};
+
+ qt510_plugins_patch = fetchpatch {
+ url = "https://github.com/audacious-media-player/audacious-plugins/commit/971f7ff7c3d8a0b9b420bf4fd19ab97755607637.patch";
+ sha256 = "15fy37syj9ygl2ibkkz3g3b9wd22vk9bjfmvqhhkpxphry2zwb17";
+ };
in
mkDerivation {
@@ -33,13 +38,15 @@ mkDerivation {
nativeBuildInputs = [ gettext pkgconfig ];
+ inherit qt510_plugins_patch;
+
buildInputs = [
# Core dependencies
qtbase
# Plugin dependencies
alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
- libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli
+ libcdio libcue libjack2 libmad libmms libmodplug libmowgli
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
];
@@ -55,6 +62,10 @@ mkDerivation {
for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do
(
+ # only patch the plugins
+ if [ "$i" -eq "1" ]; then
+ patches=( $qt510_plugins_patch )
+ fi
src=''${sourceFiles[$i]}
sourceRoot=''${sourceRoots[$i]}
source $stdenv/setup
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 4dbde82e0921..b0c47972e385 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -7,12 +7,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.2.0";
+ version = "2.2.2";
name = "audacity-${version}";
src = fetchurl {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
- sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry";
+ sha256 = "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km";
};
preConfigure = /* we prefer system-wide libs */ ''
diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
similarity index 77%
rename from pkgs/applications/audio/bitwig-studio/default.nix
rename to pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
index c597e42eaa6d..8b26ba0959d4 100644
--- a/pkgs/applications/audio/bitwig-studio/default.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
@@ -1,35 +1,35 @@
-{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, ffmpeg, freetype, gdk_pixbuf
-, glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp
-, libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb
-, libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm
+{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf
+, glib, gtk2, harfbuzz, jdk, lib, xorg
+, libbsd, libjack2, libpng
+, libxkbcommon
+, makeWrapper, pixman
, xdg_utils, zenity, zlib }:
stdenv.mkDerivation rec {
name = "bitwig-studio-${version}";
- version = "2.1.3";
+ version = "1.3.16";
src = fetchurl {
- url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
- sha256 = "0blfw7dayl1wzys11mdixlkbr1p1d5rnwrvim1hblfpnw2zmlslb";
+ url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
+ sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8";
};
nativeBuildInputs = [ dpkg makeWrapper ];
unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root";
- dontBuild = true;
+ dontBuild = true;
dontPatchELF = true;
- dontStrip = true;
+ dontStrip = true;
- libPath = lib.makeLibraryPath [
- alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz
- libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender
- libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm
- zlib
+ libPath = with xorg; lib.makeLibraryPath [
+ alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau
+ libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb
+ libxkbfile pixman xcbutil xcbutilwm zlib
];
binPath = lib.makeBinPath [
- ffmpeg xdg_utils zenity
+ xdg_utils zenity
];
installPhase = ''
@@ -95,6 +95,6 @@ stdenv.mkDerivation rec {
homepage = http://www.bitwig.com/;
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ michalrus ];
+ maintainers = with maintainers; [ michalrus mrVanDalo ];
};
}
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix
new file mode 100644
index 000000000000..e5a5cc7c9c6a
--- /dev/null
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, bitwig-studio1,
+ xdg_utils, zenity, ffmpeg }:
+
+bitwig-studio1.overrideAttrs (oldAttrs: rec {
+ name = "bitwig-studio-${version}";
+ version = "2.2.2";
+
+ src = fetchurl {
+ url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
+ sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22";
+ };
+
+ buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ];
+
+ binPath = stdenv.lib.makeBinPath [
+ ffmpeg xdg_utils zenity
+ ];
+})
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index 15fca59deee3..82c32903bd86 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
name = "calf-${version}";
- version = "0.0.60";
+ version = "0.90.0";
src = fetchurl {
url = "http://calf-studio-gear.org/files/${name}.tar.gz";
- sha256 = "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9";
+ sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib";
};
- buildInputs = [
+ buildInputs = [
cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH
libglade lv2 pkgconfig
];
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 35fe510cbb2b..35214502e09a 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
-, withQt4 ? false, qt4
-, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, vlc
+, qtbase, qtmultimedia, qtsvg, qttools
# Cantata doesn't build with cdparanoia enabled so we disable that
# default for now until I (or someone else) figure it out.
@@ -19,11 +18,6 @@
, withStreams ? true
}:
-# One and only one front-end.
-assert withQt5 -> withQt4 == false;
-assert withQt4 -> withQt5 == false;
-assert withQt4 || withQt5;
-
# Inter-dependencies.
assert withCddb -> withCdda && withTaglib;
assert withCdda -> withCddb && withMusicbrainz;
@@ -51,9 +45,16 @@ in stdenv.mkDerivation rec {
sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
};
- buildInputs = [ vlc ]
- ++ stdenv.lib.optional withQt4 qt4
- ++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ]
+ patches = [
+ # patch is needed for 2.2.0 with qt 5.10 (doesn't harm earlier versions)
+ (fetchpatch {
+ url = "https://github.com/CDrummond/cantata/commit/4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a.patch";
+ sha256 = "1z21ax3542z7hm628xv110lmplaspb407jzgfk16xkphww5qyphj";
+ name = "fix_qt_510.patch";
+ })
+
+ ];
+ buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
++ stdenv.lib.optional withCdda cdparanoia
@@ -63,12 +64,11 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
++ stdenv.lib.optional withUdisks udisks2;
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig qttools ];
enableParallelBuilding = true;
cmakeFlags = stdenv.lib.flatten [
- (fstat withQt5 "QT5")
(fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
(fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
(fstat withCdda "CDPARANOIA")
diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 57107924b618..1420627c02a0 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "cava-${version}";
- version = "0.4.2";
+ version = "0.6.0";
buildInputs = [
alsaLib
@@ -16,14 +16,16 @@ stdenv.mkDerivation rec {
owner = "karlstav";
repo = "cava";
rev = version;
- sha256 = "1c5gl8ghmd89f6097rjd2dzrgh1z4i4v9m4vn5wkpnnm68b96yyc";
+ sha256 = "01maaq5pfd4a7zilgarwr1nl7jbqyrvir6w7ikchggsckrlk23wr";
};
nativeBuildInputs = [ autoreconfHook ];
postConfigure = ''
- substituteInPlace Makefile \
+ substituteInPlace Makefile.am \
--replace "-L/usr/local/lib -Wl,-rpath /usr/local/lib" ""
+ substituteInPlace configure.ac \
+ --replace "/usr/share/consolefonts" "$out/share/consolefonts"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 34dba5e206fa..d4d302f07d21 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff";
sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad";
})
- ];
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch;
buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook;
diff --git a/pkgs/applications/audio/cdparanoia/utils.patch b/pkgs/applications/audio/cdparanoia/utils.patch
new file mode 100644
index 000000000000..338e5303dcd0
--- /dev/null
+++ b/pkgs/applications/audio/cdparanoia/utils.patch
@@ -0,0 +1,68 @@
+diff --git cdparanoia-III-10.2/interface/utils.h cdparanoia-III-10.2/interface/utils.h
+index c9647da..68c1a3a 100644
+--- cdparanoia-III-10.2/interface/utils.h
++++ cdparanoia-III-10.2/interface/utils.h
+@@ -1,4 +1,6 @@
+-#include
++#include
++#include
++#include
+ #include
+ #include
+ #include
+@@ -14,15 +16,15 @@ static inline int bigendianp(void){
+ }
+
+ static inline int32_t swap32(int32_t x){
+- return((((u_int32_t)x & 0x000000ffU) << 24) |
+- (((u_int32_t)x & 0x0000ff00U) << 8) |
+- (((u_int32_t)x & 0x00ff0000U) >> 8) |
+- (((u_int32_t)x & 0xff000000U) >> 24));
++ return((((uint32_t)x & 0x000000ffU) << 24) |
++ (((uint32_t)x & 0x0000ff00U) << 8) |
++ (((uint32_t)x & 0x00ff0000U) >> 8) |
++ (((uint32_t)x & 0xff000000U) >> 24));
+ }
+
+ static inline int16_t swap16(int16_t x){
+- return((((u_int16_t)x & 0x00ffU) << 8) |
+- (((u_int16_t)x & 0xff00U) >> 8));
++ return((((uint16_t)x & 0x00ffU) << 8) |
++ (((uint16_t)x & 0xff00U) >> 8));
+ }
+
+ #if BYTE_ORDER == LITTLE_ENDIAN
+diff --git cdparanoia-III-10.2/utils.h cdparanoia-III-10.2/utils.h
+index 10dce58..6211ce3 100644
+--- cdparanoia-III-10.2/utils.h
++++ cdparanoia-III-10.2/utils.h
+@@ -1,5 +1,6 @@
++#include
++#include
+ #include
+-#include
+ #include
+ #include
+ #include
+@@ -18,15 +19,15 @@ static inline int bigendianp(void){
+ }
+
+ static inline int32_t swap32(int32_t x){
+- return((((u_int32_t)x & 0x000000ffU) << 24) |
+- (((u_int32_t)x & 0x0000ff00U) << 8) |
+- (((u_int32_t)x & 0x00ff0000U) >> 8) |
+- (((u_int32_t)x & 0xff000000U) >> 24));
++ return((((uint32_t)x & 0x000000ffU) << 24) |
++ (((uint32_t)x & 0x0000ff00U) << 8) |
++ (((uint32_t)x & 0x00ff0000U) >> 8) |
++ (((uint32_t)x & 0xff000000U) >> 24));
+ }
+
+ static inline int16_t swap16(int16_t x){
+- return((((u_int16_t)x & 0x00ffU) << 8) |
+- (((u_int16_t)x & 0xff00U) >> 8));
++ return((((uint16_t)x & 0x00ffU) << 8) |
++ (((uint16_t)x & 0xff00U) >> 8));
+ }
+
+ #if BYTE_ORDER == LITTLE_ENDIAN
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index affddd90784c..92a33035c827 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
+{ stdenv, fetchurl, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
@@ -24,6 +24,11 @@ let
# Required so as to avoid adding libspotify as a build dependency (as it is
# unfree and thus would prevent us from having a free package).
./clementine-spotify-blob-remove-from-build.patch
+ (fetchpatch {
+ # Fix w/gcc7
+ url = "https://github.com/clementine-player/Clementine/pull/5630.patch";
+ sha256 = "0px7xp1m4nvrncx8sga1qlxppk562wrk2qqk19iiry84nxg20mk4";
+ })
];
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index c0dd2e92178c..f8c5a4e5acff 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -17,7 +17,7 @@
#, waveoutSupport
, cddbSupport ? true, libcddb ? null
-, cdioSupport ? true, libcdio ? null
+, cdioSupport ? true, libcdio ? null, libcdio-paranoia ? null
, cueSupport ? true, libcue ? null
, discidSupport ? (!stdenv.isDarwin), libdiscid ? null
, ffmpegSupport ? true, ffmpeg ? null
@@ -69,7 +69,7 @@ let
# Input file formats
(mkFlag cddbSupport "CONFIG_CDDB=y" libcddb)
- (mkFlag cdioSupport "CONFIG_CDIO=y" libcdio)
+ (mkFlag cdioSupport "CONFIG_CDIO=y" [ libcdio libcdio-paranoia ])
(mkFlag cueSupport "CONFIG_CUE=y" libcue)
(mkFlag discidSupport "CONFIG_DISCID=y" libdiscid)
(mkFlag ffmpegSupport "CONFIG_FFMPEG=y" ffmpeg)
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index dc0c8eabcacf..191074eba27a 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
name = "csound-${version}";
- version = "6.09.0";
+ version = "6.10.0";
enableParallelBuilding = true;
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "csound";
repo = "csound";
rev = version;
- sha256 = "1vfb0mab89psfwidadjrn5mbzq3bhjbyrrmyp98yp0xm6a8cssih";
+ sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n";
};
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index ea0bce368a1a..4dced0cfafae 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
# deadbeef can use either gtk2 or gtk3
, gtk2Support ? false, gtk2 ? null
-, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
+, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
# input plugins
, vorbisSupport ? true, libvorbis ? null
, mp123Support ? true, libmad ? null
@@ -30,7 +30,7 @@
assert gtk2Support || gtk3Support;
assert gtk2Support -> gtk2 != null;
-assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null;
+assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null;
assert vorbisSupport -> libvorbis != null;
assert mp123Support -> libmad != null;
assert flacSupport -> flac != null;
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; [ jansson ]
++ optional gtk2Support gtk2
- ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ]
+ ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ]
++ optional vorbisSupport libvorbis
++ optional mp123Support libmad
++ optional flacSupport flac
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
description = "Ultimate Music Player for GNU/Linux";
homepage = http://deadbeef.sourceforge.net/;
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ maintainers.abbradar ];
repositories.git = "https://github.com/Alexey-Yakovenko/deadbeef";
};
diff --git a/pkgs/applications/audio/deadbeef/plugins/opus.nix b/pkgs/applications/audio/deadbeef/plugins/opus.nix
new file mode 100644
index 000000000000..55db00c15bf6
--- /dev/null
+++ b/pkgs/applications/audio/deadbeef/plugins/opus.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromBitbucket, opusfile, libopus, libogg, openssl, deadbeef }:
+
+stdenv.mkDerivation rec {
+ name = "deadbeef-opus-plugin-${version}";
+ version = "0.8";
+
+ src = fetchFromBitbucket {
+ owner = "Lithopsian";
+ repo = "deadbeef-opus";
+ rev = "v${version}";
+ sha256 = "057rgsw4563gs63k05s7zsdc0n4djxwlbyqabf7c88f23z35ryyi";
+ };
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ ];
+
+ NIX_CFLAGS_COMPILE = [
+ "-I${opusfile}/include/opus"
+ ];
+
+ buildInputs = [ deadbeef opusfile libopus libogg openssl ];
+
+ meta = with stdenv.lib; {
+ description = "Ogg Opus decoder plugin for the DeaDBeeF music player";
+ homepage = https://bitbucket.org/Lithopsian/deadbeef-opus;
+ license = licenses.gpl2; # There are three files, each licensed under different license: zlib, gpl2Plus and lgpl2
+ maintainers = [ maintainers.jtojnar ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix
new file mode 100644
index 000000000000..be941bc3db29
--- /dev/null
+++ b/pkgs/applications/audio/denemo/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig
+, libjack2, gettext, intltool, guile_2_0, lilypond
+, glib, libxml2, librsvg, libsndfile, aubio
+, gtk3, gtksourceview, evince, fluidsynth, rubberband
+, portaudio, portmidi, fftw, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "denemo-${version}";
+ version = "2.2.0";
+
+ src = fetchurl {
+ url = "http://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz";
+ sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh";
+ };
+
+ buildInputs = [
+ libjack2 gettext guile_2_0 lilypond pkgconfig glib libxml2 librsvg libsndfile
+ aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi
+ makeWrapper
+ ];
+
+ postInstall = ''
+ wrapProgram $out/bin/denemo --prefix PATH : ${lilypond}/bin
+ '';
+
+ nativeBuildInputs = [
+ intltool
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Music notation and composition software used with lilypond";
+ homepage = http://denemo.org;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.olynch ];
+ };
+}
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 918accb4e167..d16534b03d32 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -6,7 +6,7 @@ let
src = fetchFromGitHub {
sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc";
rev = "39053e8896eedd7b3e8a9e9a9ffd80f1fc6ceb16";
- repo = "reaper";
+ repo = "REAPER";
owner = "gillesdegottex";
};
meta = with stdenv.lib; {
@@ -16,8 +16,8 @@ let
libqaudioextra = {
src = fetchFromGitHub {
- sha256 = "17pvlij8cc4lwzf6f1cnygj3m3ci6xfa3lv5bgcr5i1gzyjxqpq1";
- rev = "b7d187cd9a1fd76ea94151e2e02453508d0151d3";
+ sha256 = "0m6x1qm7lbjplqasr2jhnd2ndi0y6z9ybbiiixnlwfm23sp15wci";
+ rev = "9ae051989a8fed0b2f8194b1501151909a821a89";
repo = "libqaudioextra";
owner = "gillesdegottex";
};
@@ -28,10 +28,10 @@ let
in stdenv.mkDerivation rec {
name = "dfasma-${version}";
- version = "1.2.5";
+ version = "1.4.5";
src = fetchFromGitHub {
- sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d";
+ sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h";
rev = "v${version}";
repo = "dfasma";
owner = "gillesdegottex";
@@ -42,13 +42,9 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ];
postPatch = ''
- substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
cp -Rv "${reaperFork.src}"/* external/REAPER
cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra
- '';
-
- preConfigure = ''
- qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out"
+ substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" "";
'';
enableParallelBuilding = true;
@@ -66,6 +62,5 @@ in stdenv.mkDerivation rec {
homepage = http://gillesdegottex.github.io/dfasma/;
license = [ licenses.gpl3Plus reaperFork.meta.license ];
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index 740d6d8d7e0a..6d56f53bd16f 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
stdenv.mkDerivation rec {
- name = "dirt-2015-04-28";
+ name = "dirt-2018-01-01";
src = fetchFromGitHub {
repo = "Dirt";
owner = "tidalcycles";
- rev = "cfc5e85318defda7462192b5159103c823ce61f7";
- sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz";
+ rev = "b09604c7d8e581bc7799d7e2ad293e7cdd254bda";
+ sha256 = "13adglk2d31d7mswfvi02b0rjdhzmsv11cc8smhidmrns3f9s96n";
+ fetchSubmodules = true;
};
buildInputs = [ libsndfile libsamplerate liblo libjack2 ];
postPatch = ''
- sed -i "s|./samples|$out/share/dirt/samples|" file.h
- '';
- configurePhase = ''
- export DESTDIR=$out
+ sed -i "s|./samples|$out/share/dirt/samples|" dirt.c
'';
+ makeFlags = ["PREFIX=$(out)"];
postInstall = ''
mkdir -p $out/share/dirt/
cp -r samples $out/share/dirt/
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index a80cc36b2164..5c9211e7f3bb 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2
+{ stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2
, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
stdenv.mkDerivation rec {
- name = "distrho-ports-unstable-2017-08-04";
+ name = "distrho-ports-unstable-2018-01-01";
- src = fetchgit {
- url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
- rev = "f591a1066cd3929536699bb516caa4b5efd9d025";
- sha256 = "1qjnmpmwbq2zpwn8v1dmqn3bjp2ykj5p89fkjax7idgpx1cg7pp9";
+ src = fetchFromGitHub {
+ owner = "DISTRHO";
+ repo = "DISTRHO-Ports";
+ rev = "b200e7409aa9f6612c4d948932f6ce6f0a087f5a";
+ sha256 = "0672r0a9s6skzkxpjdraziwh5k8ivrfzvi4zcpkcg3zrv2hia2vz";
};
patchPhase = ''
@@ -37,12 +38,12 @@ stdenv.mkDerivation rec {
description = "A collection of cross-platform audio effects and plugins";
longDescription = ''
Includes:
- Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger
- drowaudio-reverb drowaudio-tremolo drumsynt EasySSP eqinox
- JuceDemoPlugin klangfalter LUFSMeter luftikus obxd pitchedDelay
- stereosourceseparation TAL-Dub-3 TAL-Filter TAL-Filter-2 TAL-NoiseMaker
- TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 TAL-Vocoder-2 TheFunction
- ThePilgrim Vex Wolpertinger
+ Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger
+ drowaudio-reverb drowaudio-tremolo drumsynth EasySSP eqinox HiReSam
+ JuceDemoPlugin KlangFalter LUFSMeter LUFSMeterMulti Luftikus Obxd
+ PitchedDelay ReFine StereoSourceSeparation TAL-Dub-3 TAL-Filter
+ TAL-Filter-2 TAL-NoiseMaker TAL-Reverb TAL-Reverb-2 TAL-Reverb-3
+ TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger
'';
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index fb62b6ea3de6..3594fd881b28 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
- version = "0.8.4";
+ version = "0.9.0";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
- sha256 = "0qqpklzy4wgw9jy0v2810j06712q90bwc69fp7da82536ba058a9";
+ sha256 = "1vm8lrk3lykdic6fyfpl12jx1xg6rcaid242s8sij30p1ix4zdab";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index f9c9dc2faef0..1ca2570fd4bd 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -1,35 +1,37 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
-, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas
-, makeWrapper, gnome3
+, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas
+, gnome3, wrapGAppsHook
}:
-stdenv.mkDerivation rec {
- name = "easytag-${version}";
- majorVersion = "2.4";
- version = "${majorVersion}.3";
+let
+ pname = "easytag";
+ version = "2.4.3";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/easytag/${majorVersion}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw";
};
- preFixup = ''
- wrapProgram $out/bin/easytag \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
- --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
- '';
-
NIX_LDFLAGS = "-lid3tag -lz";
- nativeBuildInputs = [ makeWrapper pkgconfig intltool ];
+ nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [
gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
- itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)
+ gsettings-desktop-schemas gnome3.defaultIconTheme
];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ versionPolicy = "none";
+ };
+ };
+
meta = with stdenv.lib; {
description = "View and edit tags for various audio files";
- homepage = http://projects.gnome.org/easytag/;
+ homepage = https://wiki.gnome.org/Apps/EasyTAG;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fuuzetsu ];
platforms = platforms.linux;
diff --git a/pkgs/applications/audio/eflite/buf-overflow.patch b/pkgs/applications/audio/eflite/buf-overflow.patch
deleted file mode 100644
index 8873aa77b0e6..000000000000
--- a/pkgs/applications/audio/eflite/buf-overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix buffer overflow
-
---- eflite-0.4.1.orig/es.c
-+++ eflite-0.4.1/es.c
-@@ -329,7 +329,7 @@
- char *p;
-
- p = getenv("HOME");
-- sprintf(buf, "%s/.es.conf", p);
-+ snprintf(buf, sizeof(buf), "%s/.es.conf", p);
- fp = fopen(buf, "r");
- if (!fp) fp = fopen("/etc/es.conf", "r");
- if (!fp) return 1;
-@@ -438,7 +438,7 @@
- char logname[200];
-
- if ((flags & 0xffff) > DEBUG) return;
-- sprintf(logname, "%s/es.log", getenv("HOME"));
-+ snprintf(logname, sizeof(logname), "%s/es.log", getenv("HOME"));
- va_start(arg, text);
- vsnprintf(buf, 200, text, arg);
- va_end(arg);
diff --git a/pkgs/applications/audio/eflite/cvs-update.patch b/pkgs/applications/audio/eflite/cvs-update.patch
deleted file mode 100644
index 1ceace83aa5d..000000000000
--- a/pkgs/applications/audio/eflite/cvs-update.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- eflite-0.4.1.orig/fs.c
-+++ eflite-0.4.1/fs.c
-@@ -9,7 +9,7 @@
- * GNU General Public License, as published by the Free Software
- * Foundation. Please see the file COPYING for details.
- *
-- * $Id: fs.c,v 1.19 2007/01/18 23:58:42 mgorse Exp $
-+ * $Id: fs.c,v 1.22 2008/03/05 15:21:43 mgorse Exp $
- *
- * Notes:
- *
-@@ -505,19 +505,6 @@
- }
- }
-
--
--
--static void play_audio_close(void *cancel)
--{
-- if (audiodev)
-- {
-- audio_drain(audiodev);
-- close_audiodev();
-- // usleep(5000);
-- }
--}
--
--
- static inline void determine_playlen(int speed, cst_wave *wptr, int type, int *pl, int *s)
- {
- int playlen, skip;
-@@ -573,12 +560,12 @@
- type = ac[ac_head].type;
- WAVE_UNLOCK;
- pthread_testcancel();
-- pthread_cleanup_push(play_audio_close, NULL);
--
-+
- es_log(2, "Opening audio device.");
- /* We abuse the wave mutex here to avoid being canceled
- * while the audio device is being openned */
- WAVE_LOCK;
-+ assert(audiodev == NULL);
- audiodev = audio_open(wptr->sample_rate, wptr->num_channels, CST_AUDIO_LINEAR16);
- WAVE_UNLOCK;
- if (audiodev == NULL)
-@@ -606,8 +593,8 @@
- #ifdef DEBUG
- start_time = get_ticks_count();
- #endif
-- pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
- audio_write(audiodev, wptr->samples + skip, playlen * 2);
-+ pthread_testcancel();
- es_log(2, "Write took %.2f seconds.", get_ticks_count() - start_time);
- }
- es_log(2, "play: syncing.");
-@@ -617,16 +604,16 @@
- audio_flush(audiodev);
- pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
- es_log(2, "Flush took %.2f seconds.", get_ticks_count() - start_time);
-- es_log(2, "play: Closing audio device");
-- close_audiodev();
-- pthread_cleanup_pop(0);
-- pthread_testcancel();
-- TEXT_LOCK;
-+ pthread_testcancel();
-+
-+ TEXT_LOCK;
- time_left -= ((float)playlen) / wptr->sample_rate;
- pthread_cond_signal(&text_condition);
- TEXT_UNLOCK;
-
- WAVE_LOCK;
-+ es_log(2, "play: Closing audio device");
-+ close_audiodev();
- ac_destroy(&ac[ac_head]);
- ac_head++;
- if (ac_head == ac_tail)
-@@ -894,6 +881,7 @@
- WAVE_LOCK_NI;
- pthread_cond_signal(&wave_condition); // necessary because we inhibit cancellation while waiting
- pthread_cancel(wave_thread);
-+ if (audiodev != NULL) audio_drain(audiodev);
- WAVE_UNLOCK_NI;
- }
-
-@@ -917,7 +905,10 @@
- }
-
- /* At this point, no thread is running */
--
-+
-+ // Make sure audio device is closed
-+ close_audiodev();
-+
- /* Free any wave data */
- es_log(2, "s_clear: freeing wave data: %d", ac_tail);
- for (i = 0; i < ac_tail; i++)
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix
index 36fbdbc2cc9e..4138a07ec067 100644
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -1,21 +1,40 @@
-{stdenv,fetchurl,flite,alsaLib,debug ? false}:
+{ stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }:
stdenv.mkDerivation rec {
name = "eflite-${version}";
version = "0.4.1";
+
src = fetchurl {
url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz";
sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
};
+
buildInputs = [ flite alsaLib ];
- configureFlags = "flite_dir=${flite} --with-audio=alsa --with-vox=cmu_us_kal16";
+
+ configureFlags = [
+ "flite_dir=${flite}"
+ "--with-audio=alsa"
+ "--with-vox=cmu_us_kal16"
+ ];
+
patches = [
- ./buf-overflow.patch
- ./cvs-update.patch
- ./link.patch
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/cvs-update";
+ sha256 = "0r631vzmky7b7qyhm152557y4fr0xqrpi3y4w66fcn6p4rj03j05";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/buf-overflow";
+ sha256 = "071qk133kb7n7bq6kxgh3p9bba6hcl1ixsn4lx8vp8klijgrvkmx";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/link";
+ sha256 = "0p833dp4pdsya72bwh3syvkq85927pm6snxvx13lvcppisbhj0fc";
+ })
./format.patch
- ]; # Patches are taken from debian.
+ ];
+
CFLAGS = stdenv.lib.optionalString debug " -DDEBUG=2";
+
meta = {
homepage = http://eflite.sourceforge.net;
description = "EFlite is a speech server for screen readers";
diff --git a/pkgs/applications/audio/eflite/link.patch b/pkgs/applications/audio/eflite/link.patch
deleted file mode 100644
index 73c69da965c3..000000000000
--- a/pkgs/applications/audio/eflite/link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eflite-0.4.1/Makefile.in 2007-01-19 01:01:09.000000000 +0100
-+++ eflite-0.4.1-new/Makefile.in 2017-03-01 23:25:34.223615492 +0100
-@@ -34,7 +34,7 @@
- $(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS)
-
- fs.o: fs.c
-- $(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $<
-+ $(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(FL_VOX) -DSTANDALONE -DEFLITE -c -o $@ $<
-
- tone.o: tone.c
- $(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $<
diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix
new file mode 100644
index 000000000000..6affb16e073f
--- /dev/null
+++ b/pkgs/applications/audio/elisa/default.nix
@@ -0,0 +1,36 @@
+{ mkDerivation, fetchFromGitHub, lib
+, extra-cmake-modules, kdoctools, wrapGAppsHook
+, qtmultimedia, qtquickcontrols2, qtwebsockets
+, kconfig, kcmutils, kcrash, kdeclarative, kfilemetadata, kinit
+, baloo
+}:
+
+mkDerivation rec {
+ name = "elisa-${version}";
+ # 0.1 is expected in early/mid 2018-04
+ version = "0.0.20180320";
+
+ src = fetchFromGitHub {
+ owner = "KDE";
+ repo = "elisa";
+ rev = "9dd35d7244a8a3553275152f5b50fbe6d272ce64";
+ sha256 = "0mjqvcpk2y4jlwkka8gzl50wgqjjx9bzpbrj79cr0ib3jyviss4k";
+ };
+
+ nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+
+ propagatedBuildInputs = [
+ qtmultimedia qtquickcontrols2 qtwebsockets
+ kconfig kcmutils kcrash kdeclarative kfilemetadata kinit
+ baloo
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "Elisa Music Player";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ peterhoeg ];
+ inherit (kconfig.meta) platforms;
+ };
+}
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 889506deb768..f4160ff6f808 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "espeak-ng-${version}";
- version = "2016-08-28";
+ version = "1.49.2";
src = fetchFromGitHub {
owner = "espeak-ng";
repo = "espeak-ng";
- rev = "b784e77c5708b61feed780d8f1113c4c8eb92200";
- sha256 = "1whix4mv0qvsvifgpwwbdzhv621as3rxpn9ijqc2683h6k8pvcfk";
+ rev = version;
+ sha256 = "17bbl3zi8214iaaj8kjnancjvmvizwybg3sg17qjq4mf5c6xfg2c";
};
nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ];
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 901df19ebf59..f0564f37d6b1 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -16,13 +16,14 @@ with stdenv.lib.strings;
let
- version = "2.1.0";
+ version = "2.5.23";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
- rev = "v${builtins.replaceStrings ["."] ["-"] version}";
- sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m";
+ rev = "${version}";
+ sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc";
+ fetchSubmodules = true;
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix
index 3867114562d5..7762ca393690 100644
--- a/pkgs/applications/audio/faust/faust2jack.nix
+++ b/pkgs/applications/audio/faust/faust2jack.nix
@@ -2,6 +2,7 @@
, gtk2
, jack2Full
, opencv
+, libsndfile
}:
faust.wrapWithBuildEnv {
@@ -18,6 +19,7 @@ faust.wrapWithBuildEnv {
gtk2
jack2Full
opencv
+ libsndfile
];
}
diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix
index c0911b315386..5a015e5ca31e 100644
--- a/pkgs/applications/audio/faust/faust2jaqt.nix
+++ b/pkgs/applications/audio/faust/faust2jaqt.nix
@@ -2,6 +2,7 @@
, jack2Full
, opencv
, qt4
+, libsndfile
}:
faust.wrapWithBuildEnv {
@@ -17,6 +18,7 @@ faust.wrapWithBuildEnv {
jack2Full
opencv
qt4
+ libsndfile
];
}
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 425b2b866a5a..99aedae19124 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = https://xiph.org/flac/;
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
platforms = platforms.all;
- maintainers = [ maintainers.mornfall ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index ab28c43f66cf..cc453347aea4 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "flacon-${version}";
- version = "2.1.1";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "flacon";
repo = "flacon";
rev = "v${version}";
- sha256 = "0jazv3d1xaydp2ws1pd5rmga76z5yk74v3a8yqfc8vbb2z6ahimz";
+ sha256 = "0l0xbzpy4nnr08z7gqvb4ngrjwzpspa382cbcrpkya3nd40987kr";
};
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index a8bf05187e33..789ee35f260e 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,34 +1,31 @@
-{ stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig
-, libpulseaudio, CoreServices, CoreAudio, AudioUnit }:
+{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
+, alsaLib, glib, libjack2, libsndfile, libpulseaudio
+, AudioUnit, CoreAudio, CoreMIDI, CoreServices
+}:
stdenv.mkDerivation rec {
name = "fluidsynth-${version}";
- version = "1.1.6";
+ version = "1.1.9";
- src = fetchurl {
- url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2";
- sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj";
+ src = fetchFromGitHub {
+ owner = "FluidSynth";
+ repo = "fluidsynth";
+ rev = "v${version}";
+ sha256 = "0krvmb1idnf95l2ydzfcb08ayyx3n4m71hf9fgwv3srzaikvpf3q";
};
- preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
- sed -i '40 i\
- #include \
- #include ' \
- src/drivers/fluid_coreaudio.c
- '';
+ nativeBuildInputs = [ pkgconfig cmake ];
- NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
- "-framework CoreAudio -framework CoreServices";
-
- nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libsndfile ]
- ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ];
+ ++ lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
+ ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
- meta = with stdenv.lib; {
+ cmakeFlags = lib.optional stdenv.isDarwin "-Denable-framework=off";
+
+ meta = with lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications";
homepage = http://www.fluidsynth.org;
- license = licenses.lgpl2;
+ license = licenses.lgpl21Plus;
maintainers = with maintainers; [ goibhniu lovek323 ];
platforms = platforms.unix;
};
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index e4c6c658efd7..e238f8831421 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmake
+{ stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake
, alsaSupport ? true, alsaLib ? null
, jackSupport ? false, libjack2 ? null
, portaudioSupport ? false, portaudio ? null }:
@@ -11,10 +11,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "fmit-${version}";
- version = "1.1.11";
+ version = "1.1.13";
src = fetchFromGitHub {
- sha256 = "1w492lf8n2sjkr53z8cvkgywzn0w53cf78hz93zaw6dwwv36lwdp";
+ sha256 = "1p374gf7iksrlyvddm3w4qk3l0rxsiyymz5s8dmc447yvin8ykfq";
rev = "v${version}";
repo = "fmit";
owner = "gillesdegottex";
@@ -49,6 +49,5 @@ stdenv.mkDerivation rec {
homepage = http://gillesdegottex.github.io/fmit/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index e53b498fb6ee..b92d4f6eb1e8 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45
-, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt
-, pkgconfig }:
+{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which
+, docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt
+}:
stdenv.mkDerivation rec {
- name = "gigedit-svn-${version}";
- version = "2342";
+ name = "gigedit-${version}";
+ version = "1.1.0";
- src = fetchsvn {
- url = "https://svn.linuxsampler.org/svn/gigedit/trunk";
- rev = "${version}";
- sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs";
+ src = fetchurl {
+ url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
+ sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
};
- patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs";
+ patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
- preConfigure = "make -f Makefile.cvs";
+ preConfigure = "make -f Makefile.svn";
- buildInputs = [
- autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool
- libgig libsndfile libtool libxslt pkgconfig
- ];
+ nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
+
+ buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org;
diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
new file mode 100644
index 000000000000..eb00fcc87a24
--- /dev/null
+++ b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
@@ -0,0 +1,15 @@
+--- a/src/gigedit/wrapLabel.cc
++++ b/src/gigedit/wrapLabel.cc
+@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text
+ : mWrapWidth(0),
+ mWrapHeight(0)
+ {
+- // pangomm >= 2.35.1
+-#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1)))
+- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR);
+-#else
+ get_layout()->set_wrap(Pango::WRAP_WORD_CHAR);
+-#endif
+ set_alignment(0.0, 0.0);
+ set_text(text);
+ }
diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix
index 2d63245fef63..42285ba4bf86 100644
--- a/pkgs/applications/audio/gjay/default.nix
+++ b/pkgs/applications/audio/gjay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl
+{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl
, libaudclient }:
stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ];
+ buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 50b1bcde58f3..c2adc58f9ce5 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib
-, gtk2, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique
-, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook
+, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique
+, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@@ -24,11 +24,10 @@ stdenv.mkDerivation rec {
sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ];
buildInputs = [
- libtool intltool glib gtk2 curl mpd_clientlib libsoup
- libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme
- wrapGAppsHook
+ glib gtk2 curl mpd_clientlib libsoup
+ libunique libmpd libSM libICE sqlite hicolor-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 9d9af6311832..6c7d6dba455c 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -4,7 +4,7 @@
}:
let
- version = "4.4.1";
+ version = "4.5.0";
deps = [
alsaLib
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
- sha256 = "0jqgawgij6jxf3zy3glviqj6s34mq7d756syg2c7kk1gkqkwgdpw";
+ sha256 = "06h9g1yhd5q7gg8v55q143fr65frxg0khfgckr03gsaw0swin51q";
};
dontBuild = true;
@@ -74,6 +74,6 @@ stdenv.mkDerivation {
description = "A beautiful cross platform Desktop Player for Google Play Music";
license = stdenv.lib.licenses.mit;
platforms = [ "x86_64-linux" ];
- maintainers = stdenv.lib.maintainers.SuprDewd;
+ maintainers = [ stdenv.lib.maintainers.SuprDewd ];
};
}
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 3d074bf1e19e..0cf5a3610038 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,65 +1,67 @@
-{ stdenv, fetchurl, fetchpatch, python2Packages, mygpoclient, intltool
-, ipodSupport ? false, libgpod
-, gnome3
+{ stdenv, fetchFromGitHub, python3, python3Packages, intltool
+, glibcLocales, gnome3, gtk3, wrapGAppsHook
+, ipodSupport ? false, libgpod, gobjectIntrospection
}:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
name = "gpodder-${version}";
+ version = "3.10.1";
- version = "3.9.3";
+ format = "other";
- src = fetchurl {
- url = "http://gpodder.org/src/${name}.tar.gz";
- sha256 = "1s83m90dic2zphwwv6wrvqx950y12v5sakm7q5nj5bnh5k9l2hgl";
+ src = fetchFromGitHub {
+ owner = "gpodder";
+ repo = "gpodder";
+ rev = version;
+ sha256 = "1cqhm5h0kkdb2m691dbj8i3bixl7bw0iww2pl6k1jkz8mgafyd9d";
};
- patches = [
- (fetchpatch {
- sha256 = "1xkl1wnp46546jrzsnb9p0yj23776byg3nvsqwbblhqbsfipl48w";
- name = "Fix-soundcloud-feeds.patch";
- url = "https://github.com/gpodder/gpodder/commit/e7f34ad090cd276d75c0cd8d92ed97243d75db38.patch";
- })
- (fetchpatch {
- sha256 = "1jlldbinlxis1pi9p2lyczgbcv8nmdj66fxll6ph0klln0w8gvg4";
- name = "use-https-urls-for-soundcloud.patch";
- url = "https://github.com/gpodder/gpodder/commit/ef915dd3b6828174bf4f6f0911da410d9aca1b67.patch";
- })
- (fetchpatch {
- sha256 = "1l37ihzk7gfqcl5nnphv0sv80psm6fsg4qkxn6abc6v476axyj9b";
- name = "updates-soundcloud-support-to-recognize-https";
- url = "https://github.com/gpodder/gpodder/commit/5c1507671d93096ad0118f908c20dd1f182a72e0.patch";
- })
- ];
-
postPatch = with stdenv.lib; ''
sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder
-
- makeWrapperArgs="--suffix XDG_DATA_DIRS : '${concatStringsSep ":" [
- "${gnome3.gnome_themes_standard}/share"
- "$XDG_ICON_DIRS"
- "$GSETTINGS_SCHEMAS_PATH"
- ]}'"
'';
- buildInputs = [
- intltool python2Packages.coverage python2Packages.minimock
- gnome3.gnome_themes_standard gnome3.defaultIconTheme
- gnome3.gsettings_desktop_schemas
+ nativeBuildInputs = [
+ intltool
+ wrapGAppsHook
+ glibcLocales
];
- propagatedBuildInputs = with python2Packages; [
- feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib
+ buildInputs = [
+ python3
+ gobjectIntrospection
+ gnome3.defaultIconTheme
+ ];
+
+ checkInputs = with python3Packages; [
+ coverage minimock
+ ];
+
+ doCheck = true;
+
+ propagatedBuildInputs = with python3Packages; [
+ feedparser
+ dbus-python
+ mygpoclient
+ pygobject3
+ eyeD3
+ podcastparser
+ html5lib
+ gtk3
] ++ stdenv.lib.optional ipodSupport libgpod;
+ makeFlags = [
+ "PREFIX=$(out)"
+ "share/applications/gpodder-url-handler.desktop"
+ "share/applications/gpodder.desktop"
+ "share/dbus-1/services/org.gpodder.service"
+ ];
+
preBuild = ''
- make PREFIX="$out" \
- share/applications/gpodder-url-handler.desktop \
- share/applications/gpodder.desktop \
- share/dbus-1/services/org.gpodder.service
+ export LC_ALL="en_US.UTF-8"
'';
- checkPhase = ''
- LC_ALL=C python -m gpodder.unittests
+ installCheckPhase = ''
+ LC_ALL=C PYTHONPATH=./src:$PYTHONPATH python3 -m gpodder.unittests
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index 2f4bde92167b..d111502651ed 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, pkgconfig
, gcc
, python3
-, gsettings_desktop_schemas
-, desktop_file_utils
+, gsettings-desktop-schemas
+, desktop-file-utils
, glib
, gtk3
, intltool
, libsoup
-, json_glib
+, json-glib
, wrapGAppsHook
, meson
, ninja
@@ -17,7 +17,7 @@
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
}:
let
- version = "6.0.2";
+ version = "7.1";
in stdenv.mkDerivation rec {
name = "gradio-${version}";
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
owner = "haecker-felix";
repo = "gradio";
rev = "v${version}";
- sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s";
+ sha256 = "0x0hmcjvpgvsm64ywcc71srlwqybfhadn5nkwycq0lh7r49d89kx";
};
nativeBuildInputs = [
@@ -44,15 +44,15 @@ in stdenv.mkDerivation rec {
glib
intltool
libsoup
- json_glib
+ json-glib
gtk3
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
wrapGAppsHook
- desktop_file_utils
- gsettings_desktop_schemas
+ desktop-file-utils
+ gsettings-desktop-schemas
] ++ gst_plugins;
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index 7ebdce783527..39cd1a444fa8 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac,
gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag,
- libvorbis, hicolor_icon_theme, gdk_pixbuf }:
+ libvorbis, hicolor-icon-theme, gdk_pixbuf }:
stdenv.mkDerivation rec {
version = "2.1.5";
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
};
- propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];
+ propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
gnome.gdl gnome.defaultIconTheme
- hicolor_icon_theme ];
+ hicolor-icon-theme ];
patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram "$out/bin/gtkpod" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index b149aab06e10..bcb301687089 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gettext, intltool, pkgconfig, python2
-, avahi, bluez, boost, eigen, fftw, glib, glib_networking
-, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
+, avahi, bluez, boost, eigen, fftw, glib, glib-networking
+, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2
, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
, wrapGAppsHook, zita-convolver, zita-resampler
, optimizationSupport ? false # Enable support for native CPU extensions
@@ -12,18 +12,18 @@ in
stdenv.mkDerivation rec {
name = "guitarix-${version}";
- version = "0.35.6";
+ version = "0.36.1";
src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
- sha256 = "0ffvfnvhj6vz73zsrpi88hs69ys4zskm847zf825dl2r39n9nn41";
+ sha256 = "1g5949jwh2n755xjs3kcbdb8a1wxr5mn0m115wdnk27dxcdn93b0";
};
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
buildInputs = [
- avahi bluez boost eigen fftw glib glibmm glib_networking.out
- gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf
+ avahi bluez boost eigen fftw glib glibmm glib-networking.out
+ gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf
libsndfile lilv lv2 serd sord sratom zita-convolver
zita-resampler
];
diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index 80fb6a9ef923..fa76a1a26e82 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, mesa }:
+ , lv2, pkgconfig, libGLU_combined }:
stdenv.mkDerivation rec {
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 mesa lv2
+ freetype alsaLib curl libjack2 pkgconfig libGLU_combined lv2
];
CXXFLAGS = "-DHAVE_LROUND";
diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix
index 6653526c6e2f..d2720fcace67 100644
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
description = "A command line editor for id3v2 tags";
homepage = http://id3v2.sourceforge.net/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ nckx ];
platforms = with platforms; unix;
};
}
diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix
new file mode 100644
index 000000000000..9fe0820e5d6f
--- /dev/null
+++ b/pkgs/applications/audio/infamousPlugins/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }:
+
+stdenv.mkDerivation rec {
+ name = "infamousPlugins-v${version}";
+ version = "0.2.04";
+
+ src = fetchFromGitHub {
+ owner = "ssj71";
+ repo = "infamousPlugins";
+ rev = "v${version}";
+ sha256 = "0hmqk80w4qxq09iag7b7srf2g0wigkyhzq0ywxvhz2iz0hq9k0dh";
+ };
+
+ nativeBuildInputs = [ pkgconfig cmake ];
+ buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ];
+
+ meta = with stdenv.lib; {
+ homepage = https://ssj71.github.io/infamousPlugins;
+ description = "A collection of open-source LV2 plugins";
+ longDescription = ''
+ These are audio plugins in the LV2 format, developed for linux. Most are suitable for live use.
+ This collection contains:
+ * Cellular Automaton Synth - additive synthesizer, where 16 harmonics are added according to rules of elementary cellular automata
+ * Envelope Follower - a fully featured envelope follower plugin
+ * Hip2B - a distortion/destroyer plugin
+ * cheap distortion - another distortion plugin, but this one I wanted to get it as light as possible
+ * stuck - a clone of the electro-harmonix freeze
+ * power cut - this effect is commonly called tape stop
+ * power up - the opposite of the power cut
+ * ewham - a whammy style pitchshifter
+ * lushlife - a simulated double tracking plugin capable of everything from a thin beatle effect to thick lush choruses to weird outlandish effects
+ '';
+ license = licenses.gpl2;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index ca806aad02fe..d9109dd1c0e7 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,21 +1,23 @@
{ stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
-, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
+, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
+
, suil
}:
stdenv.mkDerivation rec {
name = "ingen-unstable-${rev}";
- rev = "2017-01-18";
+ rev = "2017-07-22";
src = fetchgit {
- url = "http://git.drobilla.net/cgit.cgi/ingen.git";
- rev = "02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340";
- sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k";
+ url = "https://git.drobilla.net/cgit.cgi/ingen.git";
+ rev = "cc4a4db33f4d126a07a4a498e053c5fb9a883be3";
+ sha256 = "1gmwmml486r9zq4w65v91mfaz36af9zzyjkmi74m8qmh67ffqn3w";
+ deepClone = true;
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper
+ boost ganv glibmm gtkmm2 libjack2 lilv lv2Unstable makeWrapper
python raul serd sord sratom suil
];
diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix
index f1e00e876730..e4d20db78682 100644
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/pkgs/applications/audio/jack-capture/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jack_capture-${version}";
- version = "0.9.69";
+ version = "0.9.73";
src = fetchurl {
url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz";
- sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
+ sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix
index a75513ff059e..75a8a6a4b1a1 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, mesa, pkgconfig }:
+{ stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_oscrolloscope-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ SDL libjack2 mesa ];
+ buildInputs = [ SDL libjack2 libGLU_combined ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix
index 060b7f703a31..e44dfddd37b7 100644
--- a/pkgs/applications/audio/jackmeter/default.nix
+++ b/pkgs/applications/audio/jackmeter/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "jackmeter-0.4";
src = fetchurl {
- url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz";
+ url = "https://www.aelius.com/njh/jackmeter/${name}.tar.gz";
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
};
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Console jack loudness meter";
- homepage = http://www.aelius.com/njh/jackmeter/;
+ homepage = https://www.aelius.com/njh/jackmeter/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
index 6a013e8c604f..344e6894baf5 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 6aaf14a5763a..55039e8508bc 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "keyfinder-${version}";
- version = "2.1";
+ version = "2.2";
src = fetchFromGitHub {
- sha256 = "0j9k90ll4cr8j8dywb6zf1bs9vijlx7m4zsh6w9hxwrr7ymz89hn";
+ sha256 = "0vjszk1h8vj2qycgbffzy6k7amg75jlvlnzwaqhz9nll2pcvw0zl";
rev = version;
repo = "is_KeyFinder";
owner = "ibsh";
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace is_KeyFinder.pro \
--replace "keyfinder.0" "keyfinder" \
- --replace "-stdlib=libc++" ""
+ --replace "-stdlib=libc++" "" \
+ --replace "\$\$[QT_INSTALL_PREFIX]" "$out"
'';
enableParallelBuilding = true;
@@ -36,6 +37,5 @@ stdenv.mkDerivation rec {
homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index ac484445b1e5..24421b527e16 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
name = "kid3-${version}";
- version = "3.4.2";
+ version = "3.5.1";
src = fetchurl {
url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
- sha256 = "0gka4na583015jyqva18g85q7vnkjdk0iji2jp88di3kpvqhf1sw";
+ sha256 = "09iryxnhg8d9q36a4brb25bqkjprkx5kl0x7vyy82gxivqk0ihl8";
};
buildInputs = with stdenv.lib;
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "A simple and powerful audio tag editor";
longDescription = ''
diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix
index 2038f898e3ec..d0ffbf29bcb2 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/applications/audio/ladspa-sdk/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
name = "ladspa-sdk-${version}";
version = "1.13";
src = fetchurl {
- url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz";
+ url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
};
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
index aa0a191bdd1a..e41d2ba96750 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
name = "ladspa.h-${version}";
version = "1.13";
src = fetchurl {
- url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz";
+ url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
};
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index 4dad6e58fee9..7f368fe6c281 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -1,31 +1,24 @@
-{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
-, libjack2, libgig, libsndfile, libtool, lv2, pkgconfig }:
+{ stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which
+, alsaLib, asio, libjack2, libgig, libsndfile, lv2 }:
stdenv.mkDerivation rec {
- name = "linuxsampler-svn-${version}";
- version = "2340";
+ name = "linuxsampler-${version}";
+ version = "2.1.0";
- src = fetchsvn {
- url = "https://svn.linuxsampler.org/svn/linuxsampler/trunk";
- rev = "${version}";
- sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7";
+ src = fetchurl {
+ url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
+ sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf";
};
- patches = ./linuxsampler_lv2_sfz_fix.diff;
-
- # It fails to compile without this option. I'm not sure what the bug
- # is, but everything works OK for me (goibhniu).
- configureFlags = [ "--disable-nptl-bug-check" ];
-
preConfigure = ''
- sed -e 's/which/type -P/g' -i scripts/generate_parser.sh
- make -f Makefile.cvs
+ make -f Makefile.svn
'';
- buildInputs = [
- alsaLib asio autoconf automake bison libjack2 libgig libsndfile
- libtool lv2 pkgconfig
- ];
+ nativeBuildInputs = [ autoconf automake bison libtool pkgconfig which ];
+
+ buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org;
@@ -40,7 +33,7 @@ stdenv.mkDerivation rec {
prior written permission by the LinuxSampler authors. If you
have questions on the subject, that are not yet covered by the
FAQ, please contact us.
- '';
+ '';
license = licenses.unfree;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
diff --git a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff b/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff
deleted file mode 100644
index 114726db19d6..000000000000
--- a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp
-===================================================================
---- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (revision 2359)
-+++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (working copy)
-@@ -18,6 +18,8 @@
- * MA 02110-1301 USA *
- ***************************************************************************/
-
-+#define _BSD_SOURCE 1 /* for realpath() */
-+
- #include
- #include
- #include
-@@ -118,6 +120,23 @@
- dmsg(2, ("linuxsampler: Deactivate\n"));
- }
-
-+ static String RealPath(const String& path)
-+ {
-+ String out = path;
-+ char* cpath = NULL;
-+#ifdef _WIN32
-+ cpath = (char*)malloc(MAX_PATH);
-+ GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL);
-+#else
-+ cpath = realpath(path.c_str(), NULL);
-+#endif
-+ if (cpath) {
-+ out = cpath;
-+ free(cpath);
-+ }
-+ return out;
-+ }
-+
- String PluginLv2::PathToState(const String& path) {
- if (MapPath) {
- char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str());
-@@ -131,9 +150,10 @@
- String PluginLv2::PathFromState(const String& path) {
- if (MapPath) {
- char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str());
-- const String abstract_path(cstr);
-+ // Resolve symbolic links so SFZ sample paths load correctly
-+ const String absolute_path(RealPath(cstr));
- free(cstr);
-- return abstract_path;
-+ return absolute_path;
- }
- return path;
- }
diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
index 206754a51955..f355c540f301 100644
--- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp
faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "lib/CharacterCompressor.lib"
faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp
faust2lv2 -vec -time -gui -t 99999 CharacterCompressorMono.dsp
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
index 467e11daaf65..90e4eabeef0b 100644
--- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
faust2jaqt -time -vec -double -t 99999 $f
done
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "CompBus.lib"
-
for f in *.dsp;
do
faust2lv2 -time -vec -double -gui -t 99999 $f
diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
index b452d91426e0..73dd7b48e9c4 100644
--- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "ConstantDetuneChorus.dsp"
faust2lv2 -time -vec -t 99999 -gui ConstantDetuneChorus.dsp
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
index d1959ec3cebc..39065db6edeb 100644
--- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -vec -time -t 99999 LazyLimiter.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "GUI.lib"
faust2lv2 -vec -time -t 99999 -gui LazyLimiter.dsp
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
index 6216ba555938..362451988d38 100644
--- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -time -vec -t 99999 MBdistortion.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "MBdistortion.dsp"
faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
index 0bb2034fc46e..3f809aa78474 100644
--- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -time -vec -t 99999 RhythmDelay.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "RhythmDelay.dsp"
faust2lv2 -time -vec -t 99999 -gui RhythmDelay.dsp
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
index e526e40a1e36..fece392ab1cc 100644
--- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
@@ -19,11 +19,9 @@ stdenv.mkDerivation rec {
faust2jaqt -time -double -t 99999 $f
done
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "compressors.lib"
-
for f in *.dsp;
do
- echo "compiling plugin from" $f
+ echo "Compiling plugin from" $f
faust2lv2 -time -double -gui -t 99999 $f
done
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
index daa23baa966b..6237628e600c 100644
--- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
do
echo "Building jack standalone for $f"
faust2jaqt -vec -time -t 99999 "$f"
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "$f"
echo "Building lv2 for $f"
faust2lv2 -vec -time -gui -t 99999 "$f"
done
diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
index 422aabb28299..cb9247fd3d08 100644
--- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp
faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "shelfMultiBand.lib"
faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBandMono.dsp
faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBand.dsp
'';
diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix
index d6ba094f4584..d16107e4c292 100644
--- a/pkgs/applications/audio/meterbridge/default.nix
+++ b/pkgs/applications/audio/meterbridge/default.nix
@@ -2,12 +2,12 @@
}:
stdenv.mkDerivation rec {
- version = "0.9.2";
+ version = "0.9.3";
name = "meterbridge-${version}";
src = fetchurl {
url = "http://plugin.org.uk/meterbridge/${name}.tar.gz";
- sha256 = "0jb6g3kbfyr5yf8mvblnciva2bmc01ijpr51m21r27rqmgi8gj5k";
+ sha256 = "0s7n3czfpil94vsd7iblv4xrck9c7zvsz4r3yfbkqcv85pjz1viz";
};
patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch];
diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix
index f4245b0a51e3..669ffbb2688a 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, mesa, gtk2, cairo, pango, fftw }:
+, lv2, libGLU_combined, gtk2, cairo, pango, fftw }:
let
version = "0.8.1";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
inherit name;
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ lv2 mesa gtk2 cairo pango fftw ];
+ buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftw ];
srcs = [ src robtkSrc ];
sourceRoot = name;
diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
index 2c6df650d5d7..3a77c7bbbf24 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk2, libjack2, ladspaH
+{ stdenv, fetchurl, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame
, vorbis-tools }:
@@ -7,12 +7,18 @@ stdenv.mkDerivation rec {
version = "1.4.23";
src = fetchurl {
- url = "http://download.gna.org/mhwaveedit/${name}.tar.bz2";
- sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3";
+ url = "https://github.com/magnush/mhwaveedit/archive/v${version}.tar.gz";
+ sha256 = "1lvd54d8kpxwl4gihhznx1b5skhibz4vfxi9k2kwqg808jfgz37l";
};
- buildInputs = [ SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile
- pkgconfig libpulseaudio makeWrapper ];
+ nativeBuildInputs = [ autoreconfHook ];
+
+ preAutoreconf = "(cd docgen && sh gendocs.sh)";
+
+ buildInputs = [
+ SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile
+ pkgconfig libpulseaudio makeWrapper
+ ];
configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa";
diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix
index 918b743fef7a..f077afec8b20 100644
--- a/pkgs/applications/audio/mikmod/default.nix
+++ b/pkgs/applications/audio/mikmod/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libmikmod, ncurses, alsaLib }:
stdenv.mkDerivation rec {
- name = "mikmod-3.2.6";
+ name = "mikmod-3.2.8";
src = fetchurl {
url = "mirror://sourceforge/mikmod/${name}.tar.gz";
- sha256 = "0wr61raj10rpl64mk3x9g3rwys898fbzyg93c6mrz89nvc74wm04";
+ sha256 = "1k54p8pn3jinha0f2i23ad15pf1pamibzcxjrbzjbklpcz1ipc6v";
};
buildInputs = [ libmikmod ncurses ];
diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix
index 2e293ee4552d..8d179e8eed11 100644
--- a/pkgs/applications/audio/minimodem/default.nix
+++ b/pkgs/applications/audio/minimodem/default.nix
@@ -1,18 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }:
+{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libtool
+, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio
+}:
stdenv.mkDerivation rec {
- version = "0.19";
+ version = "0.24-1";
pname = "minimodem";
name = "${pname}-${version}";
- src = fetchurl {
- url = "http://www.whence.com/${pname}/${name}.tar.gz";
- sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g";
+ src = fetchFromGitHub {
+ owner = "kamalmostafa";
+ repo = "minimodem";
+ rev = "${pname}-${version}";
+ sha256 = "1b5xy36fjcp7vkp115dpx4mlmqg2fc7xvxdy648fb8im953bw7ql";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
+ preConfigure = ''
+ aclocal \
+ && autoheader \
+ && automake --gnu --add-missing \
+ && autoconf
+ '';
+
meta = {
description = "General-purpose software audio FSK modem";
longDescription = ''
@@ -28,3 +39,4 @@ stdenv.mkDerivation rec {
maintainers = with stdenv.lib.maintainers; [ relrod ];
};
}
+
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 6d353344b07f..f511fa659149 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, libid3tag, libmad
-, libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig
-, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
+{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2
+, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
+, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
, taglib, vampSDK
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- chromaprint fftw flac libid3tag libmad libopus libshout libsndfile
+ chromaprint fftw flac faad2 mp4v2 libid3tag libmad libopus libshout libsndfile
libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
rubberband scons sqlite taglib vampSDK
];
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
sconsFlags = [
"build=release"
"qtdir=${qt4}"
+ "faad=1"
];
buildPhase = ''
diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix
index a18372870795..c66f78373228 100644
--- a/pkgs/applications/audio/mod-distortion/default.nix
+++ b/pkgs/applications/audio/mod-distortion/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, lv2 }:
stdenv.mkDerivation rec {
- name = "mod-distortion-${version}";
- version = "git-2015-05-18";
+ name = "mod-distortion-git-${version}";
+ version = "2016-08-19";
src = fetchFromGitHub {
owner = "portalmod";
repo = "mod-distortion";
- rev = "0cdf186abc2a9275890b57057faf5c3f6d86d84a";
- sha256 = "1wmxgpcdcy9m7j78yq85824if0wz49wv7mw13bj3sw2s87dcmw19";
+ rev = "e672d5feb9d631798e3d56eb96e8958c3d2c6821";
+ sha256 = "005wdkbhn9dgjqv019cwnziqg86yryc5vh7j5qayrzh9v446dw34";
};
buildInputs = [ lv2 ];
- installFlags = [ "LV2_PATH=$(out)/lib/lv2" ];
+ installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ];
meta = with stdenv.lib; {
homepage = https://github.com/portalmod/mod-distortion;
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix
index d1c6ed6379a8..55f3a667e06f 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/pkgs/applications/audio/monkeys-audio/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
platforms = platforms.linux;
- maintainers = [ maintainers.mornfall ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index c486ff3de605..cb99f9b5dbe5 100644
--- a/pkgs/applications/audio/mopidy-iris/default.nix
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -1,23 +1,26 @@
{ stdenv, pythonPackages, mopidy, mopidy-local-images }:
pythonPackages.buildPythonApplication rec {
- name = "mopidy-iris-${version}";
- version = "3.8.2";
+ pname = "Mopidy-Iris";
+ version = "3.14.0";
src = pythonPackages.fetchPypi {
- inherit version;
- pname = "Mopidy-Iris";
- sha256 = "051bzs8p2zz960mi9cmv51q1fmmm15nnb9apph9icicr0p8g7lif";
+ inherit pname version;
+ sha256 = "2c0ec5138e554e91d299ac72a7049bc00d77770a08c16c17e1a9df7f8ef42feb";
};
propagatedBuildInputs = [
mopidy
mopidy-local-images
- pythonPackages.configobj
- pythonPackages.pylast
- pythonPackages.spotipy
- pythonPackages.raven
- ];
+ ] ++ (with pythonPackages; [
+ configobj
+ pylast
+ spotipy
+ raven
+ ]);
+
+ # no tests implemented
+ doCheck = false;
meta = with stdenv.lib; {
homepage = https://github.com/jaedb/Iris;
diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix
index b09db88bbcb0..063821544aed 100644
--- a/pkgs/applications/audio/mopidy-local-images/default.nix
+++ b/pkgs/applications/audio/mopidy-local-images/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
+{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-local-images-${version}";
@@ -12,6 +12,12 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d";
};
+ buildInputs = [ gobjectIntrospection ];
+
+ checkInputs = [
+ pythonPackages.mock
+ ];
+
propagatedBuildInputs = [
mopidy
pythonPackages.pykka
diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix
index c8afd4c6290f..3754bf763b20 100644
--- a/pkgs/applications/audio/mopidy-moped/default.nix
+++ b/pkgs/applications/audio/mopidy-moped/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchurl, pythonPackages, mopidy, glibcLocales }:
+{ stdenv, pythonPackages, mopidy, glibcLocales }:
pythonPackages.buildPythonApplication rec {
- name = "mopidy-moped-${version}";
- version = "0.6.0";
+ pname = "Mopidy-Moped";
+ version = "0.7.1";
- src = fetchurl {
- url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz";
- sha256 = "0xff8y1kc7rwwsd7ppgbvywf6i8lchjwbxjisfl1kmilwsb166yr";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4";
};
LC_ALL = "en_US.UTF-8";
buildInputs = [ glibcLocales ];
propagatedBuildInputs = [ mopidy ];
+ # no tests implemented
doCheck = false;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix
index 0cb076556c70..d55e711cf330 100644
--- a/pkgs/applications/audio/mopidy-mopify/default.nix
+++ b/pkgs/applications/audio/mopidy-mopify/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec {
- name = "mopidy-mopify-${version}";
+ pname = "Mopidy-Mopify";
+ version = "1.6.1";
- version = "1.5.17";
-
- src = fetchurl {
- url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz";
- sha256 = "1qi7f5i87ygn486gxc84njl22y84xrwabpz58y5a1hw7z1lp7l8s";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "93ad2b3d38b1450c8f2698bb908b0b077a96b3f64cdd6486519e518132e23a5c";
};
propagatedBuildInputs = with pythonPackages; [ mopidy configobj ];
+ # no tests implemented
doCheck = false;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 7de8f6941c2b..ad280d382d02 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook
-, gst_all_1, glib_networking, gobjectIntrospection
+, gst_all_1, glib-networking, gobjectIntrospection
}:
pythonPackages.buildPythonApplication rec {
@@ -18,12 +18,12 @@ pythonPackages.buildPythonApplication rec {
buildInputs = with gst_all_1; [
gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
- glib_networking gobjectIntrospection
+ glib-networking gobjectIntrospection
];
propagatedBuildInputs = with pythonPackages; [
- gst-python pygobject3 pykka tornado requests dbus-python
- ];
+ gst-python pygobject3 pykka tornado requests
+ ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
# There are no tests
doCheck = false;
@@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec {
'';
meta = with stdenv.lib; {
- homepage = http://www.mopidy.com/;
+ homepage = https://www.mopidy.com/;
description = ''
An extensible music server that plays music from local disk, Spotify,
SoundCloud, Google Play Music, and more
diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix
new file mode 100644
index 000000000000..ed7a4e786f07
--- /dev/null
+++ b/pkgs/applications/audio/mp3blaster/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, ncurses, libvorbis }:
+stdenv.mkDerivation rec {
+
+ version = "3.2.6";
+
+ name = "mp3blaster-${version}";
+
+ src = fetchFromGitHub {
+ owner = "stragulus";
+ repo = "mp3blaster";
+ rev = "v${version}";
+ sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs";
+ };
+
+ buildInputs = [
+ ncurses
+ libvorbis
+ ];
+
+ buildFlags = [ "CXXFLAGS=-Wno-narrowing" ];
+
+ meta = with stdenv.lib; {
+ description = "An audio player for the text console";
+ homepage = http://www.mp3blaster.org/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ earldouglas ];
+ platforms = platforms.all;
+ };
+
+}
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 73352b650921..220e72b568af 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A minimalist command line interface to MPD";
- homepage = http://www.musicpd.org/clients/mpc/;
+ homepage = https://www.musicpd.org/clients/mpc/;
license = licenses.gpl2;
maintainers = with maintainers; [ algorith ];
platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 1e0b46826cf0..1b30399ae0a5 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "mpg123-1.25.7";
+ name = "mpg123-1.25.8";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
- sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i";
+ sha256 = "16s9z1xc5kv1p90g42vsr9m4gq3dwjsmrj873x4i8601mvpm3nkr";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 9d6f2fc9c8f9..f56ca009f1e0 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Music notation and composition software";
- homepage = http://musescore.org/;
+ homepage = https://musescore.org/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.vandenoever ];
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index 09c718c63e92..93e909fc604b 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "ncmpc-${version}";
- version = "0.28";
+ version = "0.29";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
- sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n";
+ sha256 = "1b2kbx2phbf4s2qpy7mx72c87xranljr0yam6z9m1i1kvcnp8q1q";
};
buildInputs = [ glib ncurses mpd_clientlib ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Curses-based interface for MPD (music player daemon)";
- homepage = http://www.musicpd.org/clients/ncmpc/;
+ homepage = https://www.musicpd.org/clients/ncmpc/;
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ fpletz ];
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index 4452ab23cd5e..10c3bb2a195d 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
description = "A featureful ncurses based MPD client inspired by ncmpc";
homepage = https://ncmpcpp.rybczak.net/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ];
+ maintainers = with maintainers; [ jfrankenau koral lovek323 ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix
new file mode 100644
index 000000000000..c3449ed3a4f4
--- /dev/null
+++ b/pkgs/applications/audio/ncpamixer/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkgconfig }:
+
+stdenv.mkDerivation rec {
+
+ name = "ncpamixer-${version}";
+ version = "1.2";
+
+ src = fetchFromGitHub {
+ owner = "fulhax";
+ repo = "ncpamixer";
+ rev = version;
+ sha256 = "01kvd0pg5yraymlln5xdzqj1r6adxfvvza84wxn2481kcxfral54";
+ };
+
+ buildInputs = [ ncurses libpulseaudio ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ configurePhase = ''
+ make PREFIX=$out build/Makefile
+ '';
+
+ buildPhase = ''
+ make build
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An ncurses mixer for PulseAudio inspired by pavucontrol";
+ homepage = https://github.com/fulhax/ncpamixer;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ StijnDW ];
+ };
+}
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 3b429290f7c8..c28c711d618e 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
name = "non-${version}";
- version = "2017-03-29";
+ version = "2018-02-15";
src = fetchFromGitHub {
owner = "original-male";
repo = "non";
- rev = "10c31e57291b6e42be53371567a722b62b32d220";
- sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx";
+ rev = "5ae43bb27c42387052a73e5ffc5d33efb9d946a9";
+ sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix
index ad4a06cff994..a727160ff299 100644
--- a/pkgs/applications/audio/normalize/default.nix
+++ b/pkgs/applications/audio/normalize/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, libmad }:
stdenv.mkDerivation rec {
name = "normalize-${version}";
version = "0.7.7";
src = fetchurl {
- url = "mirror://savannah/normalize/normalize-0.7.7.tar.gz";
+ url = "mirror://savannah/normalize/${name}.tar.gz";
sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0";
};
+ buildInputs = [ libmad ];
+
meta = with stdenv.lib; {
homepage = http://normalize.nongnu.org/;
description = "Audio file normalizer";
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
index 8a7ab8889a66..d864d5972bce 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }:
stdenv.mkDerivation rec {
- name = "opusfile-0.8";
+ name = "opusfile-0.10";
src = fetchurl {
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
- sha256 = "192mp2jgn5s9815h31ybzsfipmbppmdhwx1dymrk26xarz9iw8rc";
+ sha256 = "0bs1376sd131qdh7198jp64vv5d17az5wyy4y7srrvw7p8k3bq28";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index 820ff385c107..779374aaa080 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "padthv1-${version}";
- version = "0.8.4";
+ version = "0.8.6";
src = fetchurl {
url = "mirror://sourceforge/padthv1/${name}.tar.gz";
- sha256 = "1p6wfgh90h7gj1j3hlvwik3zj07xamkxbya85va2lsj6fkkkk20r";
+ sha256 = "1mikab2f9n5q1sfgnp3sbm1rf3v57k4085lsgh0a5gzga2h4hwxq";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix
index dbf3cd92b5d0..cc4a781ef66c 100644
--- a/pkgs/applications/audio/pamix/default.nix
+++ b/pkgs/applications/audio/pamix/default.nix
@@ -1,19 +1,23 @@
{ stdenv, fetchFromGitHub
-, autoreconfHook, autoconf-archive, pkgconfig
+, pkgconfig, cmake
, libpulseaudio, ncurses }:
stdenv.mkDerivation rec {
name = "pamix-${version}";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
owner = "patroclos";
repo = "pamix";
rev = version;
- sha256 = "1d6b0iv8p73bwq88kdaanm4igvmp9rkq082vyaxpc67mz398yjbp";
+ sha256 = "1d44ggnwkf2gff62959pj45v3a2k091q8v154wc5pmzamam458wp";
};
- nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ];
+ preConfigure = ''
+ substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg"
+ '';
+
+ nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libpulseaudio ncurses ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index fa25a474c1df..322a4e238461 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -1,15 +1,22 @@
-{ stdenv, fetchurl, boost, libpulseaudio }:
+{ stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }:
stdenv.mkDerivation rec {
-
name = "pamixer-${version}";
- version = "1.3";
+ version = "1.3.1";
- src = fetchurl {
- url = "https://github.com/cdemoulins/pamixer/archive/${version}.tar.gz";
- sha256 = "091676ww4jbf4jr728gjfk7fkd5nisy70mr6f3s1p7n05hjpmfjx";
+ src = fetchFromGitHub {
+ owner = "cdemoulins";
+ repo = "pamixer";
+ rev = version;
+ sha256 = "15zs2x4hnrpxphqn542b6qqm4ymvhkvbcfyffy69d6cki51chzzw";
};
+ # Remove after https://github.com/cdemoulins/pamixer/pull/16 gets fixed
+ patches = [(fetchpatch {
+ url = "https://github.com/oxij/pamixer/commit/dea1cd967aa837940e5c0b04ef7ebc47a7a93d63.patch";
+ sha256 = "0s77xmsiwywyyp6f4bjxg1sqdgms1k5fiy7na6ws0aswshfnzfjb";
+ })];
+
buildInputs = [ boost libpulseaudio ];
installPhase = ''
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index f21c171ef609..fe9ed12390a5 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm2, libglademm
-, dbus_glib, GConf, gconfmm, intltool }:
+{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm
+, dbus-glib, GConf, gconfmm, intltool }:
stdenv.mkDerivation rec {
name = "paprefs-0.9.10";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
};
- buildInputs = [ libpulseaudio gtkmm2 libglademm dbus_glib gconfmm ];
+ buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ];
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix
index 91a270a698e6..8425b48166e6 100644
--- a/pkgs/applications/audio/patchage/default.nix
+++ b/pkgs/applications/audio/patchage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm
+{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm
, gtkmm2, libjack2, pkgconfig, python2
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2
+ alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2
pkgconfig python2
];
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 69db9d74ee34..d113b8a49b31 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3
-, libcanberra_gtk3, makeWrapper, gnome3 }:
+, libcanberra-gtk3, makeWrapper, gnome3 }:
stdenv.mkDerivation rec {
name = "pavucontrol-3.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
'';
- buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper
+ buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper
gnome3.defaultIconTheme ];
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
index e4ec281cacb8..ae43bad5b2c2 100644
--- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix
+++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
@@ -1,32 +1,26 @@
-{ stdenv, fetchurl, puredata }:
+{ stdenv, fetchFromGitHub, puredata }:
stdenv.mkDerivation rec {
name = "cyclone-${version}";
- version = "0.1-alpha55";
+ version = "0.3beta-2";
- src = fetchurl {
- url = "mirror://sourceforge/project/pure-data/libraries/cyclone/${name}.tar.gz";
- sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i";
+ src = fetchFromGitHub {
+ owner = "porres";
+ repo = "pd-cyclone";
+ rev = "cyclone${version}";
+ sha256 = "192jrq3bdsv626js1ymq10gwp9wwcszjs63ys6ap9ig8xdkbhr3q";
};
buildInputs = [ puredata ];
- hardeningDisable = [ "format" ];
+ makeFlags = [
+ "pdincludepath=${puredata}/include/pd"
+ "prefix=$(out)"
+ ];
- patchPhase = ''
- for file in `grep -r -l g_canvas.h`
- do
- sed -i 's|#include "g_canvas.h"|#include "${puredata}/include/pd/g_canvas.h"|g' $file
- done
- for file in `grep -r -l m_imp.h`
- do
- sed -i 's|#include "m_imp.h"|#include "${puredata}/include/pd/m_imp.h"|g' $file
- done
- '';
-
- installPhase = ''
- mkdir -p $out/cyclone
- cp -r bin/* $out/cyclone
+ postInstall = ''
+ mv "$out/lib/pd-externals/cyclone" "$out/"
+ rm -rf $out/lib
'';
meta = {
diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
index 3b836d9eb330..0eb75d77c68c 100644
--- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix
+++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
@@ -1,28 +1,26 @@
-{ stdenv, fetchurl, puredata }:
+{ stdenv, fetchFromGitHub, puredata }:
stdenv.mkDerivation rec {
name = "maxlib-${version}";
- version = "1.5.5";
+ version = "1.5.7";
- src = fetchurl {
- url = "mirror://sourceforge/project/pure-data/libraries/maxlib/${name}.tar.gz";
- sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w";
+ src = fetchFromGitHub {
+ owner = "electrickery";
+ repo = "pd-maxlib";
+ rev = "v${version}";
+ sha256 = "10w9qfgn26lj3zqjksf2r1wsjpf5xy4dx22jay9l6idy9q62mxsn";
};
buildInputs = [ puredata ];
hardeningDisable = [ "format" ];
- patchPhase = ''
- for i in ${puredata}/include/pd/*; do
- ln -s $i .
- done
- sed -i "s@/usr@$out@g" Makefile
- '';
+ makeFlags = [ "prefix=$(out)" ];
postInstall = ''
- mv $out/local/lib/pd-externals/maxlib/ $out
+ mv $out/lib/pd-externals/maxlib/ $out
rm -rf $out/local/
+ rm -rf $out/lib/
'';
meta = {
diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
index f8a25256bb07..f2e54b327fce 100644
--- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix
+++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
@@ -1,30 +1,40 @@
-{ stdenv, fetchurl, unzip, puredata }:
+{ stdenv, fetchurl, unzip, puredata, fftw }:
stdenv.mkDerivation rec {
- version = "0.6.0";
+ version = "0.7.0";
name = "timbreid-${version}";
src = fetchurl {
url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip";
- sha256 = "02rnkb0vpjxrr60c3hryv7zhyjpci2mi9dk27kjxpj5zp26gjk0p";
+ sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b";
};
- buildInputs = [ unzip puredata ];
+ buildInputs = [ unzip puredata fftw ];
unpackPhase = ''
+ mkdir source
+ cd source
unzip $src
- mv timbreID-0.6.0-src/tID/* .
- rm -rf timbreID-0.6.0-src/tID/
- rm -rf timbreID-0.6.0-src/INSTALL.txt
'';
+ buildPhase = ''
+ make tIDLib.o all
+ '';
+
installPhase = ''
mkdir -p $out/
cp -r *.pd $out/
cp -r *.pd_linux $out/
- cp -r *.wav $out/
+ cp -r audio/ $out/
+ cp -r data/ $out/
+ cp -r doc/ $out/
'';
+ postFixup = ''
+ mv $out/share/doc/ $out/
+ rm -rf $out/share/
+ '';
+
meta = {
description = "A collection of audio feature analysis externals for puredata";
homepage = http://williambrent.conflations.com/pages/research.html;
diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index 67848cdc804b..d013a26277e8 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, cmake, mesa, makeWrapper, qt4 }:
+{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }:
stdenv.mkDerivation rec {
name = "pianobooster-${version}";
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
preConfigure = "cd src";
- buildInputs = [ alsaLib cmake makeWrapper mesa qt4 ];
+ buildInputs = [ alsaLib cmake makeWrapper libGLU_combined qt4 ];
postInstall = ''
wrapProgram $out/bin/pianobooster \
- --prefix LD_LIBRARY_PATH : ${mesa}/lib
+ --prefix LD_LIBRARY_PATH : ${libGLU_combined}/lib
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 66f68c066c88..677c60399e52 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,7 +1,7 @@
{ stdenv, python2Packages, fetchurl, gettext, chromaprint }:
let
- version = "1.4";
+ version = "1.4.2";
pythonPackages = python2Packages;
in pythonPackages.buildPythonApplication {
name = "picard-${version}";
@@ -9,7 +9,7 @@ in pythonPackages.buildPythonApplication {
src = fetchurl {
url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz";
- sha256 = "0gi7f1h7jcg7n18cx8iw38sd868viv3w377xmi7cq98f1g76d4h6";
+ sha256 = "0d12k40d9fbcn801gp5zdsgvjdrh4g97vda3ga16rmmvfwwfxbgh";
};
buildInputs = [ gettext ];
diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix
new file mode 100644
index 000000000000..9f51d3008259
--- /dev/null
+++ b/pkgs/applications/audio/pmidi/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, alsaLib
+, version ? "1.7.1"
+, sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055"
+}:
+stdenv.mkDerivation {
+ name = "pmidi-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz";
+ sha256 = sourceSha256;
+ };
+
+ buildInputs = [ alsaLib ];
+
+ meta = with stdenv.lib; {
+ homepage = http://www.parabola.me.uk/alsa/pmidi.html;
+ description = "A straightforward command line program to play midi files through the ALSA sequencer";
+ maintainers = with maintainers; [ lheckemann ];
+ license = licenses.gpl2;
+ };
+}
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index 2bb2960afbf1..94b240ebb028 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "praat-${version}";
- version = "5.4.17";
+ version = "6.0.37";
src = fetchurl {
url = "https://github.com/praat/praat/archive/v${version}.tar.gz";
- sha256 = "0s2hrksghg686059vc90h3ywhd2702pqcvy99icw27q5mdk6dqsx";
+ sha256 = "1c675jfzcrwfn8lcswm5y5kmazkhnb0p4mzlf5sim57hms88ffjq";
};
configurePhase = ''
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix
new file mode 100644
index 000000000000..72af8aff106b
--- /dev/null
+++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -0,0 +1,50 @@
+{ fetchFromGitHub, stdenv, pythonPackages
+, mp3Support ? true, lame ? null
+, opusSupport ? true, opusTools ? null
+, faacSupport ? false, faac ? null
+, flacSupport ? true, flac ? null
+, soxSupport ? true, sox ? null
+, vorbisSupport ? true, vorbisTools ? null
+}:
+
+assert mp3Support -> lame != null;
+assert opusSupport -> opusTools != null;
+assert faacSupport -> faac != null;
+assert flacSupport -> flac != null;
+assert soxSupport -> sox != null;
+assert vorbisSupport -> vorbisTools != null;
+
+pythonPackages.buildPythonApplication rec {
+ pname = "pulseaudio-dlna";
+ version = "2017-11-01";
+
+ src = fetchFromGitHub {
+ owner = "masmu";
+ repo = "pulseaudio-dlna";
+ rev = "4472928dd23f274193f14289f59daec411023ab0";
+ sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk";
+ };
+
+ # pulseaudio-dlna has no tests
+ doCheck = false;
+
+ propagatedBuildInputs = with pythonPackages; [
+ dbus-python docopt requests setproctitle protobuf psutil futures
+ chardet notify2 netifaces pyroute2 pygobject2 lxml zeroconf ]
+ ++ stdenv.lib.optional mp3Support lame
+ ++ stdenv.lib.optional opusSupport opusTools
+ ++ stdenv.lib.optional faacSupport faac
+ ++ stdenv.lib.optional flacSupport flac
+ ++ stdenv.lib.optional soxSupport sox
+ ++ stdenv.lib.optional vorbisSupport vorbisTools;
+
+ meta = with stdenv.lib; {
+ description = "A lightweight streaming server which brings DLNA / UPNP and Chromecast support to PulseAudio and Linux";
+ homepage = https://github.com/masmu/pulseaudio-dlna;
+
+ license = licenses.gpl3Plus;
+
+ maintainers = with maintainers; [ mog ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index daa017d1ccbd..73f50e45d3df 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -1,30 +1,31 @@
{ stdenv, fetchurl, autoreconfHook, gettext, makeWrapper
-, alsaLib, libjack2, tk
+, alsaLib, libjack2, tk, fftw
}:
stdenv.mkDerivation rec {
name = "puredata-${version}";
- version = "0.47-1";
+ version = "0.48-0";
src = fetchurl {
url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
- sha256 = "0k5s949kqd7yw97h3m8z81bjz32bis9m4ih8df1z0ymipnafca67";
+ sha256 = "0wy9kl2v00fl27x4mfzhbca415hpaisp6ls8a6mkl01qbw20krny";
};
- patchPhase = ''
- rm portaudio/configure.in
- '';
-
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
- buildInputs = [ alsaLib libjack2 ];
+ buildInputs = [ alsaLib libjack2 fftw ];
configureFlags = ''
--enable-alsa
--enable-jack
+ --enable-fftw
--disable-portaudio
+
'';
+ # https://github.com/pure-data/pure-data/issues/188
+ # --disable-oss
+
postInstall = ''
wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin
'';
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index c5a977d741a7..925078fb3a15 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec {
- version = "0.4.5";
+ version = "0.5.0";
name = "qjackctl-${version}";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
- sha256 = "1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5";
+ sha256 = "0lx81dfwanc10vrny1vzi0wx73ph82dlz99ffjzsigj3cqzz6x4s";
};
buildInputs = [
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 132e4a0fca28..831a30bc4fe2 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
stdenv.mkDerivation rec {
- version = "0.4.3";
+ version = "0.5.0";
name = "qmidinet-${version}";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
- sha256 = "1qhxhlvi6bj2a06i48pw81zf5vd36idxbq04g30794yhqcimh6vw";
+ sha256 = "0nxbvjgx11ljy1nxqknyq7pla55ky2ybi1jbisvq2cqxa34jsxf6";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix
index 1e76e769937b..7f5191a02c20 100644
--- a/pkgs/applications/audio/qmidiroute/default.nix
+++ b/pkgs/applications/audio/qmidiroute/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, qt4, alsaLib }:
stdenv.mkDerivation rec {
- version = "0.3.0";
+ version = "0.4.0";
name = "qmidiroute-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz";
- sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2";
+ sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 77c82f1737c6..6b816cdeec10 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
# handle that.
stdenv.mkDerivation rec {
- name = "qmmp-1.1.10";
+ name = "qmmp-1.2.0";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
- sha256 = "16hb3s48filq0q18m7x9vmhpirk4fh0aqj8kwbapv8mkcnzq2mqy";
+ sha256 = "17kci7srgbkk62dgxlmg3lv2y7z04jsinpgx6jmxjpnpblpcj840";
};
buildInputs =
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 1211570f9bc5..518fef0c4f5e 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchsvn, autoconf, automake, liblscp, libtool, pkgconfig
-, qt4 }:
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools
+, liblscp, libgig, qtbase }:
stdenv.mkDerivation rec {
- name = "qsampler-svn-${version}";
- version = "2342";
+ name = "qsampler-${version}";
+ version = "0.5.0";
- src = fetchsvn {
- url = "https://svn.linuxsampler.org/svn/qsampler/trunk";
- rev = "${version}";
- sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx";
+ src = fetchurl {
+ url = "mirror://sourceforge/qsampler/${name}.tar.gz";
+ sha256 = "0kn1mv31ygjjsric03pkbv7r8kg3bri9ldx2ajc9pyx0p8ggnbmc";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ autoconf automake liblscp libtool qt4 ];
+ nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];
+ buildInputs = [ liblscp libgig qtbase ];
preConfigure = "make -f Makefile.svn";
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org;
description = "Graphical frontend to LinuxSampler";
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 49d9e80be117..71f41f87009e 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -1,21 +1,31 @@
-{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt4 }:
+{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qtbase, qttools, qtx11extras, cmake, pkgconfig }:
stdenv.mkDerivation rec {
name = "qsynth-${version}";
- version = "0.3.9";
+ version = "0.5.0";
src = fetchurl {
url = "mirror://sourceforge/qsynth/${name}.tar.gz";
- sha256 = "08kyn6cl755l9i1grzjx8yi3f8mgiz4gx0hgqad1n0d8yz85087b";
+ sha256 = "1sr6vrz8z9r99j9xcix86lgcqldragb2ajmq1bnhr58d99sda584";
};
- buildInputs = [ alsaLib fluidsynth libjack2 qt4 ];
+ # cmake is looking for qsynth.desktop.in and fails if it doesn't find it
+ # seems like a bug and can presumable go in the next version after 0.5.0
+ postPatch = ''
+ mv src/qsynth.desktop src/qsynth.desktop.in
+ '';
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Fluidsynth GUI";
homepage = https://sourceforge.net/projects/qsynth;
license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ goibhniu ];
platforms = platforms.linux;
- maintainers = [ maintainers.goibhniu ];
};
}
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index 4bc9371dd17b..60c8f90b6d15 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
, cmake, pkgconfig
# Transport
, curl
@@ -11,10 +11,11 @@
, dbus
, glibmm
, gnome3
-, hicolor_icon_theme
+, hicolor-icon-theme
, libappindicator-gtk3
, libnotify
, libxdg_basedir
+, wxGTK
# GStreamer
, gst_all_1
# User-agent info
@@ -39,13 +40,13 @@ let
in
stdenv.mkDerivation rec {
name = "radiotray-ng-${version}";
- version = "0.1.7";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "ebruck";
repo = "radiotray-ng";
rev = "v${version}";
- sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv";
+ sha256 = "0hqg6vn8hv5pic96klf1d9vj8fibrgiqnqb5vwrg3wvakx0y32kr";
};
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
@@ -53,27 +54,27 @@ stdenv.mkDerivation rec {
buildInputs = [
curl
boost jsoncpp libbsd pcre
- glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify
+ glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify
libxdg_basedir
lsb-release
+ wxGTK
] ++ stdenv.lib.optional doCheck gmock
++ gstInputs
++ pythonInputs;
prePatch = ''
- substituteInPlace debian/CMakeLists.txt \
- --replace /usr $out
- substituteInPlace include/radiotray-ng/common.hpp \
- --replace /usr $out
+ for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do
+ substituteInPlace $x --replace /usr $out
+ done
+
+ # We don't find the radiotray-ng-notification icon otherwise
+ substituteInPlace data/radiotray-ng.desktop \
+ --replace radiotray-ng-notification radiotray-ng-on
+ substituteInPlace data/rtng-bookmark-editor.desktop \
+ --replace radiotray-ng-notification radiotray-ng-on
'';
- patches = [
- (fetchpatch {
- # Fix menu separators and minor touchup to 'version'
- url = "https://github.com/ebruck/radiotray-ng/commit/827e9f1baaa03ab4d8a5fb3aab043e72950eb965.patch";
- sha256 = "1aykl6lq4pga34xg5r9mc616gxnd63q6gr8qzg57w6874cj3csrr";
- })
- ];
+ cmakeFlags = stdenv.lib.optional doCheck "-DBUILD_TESTS=ON";
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
new file mode 100644
index 000000000000..65cb7dab34a1
--- /dev/null
+++ b/pkgs/applications/audio/rhvoice/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, lib, pkgconfig, fetchFromGitHub, scons, python, glibmm, libpulseaudio, libao
+}:
+
+let
+ version = "unstable-2018-02-10";
+in stdenv.mkDerivation rec {
+ name = "rhvoice-${version}";
+
+ src = fetchFromGitHub {
+ owner = "Olga-Yakovleva";
+ repo = "RHVoice";
+ rev = "7a25a881b0465e47a12d8029b56f3b71a1d02312";
+ sha256 = "1gkrlmv7msh9qlm0gkjqpl9gswghpclfdwszr1p85v8vk6m63v0b";
+ };
+
+ nativeBuildInputs = [
+ scons pkgconfig
+ ];
+
+ buildInputs = [
+ python glibmm libpulseaudio libao
+ ];
+
+ # SConstruct patch
+ # Scons creates an independent environment that assumes standard POSIX paths.
+ # The patch is needed to push the nix environment.
+ # - PATH
+ # - PKG_CONFIG_PATH, to find available (sound) libraries
+ # - RPATH, to link to the newly built libraries
+
+ patches = [ ./honor_nix_environment.patch ];
+
+ buildPhase = ''
+ scons prefix=$out
+ '';
+
+ installPhase = ''
+ scons install
+ '';
+
+ meta = {
+ description = "A free and open source speech synthesizer for Russian language and others";
+ homepage = https://github.com/Olga-Yakovleva/RHVoice/wiki;
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [ berce ];
+ platforms = with lib.platforms; all;
+ };
+}
diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
new file mode 100644
index 000000000000..ed180c92debc
--- /dev/null
+++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
@@ -0,0 +1,14 @@
+diff --git a/SConstruct b/SConstruct
+index 2421399..ba39254 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -147,6 +147,9 @@ def create_base_env(vars):
+ env_args["package_name"]="RHVoice"
+ env_args["CPPDEFINES"]=[("RHVOICE","1")]
+ env=Environment(**env_args)
++ env.PrependENVPath("PATH", os.environ["PATH"])
++ env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"]
++ env["RPATH"]=env["libdir"]
+ env["package_version"]=get_version(env["release"])
+ env.Append(CPPDEFINES=("PACKAGE",env.subst(r'\"$package_name\"')))
+ env.Append(CPPDEFINES=("VERSION",env.subst(r'\"$package_version\"')))
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index 534fd2f0edb1..a23324c7fdac 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -7,36 +7,35 @@
, libsoup
, gnome3
, tdb
-, json_glib
+, json-glib
, itstool
, wrapGAppsHook
, gst_all_1
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
}:
let
- version = "${major}.${minor}";
- major = "3.2";
- minor = "1";
-
+ pname = "rhythmbox";
+ version = "3.4.2";
in stdenv.mkDerivation rec {
- name = "rhythmbox-${version}";
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/rhythmbox/${major}/${name}.tar.xz";
- sha256 = "0f3radhlji7rxl760yl2vm49fvfslympxrpm8497acbmbd7wlhxz";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [
+ pkgconfig
+ intltool perl perlPackages.XMLParser
+ itstool
+ wrapGAppsHook
+ ];
+
buildInputs = [
python3
- perl
- perlPackages.XMLParser
-
- intltool
libsoup
tdb
- json_glib
- itstool
+ json-glib
gtk3
gnome3.libpeas
@@ -45,12 +44,17 @@ in stdenv.mkDerivation rec {
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
-
- wrapGAppsHook
] ++ gst_plugins;
enableParallelBuilding = true;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ versionPolicy = "none";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Rhythmbox;
description = "A music playing application for GNOME";
diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix
index 3ebdce2b4820..28a69d5a3b76 100644
--- a/pkgs/applications/audio/rkrlv2/default.nix
+++ b/pkgs/applications/audio/rkrlv2/default.nix
@@ -4,13 +4,13 @@ automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile
stdenv.mkDerivation rec {
repo = "rkrlv2";
- name = "${repo}-b1.0";
+ name = "${repo}-b2.0";
src = fetchFromGitHub {
owner = "ssj71";
inherit repo;
- rev = "a315f5aefe63be7e34663596b8b050410a9b7e72";
- sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";
+ rev = "beta_2";
+ sha256 = "128jcilbrd1l65c01w2bazsb21x78mng0jjkhi3x9crf1n9qbh2m";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 5966d4253f51..d881afa7f5f0 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -3,12 +3,12 @@
, liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
stdenv.mkDerivation (rec {
- version = "17.04";
+ version = "17.12.1";
name = "rosegarden-${version}";
src = fetchurl {
url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
- sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq";
+ sha256 = "155kqbxg85wqv0w97cmmx8wq0r4xb3qpnk20lfma04vj8k6hc1mg";
};
patchPhase = ''
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 1eb366d6bbd9..c2c24c29a13e 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "samplv1-${version}";
- version = "0.8.4";
+ version = "0.8.6";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
- sha256 = "107p2xsj066q2bil0xcgqrrn7lawp02wzf7qmlajcbnd79jhsi6i";
+ sha256 = "035bq7yfg1yirsqk63zwkzjw9dxl52lrzq9y0w7nga0vb11xdfij";
};
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix
new file mode 100644
index 000000000000..1bf1a8b2c49e
--- /dev/null
+++ b/pkgs/applications/audio/sayonara/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, cmake, qt5, zlib, taglib, pkgconfig, pcre, gst_all_1 }:
+
+let
+ version = "1.0.0-git5-20180115";
+in
+stdenv.mkDerivation {
+ name = "sayonara-player-${version}";
+
+ src = fetchurl {
+ url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz";
+ sha256 = "1fl7zplnrrvbv1xm4g348bpd46jj39jvbm808hyjjq92i64wqg37";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = with qt5; with gst_all_1;
+ [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly
+ pcre qtbase qttools taglib zlib
+ ];
+
+ # CMake Error at src/GUI/Resources/Icons/cmake_install.cmake:49 (file):
+ # file cannot create directory: /usr/share/icons. Maybe need administrative
+ # privileges.
+ # Call Stack (most recent call first):
+ # src/GUI/Resources/cmake_install.cmake:50 (include)
+ # src/GUI/cmake_install.cmake:50 (include)
+ # src/cmake_install.cmake:59 (include)
+ # cmake_install.cmake:42 (include)
+ postPatch = ''
+ substituteInPlace src/GUI/Resources/Icons/CMakeLists.txt \
+ --replace "/usr/share" "$out/share"
+ '';
+
+ # [ 65%] Building CXX object src/Components/Engine/CMakeFiles/say_comp_engine.dir/AbstractPipeline.cpp.o
+ # /tmp/nix-build-sayonara-player-1.0.0-git5-20180115.drv-0/sayonara-player/src/Components/Engine/AbstractPipeline.cpp:28:32: fatal error: gst/app/gstappsink.h: No such file or directory
+ # #include
+ NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
+
+ meta = with stdenv.lib;
+ { description = "Sayonara music player";
+ homepage = https://sayonara-player.com/;
+ license = licenses.gpl3;
+ platforms = qt5.qtbase.meta.platforms;
+ maintainers = [ maintainers.deepfire ];
+ };
+}
diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index 2b2fd161ede3..22786304faa9 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -9,10 +9,17 @@ stdenv.mkDerivation rec {
sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii";
};
+ preConfigure = ''
+ # Build fails on Linux with windres.
+ export ac_cv_prog_ac_ct_WINDRES=
+ '';
+
configureFlags = "--enable-dependency-tracking";
buildInputs = [ alsaLib python SDL ];
+ enableParallelBuilding = true;
+
meta = {
description = "Music tracker application, free reimplementation of Impulse Tracker";
homepage = http://schismtracker.org/;
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix
index ebeef301e103..11ee00adc887 100644
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/pkgs/applications/audio/seq24/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = http://www.filter24.org/seq24;
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ goibhniu nckx ];
+ maintainers = with maintainers; [ goibhniu ];
};
}
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 0eaa9bde14f6..4d8435454239 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, alsaLib, freetype, ftgl, libjack2, libX11, lv2
-, mesa, pkgconfig, ttf_bitstream_vera
+, libGLU_combined, pkgconfig, ttf_bitstream_vera
}:
stdenv.mkDerivation rec {
name = "setbfree-${version}";
- version = "0.8.0";
+ version = "0.8.5";
src = fetchurl {
url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz";
- sha256 = "1lfylai4gyk512dknj16w2aq9ka8hvqca46nmq5b4rfjmi6dkxf6";
+ sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4";
};
patchPhase = ''
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- alsaLib freetype ftgl libjack2 libX11 lv2 mesa
+ alsaLib freetype ftgl libjack2 libX11 lv2 libGLU_combined
ttf_bitstream_vera
];
diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix
index a60c3bef0daa..32cfd0f74940 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, mesa, cairo, pango, libjack2 }:
+{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU_combined, 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 mesa ];
+ buildInputs = [ lv2 pango cairo libjack2 libGLU_combined ];
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 1932ec3d93bc..3fe8ecfe5468 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "snd-17.8";
+ name = "snd-18.1";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
- sha256 = "161bx2xgz692iqmsmhv9yi8rvd7y31si4rniizwirwz7q4y4vwvf";
+ sha256 = "0wdifvpm54j5fxxp867jnrfdy3jb8iff2mxqvp08plp45zfjv6xh";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index e91c08c30b77..1afb36571bd9 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -19,8 +19,8 @@ in buildPythonApplication rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
intltool wrapGAppsHook
- gnome3.gnome_themes_standard gnome3.defaultIconTheme
- gnome3.gsettings_desktop_schemas
+ gnome3.gnome-themes-standard gnome3.defaultIconTheme
+ gnome3.gsettings-desktop-schemas
];
postPatch = ''
@@ -28,7 +28,7 @@ in buildPythonApplication rec {
sed -i '/localmpd/d' sonata/consts.py
'';
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+ propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
propagatedBuildInputs = [
gobjectIntrospection gtk3 pygobject3
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index cbcdc0ecccd7..c68f2cd4a35f 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero
-, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
+, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
, makeWrapper }:
let
@@ -16,8 +16,8 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3
- gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes
+ buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3
+ gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
makeWrapper (stdenv.lib.getLib gnome3.dconf)
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
preFixup = ''
for f in $out/bin/* $out/libexec/*; do
wrapProgram "$f" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+ --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
done
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
index 7daae31a468b..babe4edff9df 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -11,7 +11,7 @@
, boost
, ecasound
, glibcLocales
-, mesa # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
+, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
}:
stdenv.mkDerivation rec {
@@ -27,11 +27,13 @@ stdenv.mkDerivation rec {
# Without it doesn't find all of the boost libraries.
BOOST_LIB_DIR="${boost}/lib";
+ # uses the deprecated get_generic_category() in boost_system
+ NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";
LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ boost boost.dev ecasound mesa help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
+ buildInputs = [ boost boost.dev ecasound libGLU_combined help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
# 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
# 2) Make it find ecasound headers
@@ -46,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = http://spatialaudio.net/ssr/;
description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction";
license = stdenv.lib.licenses.gpl3;
- maintainer = stdenv.lib.maintainers.fridh;
+ maintainers = [ stdenv.lib.maintainers.fridh ];
};
}
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 249bbe0d8fb7..7b78ceddda29 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -9,7 +9,7 @@ let
# Latest version number can be found at:
# http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
# Be careful not to pick the testing version.
- version = "1.0.64.407.g9bd02c2d-26";
+ version = "1.0.72.117.g6bd7cc73-35";
deps = [
alsaLib
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
- sha256 = "0zc8vclf1wx60yllc1jgzhqyv5lkwz95qmmy5f79zkj6vrdak5wc";
+ sha256 = "0yicwvg6jx8r657ff53326akq3g4ayiinlracjw5jrcs8x9whjap";
};
buildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix
index 2022183f4a08..496ce779ffb5 100644
--- a/pkgs/applications/audio/squishyball/default.nix
+++ b/pkgs/applications/audio/squishyball/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = [ flac libao libvorbis ncurses opusfile ];
+ NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS";
+
patches = [ ./gnu-screen.patch ];
postInstall = ''
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
new file mode 100644
index 000000000000..ccbceddefd2f
--- /dev/null
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }:
+
+let
+ libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ];
+ arch =
+ if stdenv.isAarch64
+ then "arm64"
+ else if stdenv.isArm
+ then "arm_armhf_raspberry_pi"
+ else if stdenv.is64bit
+ then "x86_64"
+ else "x86";
+in
+stdenv.mkDerivation rec {
+ name = "SunVox-${version}";
+ version = "1.9.3b";
+
+ src = fetchurl {
+ url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
+ sha256 = "0k74rcq7niw4p17vj3zp9lpgi932896dmzqv4ln43g0pz7l18c8b";
+ };
+
+ buildInputs = [ unzip ];
+
+ unpackPhase = "unzip $src";
+
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/share $out/bin
+ mv sunvox $out/share/
+
+ bin="$out/share/sunvox/sunvox/linux_${arch}/sunvox"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${libPath}" \
+ "$bin"
+
+ ln -s "$bin" $out/bin/sunvox
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Small, fast and powerful modular synthesizer with pattern-based sequencer";
+ license = licenses.unfreeRedistributable;
+ homepage = "http://www.warmplace.ru/soft/sunvox/";
+ maintainers = with maintainers; [ puffnfresh ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 2f5a4ebb43f2..53875389a4c3 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "synthv1-${version}";
- version = "0.8.4";
+ version = "0.9.0";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
- sha256 = "0awk2zx0xa6vl6ah24zz0k2mwsx50hh5g1rh32mp790fp4x7l5s8";
+ sha256 = "1skynjg6ip0qfbqqkybfjh6xcwxagq89ghl08f7sp7j0sz5qdcwp";
};
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 364949b22416..4140c5da5a45 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -4,12 +4,12 @@
, enableXMPP ? true, libjreen ? null
, enableKDE ? false, kdelibs4 ? null
-, enableTelepathy ? false, telepathy_qt ? null
+, enableTelepathy ? false, telepathy-qt ? null
}:
assert enableXMPP -> libjreen != null;
assert enableKDE -> kdelibs4 != null;
-assert enableTelepathy -> telepathy_qt != null;
+assert enableTelepathy -> telepathy-qt != null;
stdenv.mkDerivation rec {
name = "tomahawk-${version}";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
makeWrapper
] ++ stdenv.lib.optional enableXMPP libjreen
++ stdenv.lib.optional enableKDE kdelibs4
- ++ stdenv.lib.optional enableTelepathy telepathy_qt;
+ ++ stdenv.lib.optional enableTelepathy telepathy-qt;
postInstall = let
pluginPath = stdenv.lib.concatStringsSep ":" [
@@ -47,10 +47,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- description = "A multi-source music player";
+ description = "A multi-source music player (unmaintained)";
homepage = http://tomahawk-player.org/;
license = licenses.gpl3Plus;
platforms = platforms.all;
- maintainers = [ maintainers.aszlig ];
};
}
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 0c151697e897..4c4f958ec493 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig
, libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2
-, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
+, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
version = "20170428";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ];
+ buildInputs = [ libGLU ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ];
# Don't remove this. The default fails with 'do not know how to unpack source archive'
# every now and then on Hydra. No idea why.
diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix
index 9aa24738c379..d234f6b6b8cc 100644
--- a/pkgs/applications/audio/xmp/default.nix
+++ b/pkgs/applications/audio/xmp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, libxmp }:
stdenv.mkDerivation rec {
- name = "xmp-4.0.10";
+ name = "xmp-4.1.0";
meta = with stdenv.lib; {
description = "Extended module player";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz";
- sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n";
+ sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 2b79718809ff..cdf84cb7e46f 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -1,27 +1,28 @@
-{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
-, libjack2, libsndfile, libXdmcp, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg
+{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
+, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU_combined, minixml, pkgconfig, zlib, xorg
}:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "yoshimi-${version}";
- version = "1.5.3";
+ version = "1.5.6";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
- sha256 = "0sns35pyw2f74xrv1fxiyf9g9415kvh2rrbdjd60hsiv584nlari";
+ sha256 = "0bjfhfslpa2hjrc9h38m7dlr62953w9n4cvkgvfy495cbym12dak";
};
buildInputs = [
- alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 mesa
- minixml zlib xorg.libpthreadstubs
+ alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU_combined
+ minixml zlib xorg.libpthreadstubs pcre
];
nativeBuildInputs = [ cmake pkgconfig ];
patchPhase = ''
- sed -i -e 's,/usr/share,'$out/share,g src/Misc/Config.cpp src/Misc/Bank.cpp
+ substituteInPlace src/Misc/Config.cpp --replace /usr $out
+ substituteInPlace src/Misc/Bank.cpp --replace /usr $out
'';
preConfigure = "cd src";
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index f81aad4e2af1..210d0f7e989d 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchgit , boost, libX11, mesa, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile }:
+{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
stdenv.mkDerivation rec {
name = "zam-plugins-${version}";
- version = "3.9";
+ version = "3.10";
src = fetchgit {
url = "https://github.com/zamaudio/zam-plugins.git";
deepClone = true;
- rev = "4976cf204074c1dfaf344821e83e8d896b35107d";
- sha256 = "1xgwl51sf2hgc5ikcnycyxaw9vy82lrcswn07b6av6i67qclm8f8";
+ rev = "a3321af1892a6994d64fb705e48ae8adf8d7df20";
+ sha256 = "0yqrs21ph2lx00p0jlc70qkmzfrnf9ihg1r3i9j5n2r903ljdg5p";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 rubberband libsndfile ];
+ buildInputs = [ boost libX11 libGLU_combined liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ];
patchPhase = ''
patchShebangs ./dpf/utils/generate-ttl.sh
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index 52b9a57c00b2..1b3429f39d7f 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -4,16 +4,20 @@
stdenv.mkDerivation rec {
name = "zynaddsubfx-${version}";
- version = "3.0.2";
+ version = "3.0.3";
src = fetchurl {
url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2";
- sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm";
+ sha256 = "1hfpiqdm337gl4ynkmmp2qss2m5z8mzqzjrbiyg6w1v4js7l9phi";
};
buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ];
nativeBuildInputs = [ cmake pkgconfig ];
+ patchPhase = ''
+ substituteInPlace src/Misc/Config.cpp --replace /usr $out
+ '';
+
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
new file mode 100644
index 000000000000..9bed504103a1
--- /dev/null
+++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
@@ -0,0 +1,103 @@
+{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
+ procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype,
+ fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, libudev,
+ libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
+ libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
+ maxRam ? "1024m" }:
+
+stdenv.mkDerivation rec {
+ version = "6.7.0";
+ rev = "1512021600670_4503";
+ pname = "CrashPlanSmb";
+ name = "${pname}_${version}_${rev}";
+
+ src = fetchurl {
+ url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
+ sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
+ };
+
+ nativeBuildInputs = [ makeWrapper cpio nodePackages.asar ];
+ buildInputs = [ getopt which ];
+
+ vardir = "/var/lib/crashplan";
+ manifestdir = "${vardir}/manifest";
+
+ postPatch = ''
+ # patch scripts/CrashPlanEngine
+ substituteInPlace scripts/CrashPlanEngine \
+ --replace /bin/ps ${procps}/bin/ps \
+ --replace awk ${gawk}/bin/awk \
+ --replace '`sed' '`${gnused}/bin/sed' \
+ --replace grep ${gnugrep}/bin/grep \
+ --replace TARGETDIR/log VARDIR/log \
+ --replace TARGETDIR/\''${NAME} VARDIR/\''${NAME} \
+ --replace \$TARGETDIR/bin/run.conf $out/bin/run.conf \
+ --replace \$VARDIR ${vardir}
+
+ # patch scripts/CrashPlanDesktop
+ substituteInPlace scripts/CrashPlanDesktop \
+ --replace awk ${gawk}/bin/awk \
+ --replace "\"\$SCRIPTDIR/..\"" "$out" \
+ --replace "\$(dirname \$SCRIPT)" "$out" \
+ --replace "\''${TARGETDIR}/log" ${vardir}/log \
+ --replace "\''${TARGETDIR}" "$out"
+ '';
+
+ installPhase = ''
+ mkdir $out
+ zcat -v ${pname}_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner)
+
+ install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop
+ install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine
+ install -D -m 644 scripts/run.conf $out/bin/run.conf
+ install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop
+
+ # unpack, patch and repack app.asar to stop electron from creating /usr/local/crashplan/log to store the ui logs.
+ asar e $out/app.asar $out/app.asar-unpacked
+ rm -v $out/app.asar
+ substituteInPlace $out/app.asar-unpacked/shared_modules/shell/platform_paths.js \
+ --replace "getLogFileParentPath();" "\"$vardir/log\";"
+ asar p $out/app.asar-unpacked $out/app.asar
+
+ mv -v $out/*.asar $out/electron/resources
+ chmod 755 "$out/electron/crashplan"
+
+ rm -r $out/log
+ mv -v $out/conf $out/conf.template
+ ln -s $vardir/log $out/log
+ ln -s $vardir/cache $out/cache
+ ln -s $vardir/conf $out/conf
+
+ substituteInPlace $out/bin/run.conf \
+ --replace "-Xmx1024m" "-Xmx${maxRam}"
+
+ echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars
+ echo "APP_BASENAME=CrashPlan" >> $out/install.vars
+ echo "TARGETDIR=$out" >> $out/install.vars
+ echo "BINSDIR=$out/bin" >> $out/install.vars
+ echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars
+ echo "VARDIR=${vardir}" >> $out/install.vars
+ echo "INITDIR=" >> $out/install.vars
+ echo "RUNLVLDIR=" >> $out/install.vars
+ echo "INSTALLDATE=" >> $out/install.vars
+
+ '';
+
+ postFixup = ''
+ patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
+ wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
+ stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype
+ fontconfig dbus gconf nss nspr alsaLib cups expat libudev
+ libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
+ libXext libXfixes libXrender libXtst libXScrnSaver]}"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An online backup solution";
+ homepage = http://www.crashplan.com/business/;
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ xvapx ];
+ };
+
+}
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index c330aeb0092c..1ea4b4d27506 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext
-, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2
+{ stdenv, fetchurl, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext
+, gnome3, libnotify, itstool, glib, gtk3, libxml2
, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
-, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror
-, appstream-glib, desktop_file_utils, atk, pango, duplicity
+, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
+, appstream-glib, desktop-file-utils, duplicity
}:
stdenv.mkDerivation rec {
@@ -15,58 +15,35 @@ stdenv.mkDerivation rec {
};
patches = [
- ./fix-paths.patch
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit coreutils;
+ })
];
- postPatch = ''
- substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \
- "/bin/rm" \
- "${coreutils}/bin/rm"
- '';
-
- # couldn't find gio/gdesktopappinfo.h
- NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
nativeBuildInputs = [
- meson ninja pkgconfig vala_0_38 gettext intltool itstool
- appstream-glib desktop_file_utils libxml2 wrapGAppsHook
+ meson ninja pkgconfig vala_0_40 gettext itstool
+ appstream-glib desktop-file-utils libxml2 wrapGAppsHook
];
buildInputs = [
libnotify gnome3.libpeas glib gtk3 libsecret
pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
- at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror
+ at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror
];
propagatedUserEnvPkgs = [ duplicity ];
+ PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+
postInstall = ''
glib-compile-schemas $out/share/glib-2.0/schemas
'';
- # Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed
- postFixup =
- let
- rpath = stdenv.lib.makeLibraryPath [
- glib
- gtk3
- gnome3.gnome_online_accounts
- gnome3.libpeas
- gnome3.nautilus
- libgpgerror
- libsecret
- # Transitive
- atk
- pango
- ];
- in ''
- # Unwrap accidentally wrapped library
- mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so
-
- for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do
- patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf"
- done
- '';
+ 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";
diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch
index 1cc57e6a54a2..26126fdc9d56 100644
--- a/pkgs/applications/backup/deja-dup/fix-paths.patch
+++ b/pkgs/applications/backup/deja-dup/fix-paths.patch
@@ -1,12 +1,11 @@
-diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build
-index 04b136f3..ed8f7cba 100644
---- a/deja-dup/nautilus/meson.build
-+++ b/deja-dup/nautilus/meson.build
-@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'],
- link_with: [dirhandling],
- dependencies: [nautilus_dep],
- install: true,
-- install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir'))
-+ install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0'))
+--- a/libdeja/tools/duplicity/DuplicityInstance.vala
++++ b/libdeja/tools/duplicity/DuplicityInstance.vala
+@@ -159,7 +159,7 @@
+ // We already are pretty sure we don't have other duplicities in our
+ // archive directories, because we use our own and we ensure we only have
+ // one deja-dup running at a time via DBus.
+- Posix.system("/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock");
++ Posix.system("@coreutils@/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock");
- endif
+ Process.spawn_async_with_pipes(null, real_argv, real_envp,
+ SpawnFlags.SEARCH_PATH |
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 9dd7eb2a2994..685f9c159b65 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, lightdm, pkgconfig, intltool
-, hicolor_icon_theme, makeWrapper
+, hicolor-icon-theme, makeWrapper
, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
+, exo
}:
#ToDo: bad icons with gtk2;
@@ -8,26 +9,18 @@
let
ver_branch = "2.0";
- version = "2.0.1";
+ version = "2.0.4";
in
stdenv.mkDerivation rec {
name = "lightdm-gtk-greeter-${version}";
src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
- sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j";
+ sha256 = "1svbyq2l3l2d72k10nw79jz940rqsskryaim2viy6jfpv9k5jfv1";
};
- patches = [
- (fetchurl {
- name = "lightdm-gtk-greeter-2.0.1-lightdm-1.19.patch";
- url = "https://588764.bugs.gentoo.org/attachment.cgi?id=442616";
- sha256 = "0r383kjkvq9yanjc1lk878xc5g8993pjgxylqhhjb5rkpi1mbfsv";
- })
- ];
-
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ lightdm intltool makeWrapper ]
+ buildInputs = [ lightdm exo intltool makeWrapper ]
++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
configureFlags = [
@@ -35,6 +28,8 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
] ++ stdenv.lib.optional useGTK2 "--with-gtk2";
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
+
installFlags = [
"localstatedir=\${TMPDIR}"
"sysconfdir=\${out}/etc"
@@ -44,11 +39,11 @@ stdenv.mkDerivation rec {
substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
--replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
wrapProgram "$out/sbin/lightdm-gtk-greeter" \
- --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share"
+ --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share"
'';
meta = with stdenv.lib; {
- homepage = http://launchpad.net/lightdm-gtk-greeter;
+ homepage = https://launchpad.net/lightdm-gtk-greeter;
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ ocharles wkennington ];
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index e82d4c69def6..6765c5f9dfd0 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
-, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit
+, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils
, qt4 ? null
, withQt5 ? false, qtbase
}:
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}"
];
+ prePatch = ''
+ substituteInPlace src/shared-data-manager.c \
+ --replace /bin/rm ${coreutils}/bin/rm
+ '';
+
meta = {
homepage = https://launchpad.net/lightdm;
platforms = platforms.linux;
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 86a963bdac48..a7e8799c9c1c 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -4,8 +4,7 @@
}:
let
-
- version = "0.16.0";
+ version = "0.17.0";
in mkDerivation rec {
name = "sddm-${version}";
@@ -14,7 +13,7 @@ in mkDerivation rec {
owner = "sddm";
repo = "sddm";
rev = "v${version}";
- sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb";
+ sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq";
};
patches = [ ./sddm-ignore-config-mtime.patch ];
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 360d373f0707..f963fe378d51 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -29,12 +29,13 @@
, writeTextFile
, xkeyboard_config
, zlib
+, gtk2, gnome_vfs, glib, GConf
, fontsConf
}:
let
androidStudio = stdenv.mkDerivation {
- name = "${pname}";
+ name = "${pname}-${version}";
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
@@ -48,6 +49,7 @@ let
installPhase = ''
cp -r . $out
wrapProgram $out/bin/studio.sh \
+ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
--set PATH "${stdenv.lib.makeBinPath [
# Checked in studio.sh
@@ -68,7 +70,6 @@ let
# Runtime stuff
git
-
]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
@@ -95,6 +96,11 @@ let
libpulseaudio
libX11
+ # For GTKLookAndFeel
+ gtk2
+ gnome_vfs
+ glib
+ GConf
]}" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
--set FONTCONFIG_FILE ${fontsConf}
@@ -106,6 +112,7 @@ let
# environment is used as a work around for that.
fhsEnv = buildFHSUserEnv {
name = "${pname}-fhs-env";
+ multiPkgs = pkgs: [ pkgs.ncurses5 ];
};
in
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index b9e096c69279..4583066842af 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -1,19 +1,32 @@
-{ stdenv, callPackage, fetchurl, makeFontsConf }:
+{ stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }:
+
let
mkStudio = opts: callPackage (import ./common.nix opts) {
fontsConf = makeFontsConf {
fontDirectories = [];
};
+ inherit (gnome2) GConf gnome_vfs;
+ };
+ latestVersion = {
+ version = "3.2.0.6"; # "Android Studio 3.2 Canary 7"
+ build = "173.4658582";
+ sha256Hash = "0a6ssw5mb9my5kfd5fkfdddkgdi2jdq23jlhd6rrqcs6rhdlpl38";
};
in rec {
+ # Old alias
+ preview = beta;
+
+ # Attributes are named by the corresponding release channels
+
stable = mkStudio {
pname = "android-studio";
- version = "3.0.0.18"; # "Android Studio 3.0"
- build = "171.4408382";
- sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br";
+ #pname = "android-studio-stable"; # TODO: Rename and provide symlink
+ version = "3.0.1.0"; # "Android Studio 3.0.1"
+ build = "171.4443003";
+ sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd";
meta = with stdenv.lib; {
- description = "The Official IDE for Android (stable version)";
+ description = "The Official IDE for Android (stable channel)";
longDescription = ''
Android Studio is the official IDE for Android app development, based on
IntelliJ IDEA.
@@ -25,15 +38,32 @@ in rec {
};
};
- preview = mkStudio {
+ beta = mkStudio {
pname = "android-studio-preview";
- version = "3.1.0.3"; # "Android Studio 3.1 Canary 4"
- build = "171.4444016";
- sha256Hash = "0qgd0hd3i3p1adv0xqa0409r5injw3ygs50lajzi99s33j6vdc6s";
+ #pname = "android-studio-beta"; # TODO: Rename and provide symlink
+ version = "3.1.0.15"; # "Android Studio 3.1 RC 3"
+ build = "173.4658569";
+ sha256Hash = "0jvq7k5vhrli41bj2imnsp3z70c7yws3fvs8m873qrjvfgmi5qrq";
meta = stable.meta // {
- description = "The Official IDE for Android (preview version)";
+ description = "The Official IDE for Android (beta channel)";
homepage = https://developer.android.com/studio/preview/index.html;
};
};
+
+ dev = mkStudio (latestVersion // {
+ pname = "android-studio-dev";
+
+ meta = beta.meta // {
+ description = "The Official IDE for Android (dev channel)";
+ };
+ });
+
+ canary = mkStudio (latestVersion // {
+ pname = "android-studio-canary";
+
+ meta = beta.meta // {
+ description = "The Official IDE for Android (canary channel)";
+ };
+ });
}
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 39be7f534060..429b2430fce2 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
name = "aseprite-${version}";
- version = if unfree then "1.2.2" else "1.1.7";
+ version = if unfree then "1.2.4" else "1.1.7";
src = fetchFromGitHub {
owner = "aseprite";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
rev = "v${version}";
fetchSubmodules = true;
sha256 = if unfree
- then "1ldi7zikl1g6rq3g9lkypx5wqzza5j0054j1r8bh7lyvb0szicig"
+ then "1rnf4a8vgddz8x55rpqaihlxmqip1kgpdhqb4d3l71h1zmidg5k3"
else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
};
diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix
index bc39d3466765..0734da173e5f 100644
--- a/pkgs/applications/editors/atom/beta.nix
+++ b/pkgs/applications/editors/atom/beta.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-beta-${version}";
- version = "1.23.0-beta0";
+ version = "1.24.0-beta3";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "1vfc8jin07kivdmyw88vbzinbjsb6py9n2ggpvy4cccagnvxwj2y";
+ sha256 = "02nnjjwlkxafi2fbi4gz276nqkmi92kf3q414vw1k3kc8q5zvxrs";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index f5763ea787f3..8c7ff7b5eae6 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "1.22.0";
+ version = "1.25.0";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "1jxw0m1hfaisf1f875wr28f0mr3h0wjml6pjhfxbybvcblpnd27k";
+ sha256 = "04iiw0qzl9025l4lasz42w5nfnvsmc7vwcf4a9c2hvl9xsyckajh";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index 8f6c5f5c2906..c7e1dfe27364 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,16 +1,16 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
-, gconf, nss, xorg, libcap, systemd, libnotify
+, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, gconf, nss, xorg, libcap, systemd, libnotify, libsecret
}:
let
packages = [
- stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3
+ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
- xorg.libxcb
+ xorg.libxcb libsecret
];
libPathNative = lib.makeLibraryPath packages;
diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
index 20c2623e034c..72642cfbe63f 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -6,12 +6,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}";
- version = "16.01";
+ version = "17.12";
pname = "codeblocks";
src = fetchurl {
- url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.gz";
- sha256 = "00sskm91r20ywydwqwx6v7z3nwn9lyh5297c5wp3razldlh9vyrh";
+ url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.xz";
+ sha256 = "1q2pph7md1p10i83rir2l4gvy7ym2iw8w6sk5vl995knf851m20k";
};
nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ];
@@ -22,11 +22,7 @@ stdenv.mkDerivation rec {
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig";
configureFlags = [ "--enable-pch=no" ]
- ++ optional contribPlugins "--with-contrib-plugins";
-
- # Fix boost 1.59 compat
- # Try removing in the next version
- #CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
+ ++ optional contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ];
meta = {
maintainers = [ maintainers.linquize ];
diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix
index d1ed4826c682..4ab11064eae3 100644
--- a/pkgs/applications/editors/deadpixi-sam/default.nix
+++ b/pkgs/applications/editors/deadpixi-sam/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft
-, version ? "2016-10-08"
-, rev ? "a17c4a9c2a1af2de0a756fe16d482e0db88c0541"
-, sha256 ? "03xmfzlijz4gbmr7l0pb1gl9kmlz1ab3hr8d51innvlasy4g6xgj"
-}:
+{ stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }:
stdenv.mkDerivation rec {
- inherit version;
+ version = "2017-10-27";
name = "deadpixi-sam-unstable-${version}";
- src = fetchFromGitHub {
- inherit sha256 rev;
- owner = "deadpixi";
- repo = "sam";
- };
+
+ src = fetchFromGitHub {
+ owner = "deadpixi";
+ repo = "sam";
+ rev = "51693780fb1457913389db6634163998f9b775b8";
+ sha256 = "0nfkj93j4bgli4ixbk041nwi14rabk04kqg8krq4mj0044m1qywr";
+ };
postPatch = ''
substituteInPlace config.mk.def \
- --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2"
+ --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \
+ --replace "CC=gcc" ""
'';
+ CFLAGS = "-D_DARWIN_C_SOURCE";
makeFlags = [ "DESTDIR=$(out)" ];
- buildInputs = [ libX11 libXt libXft ];
+ buildInputs = [ libX11 libXi libXt libXft ];
postInstall = ''
mkdir -p $out/share/applications
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
description = "Updated version of the sam text editor";
license = with licenses; lpl-102;
maintainers = with maintainers; [ ramkromberg ];
- platforms = with platforms; linux;
+ platforms = with platforms; unix;
};
}
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index 6a5bc3e7b0f8..23e4449ee2eb 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -1,5 +1,5 @@
{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
-, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2
+, zlib, jdk, glib, gtk2, libXtst, gsettings-desktop-schemas, webkitgtk24x-gtk2
, makeWrapper, ... }:
{ name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11
+ fontconfig freetype glib gsettings-desktop-schemas gtk2 jdk libX11
libXrender libXtst makeWrapper zlib
] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2;
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 5ef29081cf01..c69686a0967d 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, freetype, fontconfig, libX11, libXext, libXrender, zlib
-, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas
+, glib, gtk2, libXtst, jdk, gsettings-desktop-schemas
, webkitgtk24x-gtk2 ? null # for internal web browser
, buildEnv, writeText, runCommand
, callPackage
@@ -15,7 +15,7 @@ rec {
buildEclipse = import ./build-eclipse.nix {
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
- jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2
+ jdk glib gtk2 libXtst gsettings-desktop-schemas webkitgtk24x-gtk2
makeWrapper;
};
@@ -114,16 +114,16 @@ rec {
};
eclipse-platform-47 = buildEclipse {
- name = "eclipse-platform-4.7.1a";
+ name = "eclipse-platform-4.7.2";
description = "Eclipse Platform Oxygen";
sources = {
"x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz;
- sha256 = "13gyrnhyhdpsrbi5nl0fhpwrqz3gdyqq3r0m1f2z3y6yr75sgw33";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz;
+ sha256 = "1zl406brvhh25dkd2pi1kvz5386gzkybpwik03aadpzmjrbm9730";
};
"i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk.tar.gz;
- sha256 = "013dfk23wa4jy177ywrkkr16wdjf6jxzjcz6mkl4ygki47yj9c5s";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk.tar.gz;
+ sha256 = "0v0i13ah8d8zmcv0ip1ia5ifnfnl76aibiqpv4q4lih5d1qsa79d";
};
};
};
@@ -168,16 +168,16 @@ rec {
};
eclipse-sdk-47 = buildEclipse {
- name = "eclipse-sdk-4.7.1a";
+ name = "eclipse-sdk-4.7.2";
description = "Eclipse Oxygen Classic";
sources = {
"x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk-x86_64.tar.gz;
- sha256 = "05xpdbig170rw7k5dx33dlyz187wv62mma8s5wxrqi7f4117sx4y";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk-x86_64.tar.gz;
+ sha256 = "1j5d72rkl3lq3rpnvq1spsa0zlzbmbkgadfhbz868sqqbavrwbzv";
};
"i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk.tar.gz;
- sha256 = "09c9m88k1cm9bhd900p5yf2q9pijrymgjcbhmagz0fcwhldrv0ys";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk.tar.gz;
+ sha256 = "117436ni79v1kiync8b3wkfkb8a5rv3sbqp6qnwbmanwkvnyvfvc";
};
};
};
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 8d96a79b3c3d..1710c0e35531 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -20,20 +20,32 @@ rec {
# Helper for the common case where we have separate feature and
# plugin JARs.
- buildEclipsePlugin = { name, srcFeature, srcPlugin, ... } @ attrs:
- buildEclipsePluginBase (attrs // {
- srcs = [ srcFeature srcPlugin ];
+ buildEclipsePlugin =
+ { name, srcFeature, srcPlugin ? null, srcPlugins ? [], ... } @ attrs:
+ assert srcPlugin == null -> srcPlugins != [];
+ assert srcPlugin != null -> srcPlugins == [];
- buildCommand = ''
- dropinDir="$out/eclipse/dropins/${name}"
+ let
- mkdir -p $dropinDir/features
- unzip ${srcFeature} -d $dropinDir/features/
+ pSrcs = if (srcPlugin != null) then [ srcPlugin ] else srcPlugins;
- mkdir -p $dropinDir/plugins
- cp -v ${srcPlugin} $dropinDir/plugins/${name}.jar
- '';
- });
+ in
+
+ buildEclipsePluginBase (attrs // {
+ srcs = [ srcFeature ] ++ pSrcs;
+
+ buildCommand = ''
+ dropinDir="$out/eclipse/dropins/${name}"
+
+ mkdir -p $dropinDir/features
+ unzip ${srcFeature} -d $dropinDir/features/
+
+ mkdir -p $dropinDir/plugins
+ for plugin in ${toString pSrcs}; do
+ cp -v $plugin $dropinDir/plugins/$(stripHash $plugin)
+ done
+ '';
+ });
# Helper for the case where the build directory has the layout of an
# Eclipse update site, that is, it contains the directories
@@ -102,6 +114,75 @@ rec {
};
};
+ ansi-econsole = buildEclipsePlugin rec {
+ name = "ansi-econsole-${version}";
+ version = "1.3.5.201612301822";
+
+ srcFeature = fetchurl {
+ url = "https://mihnita.github.io/ansi-econsole/install/features/net.mihai-nita.ansicon_${version}.jar";
+ sha256 = "086ylxpsrlpbvwv5mw7v6b44j63cwzgi8apg2mq058ydr5ak6hxs";
+ };
+
+ srcPlugin = fetchurl {
+ url = "https://mihnita.github.io/ansi-econsole/install/plugins/net.mihai-nita.ansicon.plugin_${version}.jar";
+ sha256 = "1j42l0xxzs89shqkyn91lb0gia10mifzy0i73c3n7gj7sv2ddbjq";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://mihai-nita.net/java/#ePluginAEC";
+ description = "Adds support for ANSI escape sequences in the Eclipse console";
+ license = licenses.asl20;
+ platforms = platforms.all;
+ maintainers = [ maintainers.rycee ];
+ };
+ };
+
+ antlr-runtime_4_5 = buildEclipsePluginBase rec {
+ name = "antlr-runtime-4.5.3";
+
+ src = fetchurl {
+ url = "http://www.antlr.org/download/${name}.jar";
+ sha256 = "0lm78i2annlczlc2cg5xvby0g1dyl0sh1y5xc2pymjlmr67a1g4k";
+ };
+
+ buildCommand = ''
+ dropinDir="$out/eclipse/dropins/"
+ mkdir -p $dropinDir
+ cp -v $src $dropinDir/${name}.jar
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A powerful parser generator for processing structured text or binary files";
+ homepage = http://www.antlr.org/;
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.rycee ];
+ };
+ };
+
+ antlr-runtime_4_7 = buildEclipsePluginBase rec {
+ name = "antlr-runtime-4.7.1";
+
+ src = fetchurl {
+ url = "http://www.antlr.org/download/${name}.jar";
+ sha256 = "07f91mjclacrvkl8a307w2abq5wcqp0gcsnh0jg90ddfpqcnsla3";
+ };
+
+ buildCommand = ''
+ dropinDir="$out/eclipse/dropins/"
+ mkdir -p $dropinDir
+ cp -v $src $dropinDir/${name}.jar
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A powerful parser generator for processing structured text or binary files";
+ homepage = http://www.antlr.org/;
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.rycee ];
+ };
+ };
+
anyedittools = buildEclipsePlugin rec {
name = "anyedit-${version}";
version = "2.7.1.201709201439";
@@ -127,16 +208,16 @@ rec {
autodetect-encoding = buildEclipsePlugin rec {
name = "autodetect-encoding-${version}";
- version = "1.8.4.201708052053";
+ version = "1.8.5.201801191359";
srcFeature = fetchurl {
- url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar";
- sha256 = "1gbvib5dd75pp5mr17ckj2y66gnxjvpc067im5nsl9fyljdw867c";
+ url = "https://github.com/cypher256/eclipse-encoding-plugin/raw/master/eclipse.encoding.updatesite.snapshot/features/eclipse.encoding.plugin.feature_${version}.jar";
+ sha256 = "1m8ypsc1dwz0y6yhjgxsdi9813d38jllv7javgwvcd30g042a3kx";
};
srcPlugin = fetchurl {
- url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar";
- sha256 = "0728zsbfs1mc4qvx2p92hkxpnknckqk0xvqlmzivsnr62b5qd5im";
+ url = "https://github.com/cypher256/eclipse-encoding-plugin/raw/master/eclipse.encoding.updatesite.snapshot/plugins/mergedoc.encoding_${version}.jar";
+ sha256 = "1n2rzybfcwp3ss2qi0fhd8vm38vdwav8j837lqiqlfcnvzwsk86m";
};
meta = with stdenv.lib; {
@@ -192,12 +273,12 @@ rec {
checkstyle = buildEclipseUpdateSite rec {
name = "checkstyle-${version}";
- version = "8.0.0.201707161819";
+ version = "8.7.0.201801131309";
src = fetchzip {
stripRoot = false;
- url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.0.0/net.sf.eclipsecs-updatesite_${version}.zip";
- sha256 = "1p07xcf71qc99sh73vqm9xxxgi819m58frv0cpvsn06y6ljr0aj2";
+ url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.7.0/net.sf.eclipsecs-updatesite_${version}.zip";
+ sha256 = "07fymk705x4mwq7vh2i6frsf67jql4bzrkdzhb4n74zb0g1dib60";
};
meta = with stdenv.lib; {
@@ -233,7 +314,7 @@ rec {
};
};
- cup = buildEclipsePluginBase rec {
+ cup = buildEclipsePlugin rec {
name = "cup-${version}";
version = "1.1.0.201604221613";
version_ = "1.0.0.201604221613";
@@ -243,31 +324,20 @@ rec {
sha256 = "13nnsf0cqg02z3af6xg45rhcgiffsibxbx6h1zahjv7igvqgkyna";
};
- srcPlugin1 = fetchurl {
- url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version_}.jar";
- sha256 = "0kif8kivrysprva1pxzajm88gi967qf7idhb6ga2xpvsdcris91j";
- };
+ srcPlugins = [
+ (fetchurl {
+ url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version_}.jar";
+ sha256 = "0kif8kivrysprva1pxzajm88gi967qf7idhb6ga2xpvsdcris91j";
+ })
- srcPlugin2 = fetchurl {
- url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar";
- sha256 = "022phbrsny3gb8npb6sxyqqxacx138q5bd7dq3gqxh3kprx5chbl";
- };
-
- srcs = [ srcFeature srcPlugin1 srcPlugin2 ];
+ (fetchurl {
+ url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar";
+ sha256 = "022phbrsny3gb8npb6sxyqqxacx138q5bd7dq3gqxh3kprx5chbl";
+ })
+ ];
propagatedBuildInputs = [ zest ];
- phases = [ "installPhase" ];
-
- installPhase = ''
- dropinDir="$out/eclipse/dropins/${name}"
- mkdir -p $dropinDir/features
- unzip ${srcFeature} -d $dropinDir/features/
- mkdir -p $dropinDir/plugins
- cp -v ${srcPlugin1} $dropinDir/plugins/''${srcPlugin1#*-}
- cp -v ${srcPlugin2} $dropinDir/plugins/''${srcPlugin2#*-}
- '';
-
meta = with stdenv.lib; {
homepage = http://www2.cs.tum.edu/projects/cup/eclipse.php;
description = "IDE for developing CUP based parsers";
@@ -360,14 +430,52 @@ rec {
};
};
+ jsonedit = buildEclipsePlugin rec {
+ name = "jsonedit-${version}";
+ version = "1.1.0";
+
+ srcFeature = fetchurl {
+ url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar";
+ sha256 = "1qqbzh9sv0s9p0irim7kimvzdkw0hg6yv090bz5ifpzqdxc4v9r5";
+ };
+
+ srcPlugins =
+ let
+ fetch = { n, h }:
+ fetchurl {
+ url = "https://boothen.github.io/Json-Eclipse-Plugin/plugins/jsonedit-${n}_${version}.jar";
+ sha256 = h;
+ };
+ in
+ map fetch [
+ { n = "core"; h = "1fl4api6j0wp4vfbyabxqsrjvvpclp8p3b4xnxxpn4v8g12q526m"; }
+ { n = "editor"; h = "1kn15qampdlpxblj2bv94b3bb15qfwng27lk0n578585yqmb3p66"; }
+ { n = "folding"; h = "1qnzdx4xx9ma3p6lg1ab8xf3nik1yrww33nksi0j3vnvh8i9ihdm"; }
+ { n = "model"; h = "0n8855ma1h2as0skrrp2qy3sdkmnhl5vlqxcjv8xlc3faa72174a"; }
+ { n = "outline"; h = "07i2spmzghs49pkxl8z9c29n6l38x26v20prkh4a7i1rf9whg1q8"; }
+ { n = "preferences"; h = "0d1m8pb903wpc4vvhsp0gx0h65r432ax898wif3a23c5wxj4nh9i"; }
+ { n = "text"; h = "0z80d9qgpbx88jrq8b4r478lrcrf52gxqkl94l13wrk7rszjpldh"; }
+ ];
+
+ propagatedBuildInputs = [ antlr-runtime_4_7 ];
+
+ meta = with stdenv.lib; {
+ description = "Adds support for JSON files to Eclipse";
+ homepage = https://github.com/boothen/Json-Eclipse-Plugin;
+ license = licenses.epl10;
+ platforms = platforms.all;
+ maintainers = [ maintainers.rycee ];
+ };
+ };
+
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
- version = "4.7.1a";
+ version = "4.7.2";
src = fetchzip {
stripRoot = false;
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/org.eclipse.jdt-4.7.1a.zip;
- sha256 = "1hpvpj8ghfk8aqbzfrpcxw3wxrczq6zd3bpx4sxjrsi926jsjaf4";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/org.eclipse.jdt-4.7.2.zip;
+ sha256 = "1yzqnjs88cdyyqv8f1g8fbfyccci29f3pzxxvaz7szxicwzn59mz";
};
meta = with stdenv.lib; {
@@ -424,16 +532,16 @@ rec {
spotbugs = buildEclipsePlugin rec {
name = "spotbugs-${version}";
- version = "3.1.0.r201710241414-11c9895";
+ version = "3.1.2.r201802250230-59118d9";
srcFeature = fetchurl {
url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar";
- sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs";
+ sha256 = "1p0pz7znpfi5h1wr60sl8clkpd7rzkh7krmc0nxc6w43gkgkg9h4";
};
srcPlugin = fetchurl {
url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar";
- sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas";
+ sha256 = "1z3jjbcjif4qip1gx2dhfcm9fyhps96ms7z3ngbdcakgw7wai9v4";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 9d5848f02637..832dc3c0e799 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -2,7 +2,7 @@
, buildPlatform, hostPlatform
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
name = "ed-${version}";
version = "1.14.2";
@@ -11,27 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm";
};
- unpackCmd = "tar --lzip -xf";
-
nativeBuildInputs = [ lzip ];
- /* FIXME: Tests currently fail on Darwin:
-
- building test scripts for ed-1.5...
- testing ed-1.5...
- *** Output e1.o of script e1.ed is incorrect ***
- *** Output r3.o of script r3.ed is incorrect ***
- make: *** [check] Error 127
-
- */
- doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
-
- installFlags = [ "DESTDIR=$(out)" ];
-
- configureFlags = [
- "--exec-prefix=${stdenv.cc.prefix}"
- "CC=${stdenv.cc.prefix}cc"
- ];
+ doCheck = true; # not cross;
meta = {
description = "An implementation of the standard Unix editor";
@@ -54,4 +36,9 @@ stdenv.mkDerivation rec {
maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
-}
+} // stdenv.lib.optionalAttrs (hostPlatform != buildPlatform) {
+ # This may be moved above during a stdenv rebuild.
+ preConfigure = ''
+ configureFlagsArray+=("CC=$CC")
+ '';
+})
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index e5e64a32e977..a6611d2f167d 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,26 +1,25 @@
-{ stdenv, fetchurl, spidermonkey, unzip, curl, pcre, readline, openssl, perl, html-tidy }:
+{ stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
stdenv.mkDerivation rec {
name = "edbrowse-${version}";
- version = "3.6.1";
+ version = "3.7.2";
- nativeBuildInputs = [ unzip ];
- buildInputs = [ curl pcre readline openssl spidermonkey perl html-tidy ];
+ buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
patchPhase = ''
- substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
for i in ./tools/*.pl
do
substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl"
done
'';
- NIX_CFLAGS_COMPILE = "-I${spidermonkey}/include/mozjs-31";
makeFlags = "-C src prefix=$(out)";
- src = fetchurl {
- url = "http://edbrowse.org/${name}.zip";
- sha256 = "1grkn09r31nmvcnm76jkd8aclmd9n5141mpqvb86wndp9pa7gz7q";
+ src = fetchFromGitHub {
+ owner = "CMB";
+ repo = "edbrowse";
+ rev = "v${version}";
+ sha256 = "00wi0m91zf8p8wk4ixlz99dndgv4xqy93m2vsiwdr3khw3jwipp2";
};
meta = with stdenv.lib; {
description = "Command Line Editor Browser";
@@ -35,6 +34,5 @@ stdenv.mkDerivation rec {
homepage = http://edbrowse.org/;
maintainers = [ maintainers.schmitthenner maintainers.vrthra ];
platforms = platforms.linux;
- broken = true; # no compatible spidermonkey
};
}
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 0267d3cba8a8..497836503933 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -54,10 +54,10 @@
}) {};
adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "adaptive-wrap";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.1.el";
- sha256 = "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll";
+ url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.2.el";
+ sha256 = "1qcf1cabn4wb34cdmlyk3rv5dl1dcrxrbaw38kly1prs6y4l22aw";
};
packageRequires = [];
meta = {
@@ -95,10 +95,10 @@
ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ahungry-theme";
- version = "1.8.0";
+ version = "1.10.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar";
- sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v";
+ url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar";
+ sha256 = "14q5yw56n82qph09bk7wmj5b1snhh9w0nk5s1l7yn9ldg71xq6pm";
};
packageRequires = [ emacs ];
meta = {
@@ -135,10 +135,10 @@
arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "arbitools";
- version = "0.71";
+ version = "0.94";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/arbitools-0.71.el";
- sha256 = "1ghf5yla126n7xpn2sc2vg7q8arp7iv2z5f9r9l38vxm6dvnxp50";
+ url = "https://elpa.gnu.org/packages/arbitools-0.94.el";
+ sha256 = "00iq8rr1275p48ic5mibcx657li723q8r7ax4g21w6bzwsj3gksd";
};
packageRequires = [ cl-lib ];
meta = {
@@ -175,10 +175,10 @@
}) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex";
- version = "11.91.0";
+ version = "12.1.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/auctex-11.91.0.tar";
- sha256 = "1yh182mxgngjmwpkyv2n9km3vyq95bqfq8mnly3dbv78nwk7f2l3";
+ url = "https://elpa.gnu.org/packages/auctex-12.1.0.tar";
+ sha256 = "0iy5x61xqkxaph2hq64sg50l1c6yp6qhzppwadayxkdz00b46sas";
};
packageRequires = [];
meta = {
@@ -239,6 +239,19 @@
license = lib.licenses.free;
};
}) {};
+ bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+ pname = "bbdb";
+ version = "3.2";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/bbdb-3.2.tar";
+ sha256 = "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/bbdb.html";
+ license = lib.licenses.free;
+ };
+ }) {};
beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
pname = "beacon";
version = "1.3.3";
@@ -387,10 +400,10 @@
}) {};
company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "company";
- version = "0.9.4";
+ version = "0.9.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/company-0.9.4.tar";
- sha256 = "1wm2nzjfn9cmjb6f5yvawrss7pg1r0swwwqqx602wg8hjrsiabay";
+ url = "https://elpa.gnu.org/packages/company-0.9.6.tar";
+ sha256 = "0w1jqhs87g0sqhv2iw6a5i8f4yjkrc65fb3h6vyv11sb8kfnhda7";
};
packageRequires = [ emacs ];
meta = {
@@ -483,10 +496,10 @@
}) {};
csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "csv-mode";
- version = "1.6";
+ version = "1.7";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/csv-mode-1.6.el";
- sha256 = "1v86qna1ypnr55spf6kjiqybplfbb8ak5gnnifh9vghsgb5jkb6a";
+ url = "https://elpa.gnu.org/packages/csv-mode-1.7.el";
+ sha256 = "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6";
};
packageRequires = [];
meta = {
@@ -551,10 +564,10 @@
debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
elpaBuild {
pname = "debbugs";
- version = "0.14";
+ version = "0.15";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/debbugs-0.14.tar";
- sha256 = "07wgcvg038l88gxvjr0gjpjhyk743w22x1rqghz3gkmif0g70say";
+ url = "https://elpa.gnu.org/packages/debbugs-0.15.tar";
+ sha256 = "1x7jw2ldgkknyxg7x9fhnqkary691icnysmi3xw0g2fjrvllzhqw";
};
packageRequires = [ cl-lib soap-client ];
meta = {
@@ -700,10 +713,10 @@
ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
elpaBuild {
pname = "ebdb";
- version = "0.4.2";
+ version = "0.4.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ebdb-0.4.2.tar";
- sha256 = "1j9hgxa6csj3iz5vrl22xvhl9lxhig0n1cixgzhs1sb3z3nn2li6";
+ url = "https://elpa.gnu.org/packages/ebdb-0.4.3.tar";
+ sha256 = "1xq0nhhgzgzrvxbb0lgpz71rfd0dcjakh87wg8wi3cpiw9w7zx41";
};
packageRequires = [ cl-lib emacs seq ];
meta = {
@@ -752,15 +765,15 @@
license = lib.licenses.free;
};
}) {};
- el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
+ el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search";
- version = "1.3.2";
+ version = "1.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/el-search-1.3.2.tar";
- sha256 = "0lf0hk2pvy9yrb02sa3bg0hipshbgl9m4hx7db46jvmz5bf15nfq";
+ url = "https://elpa.gnu.org/packages/el-search-1.6.tar";
+ sha256 = "18pv2l6rl8f9x0yjn4iyf6g94c0ly5mizqg0vxr3m420bkbyk95h";
};
- packageRequires = [ emacs stream ];
+ packageRequires = [ cl-print emacs stream ];
meta = {
homepage = "https://elpa.gnu.org/packages/el-search.html";
license = lib.licenses.free;
@@ -848,10 +861,10 @@
}) {};
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
pname = "exwm";
- version = "0.15";
+ version = "0.17";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/exwm-0.15.tar";
- sha256 = "1y7nqry9y0a99bsdqkk9f554vczfw4sz6raadw3138835qy697jg";
+ url = "https://elpa.gnu.org/packages/exwm-0.17.tar";
+ sha256 = "03vgrrrc1d3xr9ydl1ydvmqnvpnzg858dzdky2nd65h9ssyp2f5f";
};
packageRequires = [ xelb ];
meta = {
@@ -918,10 +931,10 @@
gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gited";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gited-0.3.3.tar";
- sha256 = "0h3ps26sy4wp1s9vpsj066fpqjqacjlprz3kb09macgsg88k2c1p";
+ url = "https://elpa.gnu.org/packages/gited-0.3.4.tar";
+ sha256 = "0s03p0z5dqhigl01hzin2qy53nm7b4ilvfm83d0ca683i9rb7hx1";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -929,6 +942,20 @@
license = lib.licenses.free;
};
}) {};
+ gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "gle-mode";
+ version = "1.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/gle-mode-1.1.el";
+ sha256 = "0p9glalhkf8i4486pjwvrb9z4lqxl6jcqfk6jrjl6b1xi72xmdi0";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/gle-mode.html";
+ license = lib.licenses.free;
+ };
+ }) {};
gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "gnome-c-style";
version = "0.1";
@@ -945,10 +972,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gnorb";
- version = "1.3.1";
+ version = "1.4.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gnorb-1.3.1.tar";
- sha256 = "1g6xldkc6l6zlzd1slqizbbd5b9k4pbr66nrf5svidgiy7mlifw5";
+ url = "https://elpa.gnu.org/packages/gnorb-1.4.2.tar";
+ sha256 = "1892j8gdbcny6b9psxa1lwxsb1gkj9z9z00rfc62kdw8bffmx38y";
};
packageRequires = [ cl-lib ];
meta = {
@@ -1013,10 +1040,10 @@
}) {};
hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "hook-helpers";
- version = "1.1";
+ version = "1.1.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/hook-helpers-1.1.tar";
- sha256 = "0xvabl0lfc0ijr98clsyh0bqk2fdi1ncl0knn58j2p30gn9958i5";
+ url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar";
+ sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im";
};
packageRequires = [ emacs ];
meta = {
@@ -1053,10 +1080,10 @@
}) {};
hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "hyperbole";
- version = "6.0.2";
+ version = "7.0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/hyperbole-6.0.2.tar";
- sha256 = "0nyihi7j2061jpdzl4mf4pki840hkfpwj0m2sqz0nqxd689ckwpg";
+ url = "https://elpa.gnu.org/packages/hyperbole-7.0.2.tar";
+ sha256 = "1hgwa740941a9s5wf1cqf76h3af8qbiiw9sc76biz6m3vx0hy1zs";
};
packageRequires = [ emacs ];
meta = {
@@ -1092,10 +1119,10 @@
}) {};
ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "ivy";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ivy-0.9.1.tar";
- sha256 = "1jfc3zf6ln7i8pp5j0fpsai2w847v5g77b5fzlxbgvj80g3v5887";
+ url = "https://elpa.gnu.org/packages/ivy-0.10.0.tar";
+ sha256 = "01m58inpd8jbfvzqsrwigzjfld9a66nf36cbya26dmdy7vwdm8xm";
};
packageRequires = [ emacs ];
meta = {
@@ -1359,10 +1386,10 @@
mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "mines";
- version = "1.2";
+ version = "1.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/mines-1.2.tar";
- sha256 = "1xwnw2hyk1qz98mdnckk0i05li0gzygq12kkmrlidxnk7ngbq9vw";
+ url = "https://elpa.gnu.org/packages/mines-1.6.tar";
+ sha256 = "1199s1v4my0qpvc5aaxzbqayjn59vilxbqnywvyhvm7hz088aps2";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -1411,10 +1438,10 @@
}) {};
muse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "muse";
- version = "3.20";
+ version = "3.20.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/muse-3.20.tar";
- sha256 = "0i5gfhgxdm1ripw7j3ixqlfkinx3fxjj2gk5md99h70iigrhcnm9";
+ url = "https://elpa.gnu.org/packages/muse-3.20.1.tar";
+ sha256 = "0h8lxm08r519psz93m1i43prkcpsm2dgkcvdlpvg7sm0ky7i5cay";
};
packageRequires = [];
meta = {
@@ -1568,19 +1595,6 @@
license = lib.licenses.free;
};
}) {};
- org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
- pname = "org";
- version = "20171113";
- src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-20171113.tar";
- sha256 = "0yynbzxbsjv0z12ydjgz81ysbg2irq37d9pzar8wspdjij15dypb";
- };
- packageRequires = [];
- meta = {
- homepage = "https://elpa.gnu.org/packages/org.html";
- license = lib.licenses.free;
- };
- }) {};
osc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "osc";
version = "0.1";
@@ -1621,6 +1635,19 @@
license = lib.licenses.free;
};
}) {};
+ paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+ pname = "paced";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/paced-1.1.3.tar";
+ sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl";
+ };
+ packageRequires = [ async emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/paced.html";
+ license = lib.licenses.free;
+ };
+ }) {};
parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "parsec";
@@ -1661,6 +1688,19 @@
license = lib.licenses.free;
};
}) {};
+ posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+ pname = "posframe";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/posframe-0.3.0.el";
+ sha256 = "0q74lwklr29c50qgaqly48nj7f49kgxiv70lsvhdy8cg2v082v8k";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/posframe.html";
+ license = lib.licenses.free;
+ };
+ }) {};
psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "psgml";
version = "1.3.4";
@@ -1677,10 +1717,10 @@
python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "python";
- version = "0.25.2";
+ version = "0.26";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/python-0.25.2.el";
- sha256 = "1ac2ipyg49sb0lz3n0ykj2s6592abd38l5d1cpbmv73j13l8zq5i";
+ url = "https://elpa.gnu.org/packages/python-0.26.el";
+ sha256 = "197sq42xd4ryqq2zy1802pns6wf6n4vzx90yxgn1zzqpwffpv317";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -1727,6 +1767,19 @@
license = lib.licenses.free;
};
}) {};
+ rbit = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+ pname = "rbit";
+ version = "0.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/rbit-0.1.el";
+ sha256 = "0h0f9jx4xmkbyxk39wibrvnj65b1ylkz4sk4np7qcavfjs6dz3lm";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/rbit.html";
+ license = lib.licenses.free;
+ };
+ }) {};
rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "rcirc-color";
version = "0.3";
@@ -1908,10 +1961,10 @@
sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "sml-mode";
- version = "6.7";
+ version = "6.8";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/sml-mode-6.7.el";
- sha256 = "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x";
+ url = "https://elpa.gnu.org/packages/sml-mode-6.8.el";
+ sha256 = "105fcrz5qp95f2n3fdm3awr6z58sbrjihjss6qnrg4lz2ggbc328";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -1972,6 +2025,19 @@
license = lib.licenses.free;
};
}) {};
+ sql-indent = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+ pname = "sql-indent";
+ version = "1.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/sql-indent-1.1.tar";
+ sha256 = "06q41msfir178f50nk8fnyc1rwgyq5iyy17pv8mq0zqbacjbp88z";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/sql-indent.html";
+ license = lib.licenses.free;
+ };
+ }) {};
stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "stream";
version = "2.2.4";
@@ -2201,10 +2267,10 @@
}) {};
vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "vlf";
- version = "1.7";
+ version = "1.7.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/vlf-1.7.tar";
- sha256 = "007zdr5szimr6nwwrqz9s338s0qq82r006pdwgcm8nc41jsmsx7r";
+ url = "https://elpa.gnu.org/packages/vlf-1.7.1.tar";
+ sha256 = "0cnwxk20573iqkwk0c0h7pyjk0rkr8l2qd0xmyqj8mvdxjb8nnkz";
};
packageRequires = [];
meta = {
@@ -2280,10 +2346,10 @@
}) {};
which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "which-key";
- version = "3.0.2";
+ version = "3.1.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/which-key-3.0.2.tar";
- sha256 = "1s7bq7vq9xsf2pz1w03l743yzaxm9gk5qgympcwlkiq90ph13vcn";
+ url = "https://elpa.gnu.org/packages/which-key-3.1.0.tar";
+ sha256 = "17n09i92m7qdicybxl60j81c8fn7jcx25wds0sb7j8i364psjabq";
};
packageRequires = [ emacs ];
meta = {
@@ -2347,10 +2413,10 @@
xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "xelb";
- version = "0.12";
+ version = "0.14";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/xelb-0.12.tar";
- sha256 = "0i9n0f3ibj4a5pwcsvwrah9m0fz32m0x6a9wsmjn3li20v8pcb81";
+ url = "https://elpa.gnu.org/packages/xelb-0.14.tar";
+ sha256 = "09flnbjy9ck784kprz036rwg9qk45hpv0w5hz3pz3zhwyk57fv74";
};
packageRequires = [ cl-generic emacs ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 0212451bef05..0cea8f0a7316 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -36,9 +36,12 @@ self:
};
overrides = {
+ # upstream issue: missing footer
+ ebdb-i18n-chn = markBroken super.ebdb-i18n-chn;
el-search = markBroken super.el-search; # requires emacs-25
iterators = markBroken super.iterators; # requires emacs-25
midi-kbd = markBroken super.midi-kbd; # requires emacs-25
+ rcirc-menu = markBroken super.rcirc-menu; # Missing file header
stream = markBroken super.stream; # requires emacs-25
cl-lib = null; # builtin
tle = null; # builtin
diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index 634c654d58fc..8e1d7092e6a1 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
homepage = http://emacs-w3m.namazu.org/;
- maintainers = [ stdenv.lib.maintainers.mornfall ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
index 7b7004b72f30..733393307d3f 100644
--- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
@@ -2,11 +2,11 @@
melpaBuild {
pname = "font-lock-plus";
- version = "20170222.1755";
+ version = "20180101.25";
src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
- sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30";
+ url = "https://www.emacswiki.org/emacs/download/font-lock%2b.el?revision=25";
+ sha256 = "0197yzn4hbjmw5h3m08264b7zymw63pdafph5f3yzfm50q8p7kp4";
name = "font-lock+.el";
};
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 2fcdf08aac42..c91812fc30a6 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -145,6 +145,27 @@
license = lib.licenses.free;
};
}) {};
+ abgaben = callPackage ({ f, fetchFromGitLab, fetchurl, lib, melpaBuild, pdf-tools, s }:
+ melpaBuild {
+ pname = "abgaben";
+ version = "20171118.2246";
+ src = fetchFromGitLab {
+ owner = "akoehn";
+ repo = "abgaben";
+ rev = "20d14830f07d66e2a04bcad1498a4a6fbf4b4451";
+ sha256 = "0apcbfaa70kgrpjjsfbr0lg9lcfiijpx5bms4sbzc606vlnxxn0d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2b0aa60aa0edf33205e0fcb309be779ad8da08ec/recipes/abgaben";
+ sha256 = "1xywghyp6aahzin1ygwzqfg9640dliycl4g02jz3gpix8hd3g8gy";
+ name = "abgaben";
+ };
+ packageRequires = [ f pdf-tools s ];
+ meta = {
+ homepage = "https://melpa.org/#/abgaben";
+ license = lib.licenses.free;
+ };
+ }) {};
abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "abl-mode";
@@ -208,27 +229,6 @@
license = lib.licenses.free;
};
}) {};
- ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "ac-anaconda";
- version = "20160221.1123";
- src = fetchFromGitHub {
- owner = "proofit404";
- repo = "ac-anaconda";
- rev = "94f66b4d4bf0fd9683ee77511833b1eceace0462";
- sha256 = "15xkwnadqjkbgvilyfldj7z5kz2wvw1dk2bcgphx2z9qwjc7wd5f";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda";
- sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
- name = "ac-anaconda";
- };
- packageRequires = [ anaconda-mode auto-complete dash ];
- meta = {
- homepage = "https://melpa.org/#/ac-anaconda";
- license = lib.licenses.free;
- };
- }) {};
ac-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ac-c-headers";
@@ -320,8 +320,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "ac-cider";
- rev = "d8670939bbf88079263d5ace2b8bc04cf325be36";
- sha256 = "01g1h2j0rfih8v0yvvr5gjh3abcj2mz3jmfbis8a60ivmngab732";
+ rev = "fa13e067dd9c8c76151c7d140a2803da1d109b84";
+ sha256 = "1pklmjldnm8bf34f5q8x983d1m72l3kf51ns9vh6z704mkhv658f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8adefaf2e284ef91baec3dbd3e10c868de69926/recipes/ac-cider";
@@ -337,12 +337,12 @@
ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
melpaBuild {
pname = "ac-clang";
- version = "20170615.838";
+ version = "20171209.240";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "ac-clang";
- rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd";
- sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57";
+ rev = "f11f17382646e13a0c794821ed5efe1692f96652";
+ sha256 = "0ynl5fvsamij5ji2cnxp4vbqwbw09c8x8fxx3s80v02yi3xi5fr0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -383,8 +383,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
- sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
+ rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff";
+ sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -715,12 +715,12 @@
ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ac-octave";
- version = "20170220.1728";
+ version = "20171122.943";
src = fetchFromGitHub {
owner = "coldnew";
repo = "ac-octave";
- rev = "f131ed6859a0945ac0c0520d2ab076f16ce7314c";
- sha256 = "0aigfydmfw284qkhajzxhnl5zx41v5z6ip0kjwmwgphqyxay7nih";
+ rev = "6d09b94a86f43de84c60e9a699b5e1be61c0f138";
+ sha256 = "1kg5q0bw0ymynsn3j7bjavb6wr8b0bjwm6jfj254g80y1inn4bp4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave";
@@ -736,12 +736,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "ac-php";
- version = "20170110.2036";
+ version = "20171201.134";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "217fc49cc8ededd96ab8b7f656ef80fb905c3f4a";
- sha256 = "0dg494qivcb8y87hzkby4qi1cr4pn7fl079yjwrwq54qpwq60jgw";
+ rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c";
+ sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -757,12 +757,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "20171112.1900";
+ version = "20180314.2055";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "217fc49cc8ededd96ab8b7f656ef80fb905c3f4a";
- sha256 = "0dg494qivcb8y87hzkby4qi1cr4pn7fl079yjwrwq54qpwq60jgw";
+ rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c";
+ sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -803,8 +803,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "dadd74f015f89317ff77424be30a9accadeeb4a4";
- sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1009,12 +1009,12 @@
ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-link";
- version = "20171109.1250";
+ version = "20180308.100";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-link";
- rev = "3bc7a61a9d7923bb71066906e17cb8a0db415c24";
- sha256 = "0dalspw44ra9ik7f1lflmck76ar0v6qig700qczlml52lr9vf045";
+ rev = "fae5d508ff519ba1fab21c51f46c0906fd82229f";
+ sha256 = "118dp8w0z475j67gvl1dj137glbli2ykbm934vdvlz6q0k94vds7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1072,12 +1072,12 @@
ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-popup-menu";
- version = "20170518.2244";
+ version = "20171231.2215";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ace-popup-menu";
- rev = "eae1b0ea1a56cc1da2543e95570867a1a026669d";
- sha256 = "1w1q0r104v9fngzi3q8l6gwzb0c9gdq2jmbjb372j7969py73ywc";
+ rev = "7b436a0d9e896463d00afbeb7e49a59cc6670e9c";
+ sha256 = "0ma5hq0v4kczf7mn1wkqj9pxjy47wryd697gg37l4sszl6ylcs9w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu";
@@ -1093,12 +1093,12 @@
ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-window";
- version = "20171109.1032";
+ version = "20180123.1111";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-window";
- rev = "c875ffbe64f9193eff00ff779b7e1ae0195a4316";
- sha256 = "0pmiia3ydw632685lm834pps9hvibnkbrpaf08ny3c5yi9qyd08p";
+ rev = "208ea2a4e809f0c91caf3354b44a8f4a4f1cbb73";
+ sha256 = "1bkck2gbbgxhh1swzkdsyk5vp9h08dv8skc5hr4ncgxy2fq8m27g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1173,15 +1173,36 @@
license = lib.licenses.free;
};
}) {};
+ adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "adafruit-wisdom";
+ version = "20180224.1652";
+ src = fetchFromGitHub {
+ owner = "gonewest818";
+ repo = "adafruit-wisdom.el";
+ rev = "aafc01726f1b3160321d40160298a0e1b054b382";
+ sha256 = "18p55zghycsx88dn0iw610fklkhi5chzycrpjb4xzs5x1l5l2v08";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom";
+ sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad";
+ name = "adafruit-wisdom";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/adafruit-wisdom";
+ license = lib.licenses.free;
+ };
+ }) {};
add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-hooks";
- version = "20170705.2205";
+ version = "20171216.1723";
src = fetchFromGitHub {
owner = "nickmccurdy";
repo = "add-hooks";
- rev = "5e18cc3887477aeec41a34f608d9aa55bfa92d0e";
- sha256 = "05a0ayqjldl53s3zmfgmdqq8jf1qw1m2a2sj4qzn2bci0dgsakcp";
+ rev = "1845137703461fc44bd77cf24014ba58f19c369d";
+ sha256 = "02s9mv26ycypn4qfshrh17v1hsys2q9vffxj3g4lgq0lykplvkkm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1302,12 +1323,12 @@
ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ag";
- version = "20170915.1249";
+ version = "20180225.240";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ag.el";
- rev = "3b567902ccbec4ed9b8c5f5cd369be833e485e79";
- sha256 = "1ihhmz4ww6iqbjbv1cvssixn01bkd2cl8pij7p32dxyyd8jdwlkq";
+ rev = "77b4f50c5372bf219da496567b2b867261f0d354";
+ sha256 = "0kwp6bb8fwv76x9r35rz4mvwica1fsappp82rjr1xlhnwwdsc120";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1364,11 +1385,11 @@
}) {};
ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "ahg";
- version = "20171003.39";
+ version = "20180125.944";
src = fetchhg {
url = "https://bitbucket.com/agriggio/ahg";
- rev = "6a4cc7a7eee6";
- sha256 = "09c3rawxqxxbl648bq1akawmgwiwppzd9g2sspza0k52adsb3rps";
+ rev = "622b519d8586";
+ sha256 = "14jayh9bn8f6mjiln6h7ny404g0iy8zr7b6s6faqqhd840h519mz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg";
@@ -1405,12 +1426,12 @@
ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ahungry-theme";
- version = "20171103.2238";
+ version = "20180130.1928";
src = fetchFromGitHub {
owner = "ahungry";
repo = "color-theme-ahungry";
- rev = "9ec7fca8002b213c7eee1168258e36a683190d18";
- sha256 = "01gjmyxb0m6i321md77wscqrhy30gyhrk4fjcx7mg2z9hzxvzljb";
+ rev = "a038d91ec593d1f1b19ca66a0576d59bbc24c523";
+ sha256 = "0f86xp7l8bv4z5dgf3pamjgqyiq3kfx9gbi9wcw0m6lbza8db15a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@@ -1468,12 +1489,12 @@
alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "alchemist";
- version = "20171029.2307";
+ version = "20180312.604";
src = fetchFromGitHub {
owner = "tonini";
repo = "alchemist.el";
- rev = "4beb4c9ceee0534a36f7669aa35fcbdfd6bef7b7";
- sha256 = "0k1k5rb95nyndzhin47r4nzap4fp3dr57gv557wzy3a6jpl88fgz";
+ rev = "6f99367511ae209f8fe2c990779764bbb4ccb6ed";
+ sha256 = "12f95rwxs11sqf1w9pnf6cxc2lh2jz4nqkq33p8b5yamnl8cq9kg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1493,8 +1514,8 @@
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
- rev = "ea0d3a25ca2b45d08c510ad55b3d8a5374b2ec43";
- sha256 = "18rfn6608sxwv8r0kdrzhag58kf1822xmy7h9gw1ci7mfpq2i1ns";
+ rev = "2582122c41cd34d034b6bbe71469f5ceb1de40c7";
+ sha256 = "11miyk48p09327ivmsk1hiw0brnx1pgjvdrfsdfhcwhbv2cafnf9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1510,12 +1531,12 @@
alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alect-themes";
- version = "20170825.1009";
+ version = "20180312.1338";
src = fetchFromGitHub {
owner = "alezost";
repo = "alect-themes";
- rev = "ded94ab1421994aa863a4d7538ec7453768ec235";
- sha256 = "1616vkjgn5g4xf40p15847pkqyrlfzp9d143a4cyk7za50a175ll";
+ rev = "69045201a8597181509c71c770d0fbce398f0af5";
+ sha256 = "0qmrd9csa3w8a0nkrc8f4a3f67inj7hpbdwsk0883dnc7lq4lkjn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -1531,12 +1552,12 @@
alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
melpaBuild {
pname = "alert";
- version = "20171024.1907";
+ version = "20180122.1242";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "alert";
- rev = "206d7095c93a25bb41af17cd26fd3967ddd57e00";
- sha256 = "1lyvq0zkamlyv3z23x8hb8dirjd45bihqhmwdgilnw3y139vhm4l";
+ rev = "103d34c83fe77e46a6976dcaba3db678199e0c9c";
+ sha256 = "1nbk768d8iqjf1mx956497hbjfxar144h3m3sd298byc54z8bvmf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -1591,22 +1612,22 @@
license = lib.licenses.free;
};
}) {};
- all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
+ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }:
melpaBuild {
pname = "all-the-icons";
- version = "20171011.324";
+ version = "20180125.757";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "b93707e3a3a7a4968b3e212b890edfe265dcd57d";
- sha256 = "09hyg0fs3qgyc6dbn23pw8p7w2m9xvkf5cz8v0f18a7fkvq2j2f9";
+ rev = "52d1f2d36468146c93aaf11399f581401a233306";
+ sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
name = "all-the-icons";
};
- packageRequires = [ emacs font-lock-plus memoize ];
+ packageRequires = [ emacs memoize ];
meta = {
homepage = "https://melpa.org/#/all-the-icons";
license = lib.licenses.free;
@@ -1636,12 +1657,12 @@
all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons-gnus";
- version = "20170726.619";
+ version = "20180108.153";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "all-the-icons-gnus";
- rev = "45560293e42d02c17c332894f3764dd624d25444";
- sha256 = "1j0s3m54gyrl50bqss6xaijja1hdbm5285py750dn4ykrj5m3d3r";
+ rev = "61830f1da0f8ad8e9235133f5470daeb50d2de41";
+ sha256 = "19hjy14yalw736cjqbgm3dv4cly545k57ac16vj6c6jalb7wi0l5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus";
@@ -1657,12 +1678,12 @@
all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons-ivy";
- version = "20170508.25";
+ version = "20180225.630";
src = fetchFromGitHub {
owner = "asok";
repo = "all-the-icons-ivy";
- rev = "5357bccddfd30580d5859f3794248efb86a8a054";
- sha256 = "1n6c7vglxkib4irjjafiwdz6cifbb20229n2fpnxkv57hmdarivr";
+ rev = "52b3f4a8a4a038998943afaffb5ff25054f65af4";
+ sha256 = "1xkrqv6znf1savkg17w41d9rm7wrs8n3c4ad0arrmi522qgp78fr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy";
@@ -1678,12 +1699,12 @@
amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
melpaBuild {
pname = "amd-mode";
- version = "20161124.550";
+ version = "20180111.602";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "amd-mode.el";
- rev = "11e27444692bbf0eb38ec28af6bd041618c5c091";
- sha256 = "1qcag5sjg2p64lllgy237j8gkm7vp2kxr6wppkps5wgkf7bn4q4z";
+ rev = "01fd19e0d635ccaf8e812364d8720733f2e84126";
+ sha256 = "040g07k2hcwqspansjqfpng0lxzkmip26ipz26q6mvkpwm2wilv4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode";
@@ -1729,12 +1750,12 @@
ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ample-theme";
- version = "20161213.912";
+ version = "20180207.945";
src = fetchFromGitHub {
owner = "jordonbiondo";
repo = "ample-theme";
- rev = "8fbae3a9965f933c487f4cfdf2d881753d9feeb1";
- sha256 = "0knzfxdncb1x41zqknv70p62zwr4k5nxf8l108x9w043drxc10lw";
+ rev = "366698400c555211c2082962a5d74f3dd79a78c8";
+ sha256 = "1kzb15aqy7n2wxibmnihya7n6ajs34jxp9iin96n758nza92m59c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme";
@@ -1768,22 +1789,22 @@
license = lib.licenses.free;
};
}) {};
- amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "amx";
- version = "20170923.835";
+ version = "20180313.857";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "amx";
- rev = "88ab7ccb2a88b5cd3ecc4d703ae9373df3e4971c";
- sha256 = "1n1zsrlj272scl4xcbys86d6gxnaq08vp5frd96i47c1an75p0xw";
+ rev = "f2b030121e59b9b3c8f05218e6c673bc6d69125e";
+ sha256 = "10369f68wzpxb01bmk35yhm1z99wj0vm5d6ivdq5n6lard5afgvy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap";
name = "amx";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs s ];
meta = {
homepage = "https://melpa.org/#/amx";
license = lib.licenses.free;
@@ -1792,12 +1813,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "20170924.704";
+ version = "20180209.1147";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "89fc16d50b889a17521084347b28f3011b84e113";
- sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g";
+ rev = "384f1c5995a96c2687cea7cf18ff5710d00a39c2";
+ sha256 = "0qk1cd39pqjfm9hpgwm6xb205rgcka9jxfdkw3fcay3rmj3qyzws";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1915,6 +1936,27 @@
license = lib.licenses.free;
};
}) {};
+ anki-editor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "anki-editor";
+ version = "20180210.633";
+ src = fetchFromGitHub {
+ owner = "louietan";
+ repo = "anki-editor";
+ rev = "a4a018d49e7c1fb01386216be6b8572b5ca33f94";
+ sha256 = "15mwbg0yrv8vs2wgn7vb2psk6qw29vivq778hxg7k9f4ak7kn7ls";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8155d649e4b129d0c72da6bb2b1aac66c8483491/recipes/anki-editor";
+ sha256 = "18c5p82llq11vg1svqvbjrcnm7695nbbc6pwwl9jdjplasar585l";
+ name = "anki-editor";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/anki-editor";
+ license = lib.licenses.free;
+ };
+ }) {};
annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "annotate";
@@ -2086,12 +2128,12 @@
anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anti-zenburn-theme";
- version = "20160725.1559";
+ version = "20180121.353";
src = fetchFromGitHub {
owner = "m00natic";
repo = "anti-zenburn-theme";
- rev = "164122ebb7a39c41b953e90fe05cf440c5335d9e";
- sha256 = "1l3z6wi2im7cax08ml3gsaik5hvpf0nzxcl4zlchskmgjbzav704";
+ rev = "c80cc51bb1aaf11dd53b9d08e01d61bc9b32622f";
+ sha256 = "1c97d2jkh7iawgsbcg19gha9ffnxypbcfz0sgcsgf9vy4bvnc350";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f6f803dc99a1b1fdb5b4e79f1c9cf72b702d091/recipes/anti-zenburn-theme";
@@ -2337,12 +2379,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything-tramp";
- version = "20170708.1834";
+ version = "20180311.2344";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
- rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43";
- sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m";
+ rev = "9b88be0c58843569dcb016550e6fad4f75847fc5";
+ sha256 = "18016zgdqa7i0vaqj9j3zkdw2i3iw8i2axyrm0579hq4hksx69w0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -2463,12 +2505,12 @@
apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apiwrap";
- version = "20171022.2203";
+ version = "20180201.637";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
- rev = "79422b610f2c3d9f52fb35449485a2fc541bc5a0";
- sha256 = "0i2k975szdgzmrbwkvcnhrk73ndvk0q215fn68sb5m4zf43ifwxz";
+ rev = "44fe79d56bafaaf3a688e5441298ec5f7bbf419e";
+ sha256 = "12i39kl4fj1xhzrdw24i4mi2m3aj2w3isxpcyr48z23d1x0grviq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2547,12 +2589,12 @@
apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apropospriate-theme";
- version = "20171010.1420";
+ version = "20180223.1526";
src = fetchFromGitHub {
owner = "waymondo";
repo = "apropospriate-theme";
- rev = "b4d5a2fedec176d3562943668609766fab0b23ff";
- sha256 = "0y31zx6npv03ygjywy23pvrpvjwi1fh1qhs1qzxsi25pbbk1hkq0";
+ rev = "019ed5cf8f1e1abfead7adceeda88938dfe928b7";
+ sha256 = "0x6iw9dr3zvy2xqxadlxkjhpkfgig009x0ilipdji20hpa0qhhgm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2568,11 +2610,11 @@
apt-sources-list = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apt-sources-list";
- version = "20171004.1143";
+ version = "20180311.437";
src = fetchgit {
url = "https://git.korewanetadesu.com/apt-sources-list.git";
- rev = "842c3896f660295e4c16938aa1fd195e5d377460";
- sha256 = "1d1v2h91vabqdrjcrdnzqj4xzmm7gbad4mxcphrj5yfnc4rrfc12";
+ rev = "fd12fbacf245714be5ca20563572cb49e2f1eb45";
+ sha256 = "0kfz9gj66a9wqcdrvxg4hzndmh1j01wqfqkdrblplgni4h7907a4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/141a22e593415302d64cf8ebd2635a1baf35eb38/recipes/apt-sources-list";
@@ -2648,22 +2690,22 @@
license = lib.licenses.free;
};
}) {};
- arduino-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ arduino-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "arduino-mode";
- version = "20151017.2335";
+ version = "20180305.1916";
src = fetchFromGitHub {
- owner = "bookest";
+ owner = "stardiviner";
repo = "arduino-mode";
- rev = "3e2bad4569ad26e929e6db2cbcff0d6d36812698";
- sha256 = "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c";
+ rev = "40bc53149b517ebfa448b07f0b766f24d612f716";
+ sha256 = "0rh8rmi7y1a4myf6pa51qhr9sa1arjfbrr6rzbsdlwcbzinfj83f";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e21ef938877444097d6d9cb7769819e2acb77cff/recipes/arduino-mode";
- sha256 = "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2db785f52c2facc55459e945ccb4d4b088506747/recipes/arduino-mode";
+ sha256 = "1amqah0sx95866ikdlc7h7n9hmrwaqizc0rj0gliv15kjjggv55v";
name = "arduino-mode";
};
- packageRequires = [];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/arduino-mode";
license = lib.licenses.free;
@@ -2676,8 +2718,8 @@
src = fetchFromGitLab {
owner = "ukaszg";
repo = "aria2";
- rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0";
- sha256 = "1xkgz3l7idw5bk1xlffdaddf5v1q6fm3grbryl4xvssrbwgnyisf";
+ rev = "7a944c5100812269369225af7aa9580fedab175f";
+ sha256 = "1pwnx6k7b35xhwqvzd3rl6rf5ydvbrrdmbadns8w0iyz2yafdxji";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/89a55e7c313066ae1bc0db0af5c289814c85fcb1/recipes/aria2";
@@ -2739,8 +2781,8 @@
src = fetchFromGitHub {
owner = "sachac";
repo = "artbollocks-mode";
- rev = "4a907e470bf345b88c3802c1241ce2b8cf4123ee";
- sha256 = "1l1dwhdfd5bwx92k84h5v47pv9my4p4wj0wq8hrwvwzwlv8dzn2w";
+ rev = "33a41ca4f8206f57e5498a526d3b0ea18d08bb93";
+ sha256 = "06a2dp6nwy8xjr01k6d2c611qr2n9m7hdkrz9fci9r4rv1ikx5xv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode";
@@ -2840,12 +2882,12 @@
async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "async";
- version = "20171015.2239";
+ version = "20180119.533";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "emacs-async";
- rev = "424ecd8a28cd59fe7d2de3cb4b37a4224e34c123";
- sha256 = "0zmbg3r6sykmchy8hhbw8glzl8xvki030rzg9r55v4g61k8qy13r";
+ rev = "7279cc6bdba7bfcb53ca8f5471631ae8dc3918b3";
+ sha256 = "1nmi2ykwbswj6qv2s38518nijmlhjd2jvhabybqs8smc152g58sw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
@@ -2924,12 +2966,12 @@
atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "atom-one-dark-theme";
- version = "20170803.916";
+ version = "20180305.1454";
src = fetchFromGitHub {
owner = "jonathanchu";
repo = "atom-one-dark-theme";
- rev = "6ad96e25f8b46942380afbc33e3659a5e9fa09b1";
- sha256 = "06gf26r00yq1whrws9ilra8l2xfg2x89vxbgx3vgbwlvwx9wcsm6";
+ rev = "7b73ab795286fe121d23026dcc94d6a0a211e4c4";
+ sha256 = "1w5j773zg6lz8vq9yqfx2w5076h53k0narcnknni8hd8z4qg6b6q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
@@ -2945,12 +2987,12 @@
atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
melpaBuild {
pname = "atomic-chrome";
- version = "20171022.107";
+ version = "20171116.2332";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "atomic-chrome";
- rev = "1bd79fc940d2be82eaec20aca2069677e156a697";
- sha256 = "1j5brpmbahnrp8kxphq10g0l703czdalqa731y3s2p3m3gida54x";
+ rev = "7dd8a45ebccb9b5bbbfd2e822bd914b38dad6008";
+ sha256 = "0nbhw43c7jrpx7iyyjp3fdzprccj549d6k1kd3wgym83qljf236d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
@@ -2963,6 +3005,27 @@
license = lib.licenses.free;
};
}) {};
+ attrap = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "attrap";
+ version = "20180218.1243";
+ src = fetchFromGitHub {
+ owner = "jyp";
+ repo = "attrap";
+ rev = "0a733deccaf48350511346b2f5a51d328df4dfc8";
+ sha256 = "1ck6m30m76jad7w4mwnpv2gl0kzsjpjvmgjblc5a4gw1wsz3i2iz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b7420eca80a8c1776d68b1f121511cc265cc70dc/recipes/attrap";
+ sha256 = "1gxnrlsn9xcnnx0nhjxnhrz9bdpk2kpzjhj8jhjmwws9y361fimh";
+ name = "attrap";
+ };
+ packageRequires = [ dash emacs f flycheck s ];
+ meta = {
+ homepage = "https://melpa.org/#/attrap";
+ license = lib.licenses.free;
+ };
+ }) {};
auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auctex-latexmk";
@@ -3047,22 +3110,43 @@
license = lib.licenses.free;
};
}) {};
- auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
+ aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "aurora-config-mode";
+ version = "20180216.1502";
+ src = fetchFromGitHub {
+ owner = "bdd";
+ repo = "aurora-config-mode.el";
+ rev = "8273ec7937a21b469b9dbb6c11714255b890f410";
+ sha256 = "1dlhf35hhjgkd9bqbpwrb825g1z6nh14mg31jg2avv55s28j0riy";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode";
+ sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
+ name = "aurora-config-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/aurora-config-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
+ auth-password-store = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auth-password-store";
- version = "20171109.1045";
+ version = "20180222.916";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "auth-password-store";
- rev = "72f7b8827e3ce73a8e418e5c219b50856f48ac26";
- sha256 = "19rfaxcarikf5jwwyyzqpcrhphrr71nqs9cw0w3zjrp7z0cbzxsf";
+ rev = "0a83b8fa074571023a10aed263d2ee7d865a49f7";
+ sha256 = "0z4pk614ndjg68z70lbc20ns9kv8r3vdayv4yy6n0jj9fvnd2pn8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
name = "auth-password-store";
};
- packageRequires = [ cl-lib emacs password-store seq ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/auth-password-store";
license = lib.licenses.free;
@@ -3113,12 +3197,12 @@
auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
melpaBuild {
pname = "auto-compile";
- version = "20170817.1437";
+ version = "20180111.436";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "auto-compile";
- rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a";
- sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa";
+ rev = "8d117868a0a091389d528428136e60f951e9c550";
+ sha256 = "1qkw8qzhqzk16kvk1200ha10gi6ny0saqvyqm6b1ww0iw3q1ic5c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
@@ -3449,12 +3533,12 @@
auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-indent-mode";
- version = "20161118.1458";
+ version = "20171221.2106";
src = fetchFromGitHub {
owner = "mattfidler";
repo = "auto-indent-mode.el";
- rev = "7e939f3a7b092c6c32c97d63fd88aef6cc355cdb";
- sha256 = "18c9469b53kwydhrpd8kivwvs0w0ndfbwkyxixjz9wijp0wmpri1";
+ rev = "28069360a7f89ad0286fd6a53db550752ec58488";
+ sha256 = "14sqmv320ryfljpxbjw9xphj6bz1ccjk3ih4cm1r8aryyhxiacii";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/49af78177278e7072c70fde0eaa5bb82490ebe9d/recipes/auto-indent-mode";
@@ -3488,22 +3572,22 @@
license = lib.licenses.free;
};
}) {};
- auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-org-md";
- version = "20160923.708";
+ version = "20180213.1543";
src = fetchFromGitHub {
owner = "jamcha-aa";
repo = "auto-org-md";
- rev = "7604c06c1b2f1d01c2e88f114bb0d2d00f21dabb";
- sha256 = "18js1pa60095fs8qjzhjhkx9sjwa2h2iribb27gqv59796qxkfsg";
+ rev = "9318338bdb7fe8bd698d88f3af89b2d6413efdd2";
+ sha256 = "1dzxc1f4yvj8xww5drcpzmn3fyi8ziimh1cmy6l3i399l1zl0njj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39f934f86b5dc04078c204bcbd268af60857e268/recipes/auto-org-md";
sha256 = "1yh9g8407kym6r0b8kr18qshxlrkw47ac17a9lvql0ksshfmnqvk";
name = "auto-org-md";
};
- packageRequires = [ emacs org ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/auto-org-md";
license = lib.licenses.free;
@@ -3614,6 +3698,27 @@
license = lib.licenses.free;
};
}) {};
+ auto-sudoedit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "auto-sudoedit";
+ version = "20171227.156";
+ src = fetchFromGitHub {
+ owner = "ncaq";
+ repo = "auto-sudoedit";
+ rev = "5a6f7da018fbb880c4c51032b39d7628a478989c";
+ sha256 = "190izcami97h2yzw267crs0xny494b9b58dmmb7bqslv38ayl396";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7cf6bc8bb7b618d74427622b9b2812daa79a3767/recipes/auto-sudoedit";
+ sha256 = "1clp52fqxsilyi62p1cabhan55lbwax6fqlhccyjbl36yrdig3fh";
+ name = "auto-sudoedit";
+ };
+ packageRequires = [ emacs f ];
+ meta = {
+ homepage = "https://melpa.org/#/auto-sudoedit";
+ license = lib.licenses.free;
+ };
+ }) {};
auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }:
melpaBuild {
pname = "auto-virtualenv";
@@ -3680,12 +3785,12 @@
autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "autobookmarks";
- version = "20171021.1532";
+ version = "20180131.535";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "autobookmarks";
- rev = "b40c69f2d1c419adad516bee81b07b99110e5cc3";
- sha256 = "0dailajx26dixlibqps5wfh224ps7azm453lmzxjc2d10mgapi5v";
+ rev = "93610f22500ac207f86e159d411de15082a8befb";
+ sha256 = "1ydqc2ry43sibf8xa99w2w6prxh5gmlmcinp0z67yhdcz4dh4v2v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
@@ -3785,12 +3890,12 @@
autotest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "autotest";
- version = "20150130.225";
+ version = "20171128.1812";
src = fetchFromGitHub {
owner = "zenspider";
repo = "elisp";
- rev = "164ae0f8302c1e1938a9e30597901b1164b43f96";
- sha256 = "1mgkwaa0q672r3lmw267ax54z4bvc3v3zji3q9asygni9bymkfyz";
+ rev = "ee8a9c3052446876057ff853369d136aea7831f5";
+ sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc2c4a590cbeccfb43003972a78f5d76ec4a9e7/recipes/autotest";
@@ -3890,12 +3995,12 @@
avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avk-emacs-themes";
- version = "20171001.235";
+ version = "20180205.2254";
src = fetchFromGitHub {
owner = "avkoval";
repo = "avk-emacs-themes";
- rev = "bf781eec7d46cce829ac5bdb114e728a110366e7";
- sha256 = "0bj51ii8vsd2gwyykxp1hvkp4r9kbc0b7ajskf8i5vb8qvpvkali";
+ rev = "1a119d0b52f0755fa14ad4d8c6e00e2e720b7732";
+ sha256 = "1im1bvrcy9163414328yfmsz2hb0whqxnd6wpmh8hvh6vpbmwaj7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes";
@@ -3911,12 +4016,12 @@
avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avy";
- version = "20171111.921";
+ version = "20171230.220";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "avy";
- rev = "91032912146f16c09987d8d35083f09809d6afaa";
- sha256 = "15v05r8hnk2adywfsfkxglbankllq880d4rqw0z7yf30k9l2533k";
+ rev = "34d3531a3cd35ae6b9e8dbc37343c027504fdcb0";
+ sha256 = "0rgwbm5jcbv132xldbz2kcp09c7hs96329mwfa019v99qdbb5k32";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -3953,12 +4058,12 @@
avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avy-menu";
- version = "20170518.2245";
+ version = "20171231.2220";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "avy-menu";
- rev = "c36e28cabbcea8fdd2ada723b9a28ecc35a2d6c0";
- sha256 = "14ci1saksmhnnk5a7dy2v9dbsw7c030524vwb3y1wpw0vv863zjh";
+ rev = "b133564cc438870d9b5505c8104611c8998fd0d5";
+ sha256 = "19xqs4hyd5wkh0vd3xfbfwhf8fhq5lbzrafx4fbvai24dhjn5rhb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu";
@@ -3974,12 +4079,12 @@
avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
melpaBuild {
pname = "avy-migemo";
- version = "20171031.915";
+ version = "20180104.624";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "avy-migemo";
- rev = "5598fd25e483d8521e6d5f691802fa125947d7cf";
- sha256 = "1gkn1qbywv8as3csp5s1fwmrp89bmbqgyl7av0c1v9ggx7gkhd5f";
+ rev = "526494a2ae86b66a22848e5dc274480e3b4d04ca";
+ sha256 = "04fkgiixfd0xgb2m0b48ngv2fmvz2vnjajfl1b59paczz8pnw96l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4034,18 +4139,39 @@
license = lib.licenses.free;
};
}) {};
+ aws-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+ melpaBuild {
+ pname = "aws-snippets";
+ version = "20180213.835";
+ src = fetchFromGitHub {
+ owner = "baron42bba";
+ repo = "aws-snippets";
+ rev = "619c9a401f873042e45547e8cf57f23d0c8947e4";
+ sha256 = "19yrdsn76vscqgxmapxn3gv6nrxp7i20p37anylmjss3xkvblxn9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets";
+ sha256 = "1p2il4ig3nafsapa87hgghw6ri9d5qqi0hl8zjyypa06rcnag9g9";
+ name = "aws-snippets";
+ };
+ packageRequires = [ yasnippet ];
+ meta = {
+ homepage = "https://melpa.org/#/aws-snippets";
+ license = lib.licenses.free;
+ };
+ }) {};
axiom-environment = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "axiom-environment";
version = "20171111.1152";
src = fetchgit {
- url = "https://bitbucket.org/pdo/axiom-environment.git";
+ url = "https://bitbucket.org/pdo/axiom-environment";
rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5";
sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/axiom-environment";
- sha256 = "0lr2kdm6jr25mi6s6mpahb8r56d3800r7jgljjdiz4ab36zqvgz3";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/axiom-environment";
+ sha256 = "1hzfxdwhgv0z9136k7bdjhqjrkawsjmvqch6za6p7nkpd9ikr2zb";
name = "axiom-environment";
};
packageRequires = [ emacs ];
@@ -4124,6 +4250,27 @@
license = lib.licenses.free;
};
}) {};
+ backup-each-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "backup-each-save";
+ version = "20180226.2157";
+ src = fetchFromGitHub {
+ owner = "conornash";
+ repo = "backup-each-save";
+ rev = "3c414b9d6b278911c95c5b8b71819e6af6f8a02a";
+ sha256 = "13pliz2ra020hhxcidkyhfa0767n188l1w5r0vpvv6zqyc2p414i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caa478356d20b5b0e9a450f7b4a8b25937e583a4/recipes/backup-each-save";
+ sha256 = "1l7lx3vd27qypkxa0cdm8zbd9fv08xn1bf6xj6g9c49ql95xbyiv";
+ name = "backup-each-save";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/backup-each-save";
+ license = lib.licenses.free;
+ };
+ }) {};
backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "backup-walker";
@@ -4173,8 +4320,8 @@
src = fetchFromGitHub {
owner = "ccann";
repo = "badger-theme";
- rev = "80fb9f8ace37b2e8807da639f7da499a53ffefd4";
- sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1";
+ rev = "493d672d5a5478976da7d5ca752008cc7837c57f";
+ sha256 = "0mrn3sl1xq19k6v4mw98zqgs11fidnarvidmxayx805k21pana6v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/298e43769c6cd855526d847e8e3b237912360777/recipes/badger-theme";
@@ -4211,12 +4358,12 @@
bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bar-cursor";
- version = "20160923.920";
+ version = "20180226.1645";
src = fetchFromGitHub {
owner = "ajsquared";
repo = "bar-cursor";
- rev = "afa1d4bc1937610cc30575d71aab85ea20ebf2ea";
- sha256 = "1cj28v48xajy1nsqk92vinaz2rh1crm5g58ma5gnibkdnkpq828s";
+ rev = "20cb59bedc3532a712fe7feeff3660ebd72a8107";
+ sha256 = "06b0nkcp8yjixps72nrgk2zmljc9f71cdr96jdpgssydfhn4pcdf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/932e7b128f092ec724ebf18c9c5ca84e16edc82c/recipes/bar-cursor";
@@ -4229,15 +4376,36 @@
license = lib.licenses.free;
};
}) {};
+ bart-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "bart-mode";
+ version = "20180131.1829";
+ src = fetchFromGitHub {
+ owner = "mschuldt";
+ repo = "bart-mode";
+ rev = "6feeb8f9badbc2ce4b60499bf7bf4acdae4cfed7";
+ sha256 = "1i1fcrwcswdqwb59154yzijccv7n0fqvm0ck3d8dqx5vczzmqixh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8f9cb09c07cb9fdef15de3e8dbfb6725d97dff6f/recipes/bart-mode";
+ sha256 = "0wyfsf7kqfghnci9rlk9x0rkai6x7hy3vfzkgh7s2yz081p1kfam";
+ name = "bart-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/bart-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "base16-theme";
- version = "20171111.1245";
+ version = "20180308.1227";
src = fetchFromGitHub {
owner = "belak";
repo = "base16-emacs";
- rev = "cb75b17eeab07a79147fc3e600170e6c35c4b18d";
- sha256 = "0igwdq41y5bd2jd7x3rmaxjqrjfyxwp5xyl5zx8rp0gql8jbn6qb";
+ rev = "f84ffb4d4065068f89a416f84002de92a39da1f1";
+ sha256 = "06hkpf6azjii9iiqvv3sh0vn7qczsjim9y1mk4vq3hp799ca67wh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4253,12 +4421,12 @@
bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bash-completion";
- version = "20170924.1021";
+ version = "20180303.1144";
src = fetchFromGitHub {
owner = "szermatt";
repo = "emacs-bash-completion";
- rev = "31bc1c1c21691668c6cc16a46361490d5bec303a";
- sha256 = "0iq9q0isaynrjhzgkm5hvw26162m52vbzwf12vic5nr9frxbxkv5";
+ rev = "6aedd690006e07199b2fcd319b9b840a527650e5";
+ sha256 = "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -4295,12 +4463,12 @@
basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "basic-mode";
- version = "20171027.1114";
+ version = "20171204.1217";
src = fetchFromGitHub {
owner = "dykstrom";
repo = "basic-mode";
- rev = "7a76ec2d45f6bc1e4b5a4c8996c4bf27a31741e6";
- sha256 = "02q9sxx9g8pqyiknbzy48qbmnvgl1pmcgsppbk7rybb68kq5zlqd";
+ rev = "b7e851f844e9a5264e44936d1675133b4c3ed39c";
+ sha256 = "0q29inrdk9i4rgx3a0km62lzn796hh24365cc3kzylx74g53a3qf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode";
@@ -4355,19 +4523,40 @@
license = lib.licenses.free;
};
}) {};
+ bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "bazel-mode";
+ version = "20180222.2253";
+ src = fetchFromGitHub {
+ owner = "codesuki";
+ repo = "bazel-mode";
+ rev = "b7aa14516feaed40ee4910eafa81db719de0fe56";
+ sha256 = "16yjxs62h8dm63nzc04i60bnbyhm2vrpvn98ap8rad6wib2ka3vj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode";
+ sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586";
+ name = "bazel-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/bazel-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbcode-mode";
- version = "20141103.1341";
+ version = "20180316.519";
src = fetchFromGitHub {
- owner = "ejmr";
+ owner = "lassik";
repo = "bbcode-mode";
- rev = "b6ff1bfb8041b1435ebfc0a7d8e5e34eeb1b6aae";
- sha256 = "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7";
+ rev = "653cf811460f60cb8c9489cfb3155c6493828d9f";
+ sha256 = "120g480vys6wrxhcch87jsxxvqwi31wi3dv1dckcqbxd1w1jfkzm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/bbcode-mode";
- sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode";
+ sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb";
name = "bbcode-mode";
};
packageRequires = [];
@@ -4378,11 +4567,11 @@
}) {};
bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "bbdb";
- version = "20171017.817";
+ version = "20180106.910";
src = fetchgit {
url = "https://git.savannah.nongnu.org/git/bbdb.git";
- rev = "339aa15f20e1f542db97a3f3d2d65a61ce5c0e93";
- sha256 = "00782y1vas8rd9g30jqhnc24bsqsy5c31qn85ipi1vc8lrbyfcg1";
+ rev = "f18720ff5cd963a0bf6fc0e41293e50c0172b8ae";
+ sha256 = "1s5qi8njiqdpgnzlik36islzh13zfhybnynqisr61p602pn4ghk7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
@@ -4419,12 +4608,12 @@
bbdb-csv-import = callPackage ({ bbdb, dash, fetchFromGitLab, fetchurl, lib, melpaBuild, pcsv }:
melpaBuild {
pname = "bbdb-csv-import";
- version = "20140802.442";
+ version = "20180121.1649";
src = fetchFromGitLab {
owner = "iankelling";
repo = "bbdb-csv-import";
- rev = "dc9e722d1c1fcd55b71625ee3f05a4921851d186";
- sha256 = "0jkrznrfdh562bwy0adg1pzmqh6i766b5ki41g4pr9wcbmh937sn";
+ rev = "dbc2e0fe9e8ae65e494011044d905ae79b3cee3e";
+ sha256 = "0n52arydcsmarkpqqwxvw686cypl7iz73kzizirdjhcqmzimx9pl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/bbdb-csv-import";
@@ -4503,12 +4692,12 @@
bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbyac";
- version = "20171007.722";
+ version = "20180206.641";
src = fetchFromGitHub {
owner = "baohaojun";
repo = "bbyac";
- rev = "584af0efa4809252bb37cf165df029410198327e";
- sha256 = "17cmlc49y26j2salkmcsck9618s1p7y49phiy7hvzkipa13qmj9w";
+ rev = "9f0de9cad13801891ffb590dc09f51ff9a7cb225";
+ sha256 = "0q0i1j8ljfd61rk6d5fys7wvdbym9pz5nhwyfvmm0ijmy19d1ppz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac";
@@ -4612,8 +4801,8 @@
src = fetchFromGitHub {
owner = "dholm";
repo = "benchmark-init-el";
- rev = "8e4c32f32ec869fe521fb4d3c0a69406830b4178";
- sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2";
+ rev = "7a0f263282bbc86b01b662636306f22813082647";
+ sha256 = "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0/recipes/benchmark-init";
@@ -4692,12 +4881,12 @@
better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "better-shell";
- version = "20170215.1020";
+ version = "20180209.1207";
src = fetchFromGitHub {
owner = "killdash9";
repo = "better-shell";
- rev = "4ee06b8791f7363a19109d9ea6c5ee95ce998d33";
- sha256 = "08w3z4srbz478rmnnzjmbbd5bknady417x7s0r3nxszkxfpn3iy5";
+ rev = "2e9f2f3e7945c27988c50d8de43e681662d6a467";
+ sha256 = "1ccvfpfdkqb1ga7jqq0kgvifa5gqnilb4nn8ghlbxik1901xvr5z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell";
@@ -4794,15 +4983,36 @@
license = lib.licenses.free;
};
}) {};
+ bibliothek = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pdf-tools }:
+ melpaBuild {
+ pname = "bibliothek";
+ version = "20180122.2021";
+ src = fetchFromGitHub {
+ owner = "cadadr";
+ repo = "elisp";
+ rev = "3059378379a6fbd0363cd14fe6227c27739af4e1";
+ sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek";
+ sha256 = "011wnya65vfnn17fn1vhq0sk8c1mli81x0nb44yi6zl1hwxivb55";
+ name = "bibliothek";
+ };
+ packageRequires = [ a emacs pdf-tools ];
+ meta = {
+ homepage = "https://melpa.org/#/bibliothek";
+ license = lib.licenses.free;
+ };
+ }) {};
bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bibretrieve";
- version = "20170906.1036";
+ version = "20171125.727";
src = fetchFromGitHub {
owner = "pzorin";
repo = "bibretrieve";
- rev = "41b9a77e49d6c2e6e6f854fb8b1b45b2967c2f86";
- sha256 = "0rmb5qw9lj7xzwcw3haz6a22gpcb61cgkks194lq1w03gayj61rd";
+ rev = "da7b8c49e723e2327ab1d8625824389fb5324a80";
+ sha256 = "02rr46wfhv3mdmzlqznvxwms4rzq25xl1dqicbr75xwg5mjbg8si";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve";
@@ -4902,16 +5112,16 @@
bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
melpaBuild {
pname = "bind-chord";
- version = "20170717.1152";
+ version = "20171204.1210";
src = fetchFromGitHub {
- owner = "waymondo";
- repo = "use-package-chords";
- rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026";
- sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds";
+ owner = "jwiegley";
+ repo = "use-package";
+ rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+ sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord";
- sha256 = "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord";
+ sha256 = "1hyhs3iypyg5730a20axcfzrrglm4nbgdz8x1ifkaa0iy5zc9hb0";
name = "bind-chord";
};
packageRequires = [ bind-key key-chord ];
@@ -4923,12 +5133,12 @@
bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bind-key";
- version = "20161218.1520";
+ version = "20171210.2125";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc";
- sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l";
+ rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+ sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5277,6 +5487,27 @@
license = lib.licenses.free;
};
}) {};
+ bmx-mode = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "bmx-mode";
+ version = "20180226.256";
+ src = fetchFromGitHub {
+ owner = "josteink";
+ repo = "bmx-mode";
+ rev = "2093e7041006aa8c142c151bb597af061419aa43";
+ sha256 = "12h8h44ni8g6nzh9i2h9w4lmvkca3fxp8cybikln7x4hcnplkfj5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7f456d2b2b8f5a33bcb0f2ffd19e6e0276950f24/recipes/bmx-mode";
+ sha256 = "04g8l4cw20k3yhbija9mz1l4nx3bzhzj7nb35s0xdyvwbc2mhrwb";
+ name = "bmx-mode";
+ };
+ packageRequires = [ cl-lib company dash s ];
+ meta = {
+ homepage = "https://melpa.org/#/bmx-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bnfc";
@@ -5301,12 +5532,12 @@
bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bog";
- version = "20161109.1647";
+ version = "20180113.759";
src = fetchFromGitHub {
owner = "kyleam";
repo = "bog";
- rev = "cf7817de3f37ce2404ee637a655f1a511b829585";
- sha256 = "0h166w8bg864ppwg64m0vhg649mmkclld85zcd0lmbqa9wfml5j5";
+ rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611";
+ sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog";
@@ -5319,15 +5550,36 @@
license = lib.licenses.free;
};
}) {};
+ bolt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "bolt-mode";
+ version = "20180310.10";
+ src = fetchFromGitHub {
+ owner = "mpontus";
+ repo = "bolt-mode";
+ rev = "85a5a752bfbebb4aed884326c25db64c000e9934";
+ sha256 = "03nxcmpm5n8jcca39ivrl7cjqz3gzsl3w6qc30hcp278qf2jq6va";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9e35f0e37db90d906fccd08fb25b673c88d3b8/recipes/bolt-mode";
+ sha256 = "03x89k8v0m9kv1fhyys2gwympb70qlmg7gdib8wsmdxs34ys5igz";
+ name = "bolt-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/bolt-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bongo";
- version = "20170312.808";
+ version = "20171118.1842";
src = fetchFromGitHub {
owner = "dbrock";
repo = "bongo";
- rev = "1961b2e05c01c03d0dd6527988d1348610359d0d";
- sha256 = "0alm2kq32sxxc7708djxhgd3xnzlglynqjqp9af0y308ryajmdgn";
+ rev = "3d246be1e8d14865f5253567ab8fee5d4e9c470c";
+ sha256 = "1zxk6x08gmir3qv07xanlsd2fb777jdbfzdksv1qh6srxbk3qfjq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/692428769cd792dc0644641682c2793103dd00c6/recipes/bongo";
@@ -5406,12 +5658,12 @@
boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "boon";
- version = "20170825.416";
+ version = "20180108.41";
src = fetchFromGitHub {
owner = "jyp";
repo = "boon";
- rev = "13fca1929639e2239e9b4be060cbd4befd7921b4";
- sha256 = "0nbwmb4l2f6y58gx8bm42688y6sqc33l5sf0gh1vmn2ki2mq7jvh";
+ rev = "836f25c5baa363691a8d31712d07248c0d9a49a7";
+ sha256 = "1jh6c6i1jy1f8hskqbpqj2babk9yvqyjxyxy0x11686riasc5vps";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5424,6 +5676,27 @@
license = lib.licenses.free;
};
}) {};
+ borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+ melpaBuild {
+ pname = "borg";
+ version = "20180307.717";
+ src = fetchFromGitHub {
+ owner = "emacscollective";
+ repo = "borg";
+ rev = "6b49136f37a04c5f0c328a83bb512b86f6159d6f";
+ sha256 = "1nlxdapxqdikqicyp0mq394xs7cbdkyzfw2yx1h5qww33mjl4jja";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg";
+ sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr";
+ name = "borg";
+ };
+ packageRequires = [ dash emacs epkg magit ];
+ meta = {
+ homepage = "https://melpa.org/#/borg";
+ license = lib.licenses.free;
+ };
+ }) {};
borland-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "borland-blue-theme";
@@ -5511,12 +5784,12 @@
bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bpr";
- version = "20170930.642";
+ version = "20180220.1044";
src = fetchFromGitHub {
owner = "ilya-babanov";
repo = "emacs-bpr";
- rev = "314b0d6f69ff5a9c2d25a1ce5a2109d67d4d9bb3";
- sha256 = "02qj8gnhxv39y8kvlw491cbiaknll3hg03pk4xx15rffl7dyrbds";
+ rev = "af84a83dea09d86e77d87ac30604f2c5b4bf4117";
+ sha256 = "1r2prq9j6fmzzkl1f3r9drn6lna2wzd9qv127x7z5g6n8pgb6ipx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr";
@@ -5595,12 +5868,12 @@
browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "browse-at-remote";
- version = "20170720.1518";
+ version = "20180227.52";
src = fetchFromGitHub {
owner = "rmuslimov";
repo = "browse-at-remote";
- rev = "b5cff7971ca8bbb966e3acd9b7e5c4c007f94215";
- sha256 = "16ms9703m15dfxg6ap4mdw7msf8z5rzsdhba51dwivfpjxg7n52c";
+ rev = "47bab994640f086939c30cc6416e770ad067e950";
+ sha256 = "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
@@ -5616,12 +5889,12 @@
browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "browse-kill-ring";
- version = "20171016.1312";
+ version = "20171219.1108";
src = fetchFromGitHub {
owner = "browse-kill-ring";
repo = "browse-kill-ring";
- rev = "b746d01c888262e81d76f8949869cf9e02759b6a";
- sha256 = "177vbziv65jb3xla713iblng04m0f7hdq5d4hf0jaxn7pzm61n0d";
+ rev = "8debc43e41d7e51532698331c6f283905890b904";
+ sha256 = "18yg35raks0kbzg5wjay6liingdcv4glyzl9n14sgr9vzc7h96f9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring";
@@ -5760,6 +6033,27 @@
license = lib.licenses.free;
};
}) {};
+ buckwalter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "buckwalter";
+ version = "20180107.843";
+ src = fetchFromGitHub {
+ owner = "joehakimrahme";
+ repo = "buckwalter.el";
+ rev = "2aa5451c3682c268adebc6b1191a796466732f53";
+ sha256 = "0g270jyf2fd3x8p0jcd86j751spfphgsmwjxl61rk1x1kiql4icd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7dd38487731cc978e104afa39f8954cfc33ba27f/recipes/buckwalter";
+ sha256 = "08pnmfy910n5l00kmkn4533x48m3scsxzyra0nl6iry2n39y2kr1";
+ name = "buckwalter";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/buckwalter";
+ license = lib.licenses.free;
+ };
+ }) {};
buffer-buttons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-buttons";
@@ -5781,22 +6075,22 @@
license = lib.licenses.free;
};
}) {};
- buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
+ buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-flip";
- version = "20160811.713";
+ version = "20180307.1451";
src = fetchFromGitHub {
owner = "killdash9";
repo = "buffer-flip.el";
- rev = "386067141ca77848b266e068f8c6baf6b4c2ab5b";
- sha256 = "1bch4jk6d60aydvcc624026pwfby29fbcwm3zhrsksqc0d2qxdwq";
+ rev = "e093360e05164c78255866c1ac8f966aa38ba514";
+ sha256 = "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip";
sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
name = "buffer-flip";
};
- packageRequires = [ key-chord ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/buffer-flip";
license = lib.licenses.free;
@@ -5930,12 +6224,12 @@
bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bug-reference-github";
- version = "20131202.1303";
+ version = "20180128.514";
src = fetchFromGitHub {
owner = "arnested";
repo = "bug-reference-github";
- rev = "6f693e1f659d9a75abea3f23e95946c7f67138cd";
- sha256 = "0zr1raf0q5wi3vr66kglxcfxswlm8g2l501adm8c27clvqizpnrr";
+ rev = "f570a0532bfb44f095b42cf68ab1f69799101137";
+ sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github";
@@ -5951,12 +6245,12 @@
bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bui";
- version = "20170125.14";
+ version = "20171215.930";
src = fetchFromGitHub {
owner = "alezost";
repo = "bui.el";
- rev = "2742bd1cd9e232cac68d5843e05c043827a2669f";
- sha256 = "00v0v00izzy749h0l22z0g0df96g3s4rbn06dvdara7h01599v00";
+ rev = "af1a237b4d1ed31780dd37bcbef51fc8ca9b0603";
+ sha256 = "1ccw90a68dahcrkr94xi9apnxjmvzjvd33w78bsr2jyfd82ggsw1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -6140,12 +6434,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "20171029.1011";
+ version = "20180223.937";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "bbbf6924ff214b518718687ead96ceec92bdbaba";
- sha256 = "0z05rr85mf9as2byj3k1ai9x5ci45a7g425svv0ywgz1lgv2vsi4";
+ rev = "8d27bb99463bc230a76dee96378dd337622988f5";
+ sha256 = "0s5vfzcfsiqb6bc6jh95a2dyy23b4bvhdpzn2fcq8awldbpx51fh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6368,15 +6662,36 @@
license = lib.licenses.free;
};
}) {};
+ cakecrumbs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cakecrumbs";
+ version = "20180222.1845";
+ src = fetchFromGitHub {
+ owner = "kuanyui";
+ repo = "cakecrumbs.el";
+ rev = "76cfbfacfaa9d2128fc9218338a0ba2bb47349ab";
+ sha256 = "18ni6krymzm1af2vmw2n82s0ifny6pn1p0qifn3646xx4p210a4z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c970907affeb4a21fa1b7c350edf171dbdcd8de5/recipes/cakecrumbs";
+ sha256 = "1s5j8w0y47qpdq4f34l7hmdhxp560wg1lgzqz6p3p3lg1l89sv47";
+ name = "cakecrumbs";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cakecrumbs";
+ license = lib.licenses.free;
+ };
+ }) {};
cal-china-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cal-china-x";
- version = "20170122.1100";
+ version = "20180211.1101";
src = fetchFromGitHub {
owner = "xwl";
repo = "cal-china-x";
- rev = "2e9f8e17969a32268fa1c69b500d28590338a98e";
- sha256 = "1qqy0phjxqc8nw7aijlnfqybqicnl559skgiag5syvgnfh4965f0";
+ rev = "e9b309065829af3a9a0c526509bd64d9228fdced";
+ sha256 = "0wipcsr0dry2r9sw7lcz5hw16b5gpax7qr2nbdlcwj3j9axqipyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c1098d34012fa72f8c8c30d5f0f495fdbe1d3d65/recipes/cal-china-x";
@@ -6413,12 +6728,12 @@
calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "calfw";
- version = "20170714.840";
+ version = "20180117.1645";
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-calfw";
- rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278";
- sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn";
+ rev = "03abce97620a4a7f7ec5f911e669da9031ab9088";
+ sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw";
@@ -6438,8 +6753,8 @@
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-calfw";
- rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278";
- sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn";
+ rev = "03abce97620a4a7f7ec5f911e669da9031ab9088";
+ sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal";
@@ -6480,8 +6795,8 @@
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-calfw";
- rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278";
- sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn";
+ rev = "03abce97620a4a7f7ec5f911e669da9031ab9088";
+ sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm";
@@ -6501,8 +6816,8 @@
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-calfw";
- rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278";
- sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn";
+ rev = "03abce97620a4a7f7ec5f911e669da9031ab9088";
+ sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical";
@@ -6522,8 +6837,8 @@
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-calfw";
- rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278";
- sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn";
+ rev = "03abce97620a4a7f7ec5f911e669da9031ab9088";
+ sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org";
@@ -6536,6 +6851,27 @@
license = lib.licenses.free;
};
}) {};
+ call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }:
+ melpaBuild {
+ pname = "call-graph";
+ version = "20180309.220";
+ src = fetchFromGitHub {
+ owner = "beacoder";
+ repo = "call-graph";
+ rev = "1c23b22b9e1a5e6484e5dfc2f4724e964ba64dc4";
+ sha256 = "1mwxxn3m5jrpa9kwm4sg0famzgxqhqgzwd93nlidkbv1vjhj2gdi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph";
+ sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc";
+ name = "call-graph";
+ };
+ packageRequires = [ cl-lib emacs hierarchy ivy tree-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/call-graph";
+ license = lib.licenses.free;
+ };
+ }) {};
calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "calmer-forest-theme";
@@ -6581,12 +6917,12 @@
caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "caml";
- version = "20171020.1013";
+ version = "20171209.1232";
src = fetchFromGitHub {
owner = "ocaml";
repo = "ocaml";
- rev = "c5fe6932b2151d0e4426072b4df3510318bc4edc";
- sha256 = "1zd6rpp9275xh3bpr8rgj8mm70dxf30xhhj5h7vw2nj194d54lv6";
+ rev = "02326ad0f4d0d964be89434b9b43c4f19237ea35";
+ sha256 = "09v1lasgnlv01cl1ayah183da90pcwn08fhwq0b36wk54ksymhyx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@@ -6623,12 +6959,12 @@
cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
melpaBuild {
pname = "cargo";
- version = "20171026.13";
+ version = "20171218.855";
src = fetchFromGitHub {
owner = "kwrooijen";
repo = "cargo.el";
- rev = "3ecf0b89b3d36874a301a7e2fb429fc026c73f35";
- sha256 = "1mv1a0z379mr7y8by5s1lnkvp1kamch01j0yn1aqgxjry3z789dd";
+ rev = "ba652e464ccdd0860fbc5d932c2ae86c9a31a200";
+ sha256 = "1wyk40c61hlkmx3v82hn89chvrx7fyyyc1j2wlhizi7x5cv3c497";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6686,12 +7022,12 @@
cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
melpaBuild {
pname = "cask";
- version = "20170917.1107";
+ version = "20180119.1906";
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
- rev = "eea660b78c05d70159067f5be8cd3bddb55df4c5";
- sha256 = "0i4f964nqyd260cgy9s9jnpyzwmpmypznwmpvnkijd9pl34yfl04";
+ rev = "3cbb32d25ea5691e64bd150188643808846b3688";
+ sha256 = "1jxqy8sb2asyck6wp68lbczffpf6b3bg87r965nhxac7kgqhvq4d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -6790,12 +7126,12 @@
cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cbm";
- version = "20160926.1150";
+ version = "20171116.440";
src = fetchFromGitHub {
owner = "akermu";
repo = "cbm.el";
- rev = "bf8cbbcef82e4643c5f0399f0198f606275af08c";
- sha256 = "1p88fx90xwjk7dmd5gmbqyajyxf859kjsjzqmzljwai91skbb3pm";
+ rev = "5b41c936ba9f6d170309a85ffebc9939c1050b31";
+ sha256 = "091ln3d0jhdgahbwfdm1042b19886n3kwipw5gk8d0jnq5vwrkws";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm";
@@ -6955,24 +7291,66 @@
license = lib.licenses.free;
};
}) {};
- centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ celestial-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "centered-window-mode";
- version = "20170528.25";
+ pname = "celestial-mode-line";
+ version = "20171210.1045";
src = fetchFromGitHub {
- owner = "anler";
- repo = "centered-window-mode";
- rev = "6f9e873f5a98f356cee41367f2eaf1f5f5cd96fc";
- sha256 = "0ih41g9haypr2ifi26kihwx2zfnzjh8n2898w2ljn7xzbd0nkx8c";
+ owner = "ecraven";
+ repo = "celestial-mode-line";
+ rev = "018b5eb215be58fbae971d9013599966eaa569dc";
+ sha256 = "0d92k706qhv1bz11wvnkb5iaanxf2wraxwgzkx8kijpxl771zdqj";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode";
- sha256 = "08pmk3rqgbk5fzhxx1kd8rp2k5r5vd2jc9k2phrqg75pf89h3zf4";
- name = "centered-window-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cdb1d057f76166ba32d5028f18eec7d09857f990/recipes/celestial-mode-line";
+ sha256 = "1s6vn71mxfvvafjs25j12z1gnmxnkvnw716zy5ifx1bs8s5960kq";
+ name = "celestial-mode-line";
};
packageRequires = [ emacs ];
meta = {
- homepage = "https://melpa.org/#/centered-window-mode";
+ homepage = "https://melpa.org/#/celestial-mode-line";
+ license = lib.licenses.free;
+ };
+ }) {};
+ centered-cursor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "centered-cursor-mode";
+ version = "20180112.755";
+ src = fetchFromGitHub {
+ owner = "andre-r";
+ repo = "centered-cursor-mode.el";
+ rev = "319636448ffb7dba5fade3b2599ed9c1fd3bf8c8";
+ sha256 = "1fib5db8rjyjrr86nw1jvf30pz2zva0v21khyz7fkh2nkf8b3a7i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode";
+ sha256 = "1yy50p3xprkqiak3vfly5s5kpbbdmxmw6fhgz13fw97553hr3w5x";
+ name = "centered-cursor-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/centered-cursor-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
+ centered-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "centered-window";
+ version = "20171127.149";
+ src = fetchFromGitHub {
+ owner = "anler";
+ repo = "centered-window-mode";
+ rev = "56cb4a9ebc9a3bac7e00b4d5662dca4c39fdbb50";
+ sha256 = "067pdyzdl193pjyia8lc69s5p069kpwsrar2y221lmcvs4s164wv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/58bfd795d4d620f0c83384fb03008e129c71dc09/recipes/centered-window";
+ sha256 = "0w6na4ld79bpmkiv6glbrphc32v6g2rcrpi28259i94jhgy1kxqk";
+ name = "centered-window";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/centered-window";
license = lib.licenses.free;
};
}) {};
@@ -7042,12 +7420,12 @@
cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cfengine-code-style";
- version = "20131209.411";
+ version = "20171115.1308";
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "8f9876fca85df61451ec6ce08b39c3e9a3f3da42";
- sha256 = "0blh871a4gwn547bkbx1sdy9znys11d6mja7dqkvnk9vci0nlh5s";
+ rev = "03ccbd8a38eef55f0801c249fc278700c52d31ed";
+ sha256 = "0ly4igpqdafmnijdlqzcrs4g4snmrp854j8vykvx7sn2wil5l9f0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7147,12 +7525,12 @@
cg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cg";
- version = "20170911.610";
+ version = "20171123.301";
src = fetchFromGitHub {
owner = "emacsorphanage";
repo = "cg";
- rev = "f5d74973d2cf19fd31db485ee6bfaaebcf96af2d";
- sha256 = "0bmydpv3slv5fvy1admgsm1qlkfp4sdsd0caik48dn7bnghifggz";
+ rev = "e19f3bf60b9c8dbcff053b008fa3ace17fc073fe";
+ sha256 = "13j7x6ngjga2idixw02llmykzsrihsxnfdj5jkx5sdkvrmqymmfz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/cg";
@@ -7168,12 +7546,12 @@
challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "challenger-deep-theme";
- version = "20171007.300";
+ version = "20180223.644";
src = fetchFromGitHub {
owner = "MaxSt";
repo = "challenger-deep";
- rev = "b4cd8550dd6a26c4efd226156dff33e261e7a8cc";
- sha256 = "1m0ackx5wvwff0qpy9204rmpq7yr6hd3bfkwahjy6kwfrjavkfbv";
+ rev = "8194c3ade7ba73f6ddfea7dec55f77b5b6fdbcab";
+ sha256 = "0rsx9gqkxxkk597liyghw0sjrvmfid4j1kbmz5ff8irm259g7psy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme";
@@ -7231,12 +7609,12 @@
char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "char-menu";
- version = "20170518.2247";
+ version = "20171231.2218";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "char-menu";
- rev = "b4542123e8c9bc40de1328f9a8078a0704a9a98d";
- sha256 = "101r6gryj5ic3mbv400klcjw8zfpn1rwi8ayyki93a53pali5g96";
+ rev = "82f0422179737bcb9f93481aebaf1071d54fc859";
+ sha256 = "1r5nymx7yj4l4wjhsx6gxvh9rqx322x5n54cqg71mssxiwccpdv3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu";
@@ -7357,12 +7735,12 @@
chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "chee";
- version = "20161212.1525";
+ version = "20171123.1433";
src = fetchFromGitHub {
owner = "eikek";
repo = "chee";
- rev = "19437183960ee525de1c0cde13dc2c8d8921abfb";
- sha256 = "0hrl7h2069g6r2b3i2b7sxizny6ihgf8qajfima32la3gsb0hd4k";
+ rev = "669ff9ee429f24c3c2d03b83d9cb9aec5f86bb8b";
+ sha256 = "1k64mjzqmjirsld40dvmpq4llpb7ggx80r1hvsjqazc4mr16pbri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee";
@@ -7609,12 +7987,12 @@
chruby = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chruby";
- version = "20170509.700";
+ version = "20180114.852";
src = fetchFromGitHub {
owner = "plexus";
repo = "chruby.el";
- rev = "3eddd2f5fc2ac979b496394c74e4aee436b64a28";
- sha256 = "15fihl38fa3jzn4r0abjpkqzibsrn0pnlvab6xba0ffr4sv4m0y2";
+ rev = "42bc6d521f832eca8e2ba210f30d03ad5529788f";
+ sha256 = "06pvjw40qk017py9km26vjrh90acycnkr5r04nxf664qqkjlg2mc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1989a3c6fa4cd7aaf6b0b202f197eb7db51936b9/recipes/chruby";
@@ -7627,15 +8005,36 @@
license = lib.licenses.free;
};
}) {};
+ chyla-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "chyla-theme";
+ version = "20180302.858";
+ src = fetchFromGitHub {
+ owner = "chyla";
+ repo = "ChylaThemeForEmacs";
+ rev = "ae5e7ecace2ab474151eb0ac5ef07fba2dc32f8a";
+ sha256 = "1gqzwwr3fnhd9iqn7zmqpxgxvmrhq7g849ndjwizksk0bfj3b596";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5c55eebf8df165360ce1e5d18e484c90f296fe52/recipes/chyla-theme";
+ sha256 = "1mgr6483bjjwk8bi6kijyw61s52nq6g2svhy5n1jnffi3gaw7hl5";
+ name = "chyla-theme";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/chyla-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20171001.112";
+ version = "20180315.950";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "946a9d44e0d3806f1e06ab68fd832f24dd152086";
- sha256 = "0fifp2cjspfqvwmy9l9sxm8na7jj3wxbiz0mpq0pj3jm4aa7v6cl";
+ rev = "0ca04ebceeabda645dd9bc584b4683fe3b2ea317";
+ sha256 = "0fxd77cls2g5iq1r09zgf7iqznldbyi3y989wh27sjzqnjdw8k7j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7711,27 +8110,6 @@
license = lib.licenses.free;
};
}) {};
- cider-profile = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "cider-profile";
- version = "20141120.625";
- src = fetchFromGitHub {
- owner = "thunknyc";
- repo = "nrepl-profile";
- rev = "9aa7e404f53f5136ac8d15301ce8ca2924785cb3";
- sha256 = "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/440708bbf501e7b3d0aff1b9432ac71b5f9f8eab/recipes/cider-profile";
- sha256 = "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs";
- name = "cider-profile";
- };
- packageRequires = [ cider ];
- meta = {
- homepage = "https://melpa.org/#/cider-profile";
- license = lib.licenses.free;
- };
- }) {};
cider-spy = callPackage ({ cider, cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet }:
melpaBuild {
pname = "cider-spy";
@@ -7819,12 +8197,12 @@
circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circadian";
- version = "20171022.724";
+ version = "20180307.954";
src = fetchFromGitHub {
owner = "GuidoSchmidt";
repo = "circadian.el";
- rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
- sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
+ rev = "26ffd83a5931bb3fb04f01cb780715a05c8dd33e";
+ sha256 = "0z8jkbycvia8ha1yv9v8zrcpqn0jqlb5myqx3qcvykn9yysmv2lq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
@@ -7840,12 +8218,12 @@
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "20170929.1635";
+ version = "20180223.929";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2";
- sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz";
+ rev = "f7f7cb62a992120bf80c3a078bec1c029f8ff0cd";
+ sha256 = "122wvsxvv3yzkdjfi8s5gbl371bzi5kw377a7f3cpp7hxz4i24bl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -7861,12 +8239,12 @@
circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe-notifications";
- version = "20171001.2258";
+ version = "20180102.1518";
src = fetchFromGitHub {
owner = "eqyiel";
repo = "circe-notifications";
- rev = "4b93112b715714fc7b0ac2637df93adb90f35b40";
- sha256 = "1hfic3qrlskcf0zmd3w76sl1qgrd6myf6mwg06mnc9jy76backqk";
+ rev = "291149ac12877bbd062da993479d3533a26862b0";
+ sha256 = "18mva5nn919c86sgk6kdh437vdnlh9bk7fg10xqcpics1yv3viaw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications";
@@ -7924,12 +8302,12 @@
clang-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clang-format";
- version = "20170120.137";
+ version = "20171202.1318";
src = fetchFromGitHub {
owner = "emacsorphanage";
repo = "clang-format";
- rev = "7e22204dc5afe0859fb8853ff47942574541eaff";
- sha256 = "148wkr770ch6czn8s8mypbq6r0vnqqi026kqxshvzsql79i9l687";
+ rev = "e2facf890156ad57a122ed5e79e5a40cc03c8cae";
+ sha256 = "09pq0zf5im6kkjwyzdz3np3b4dd5va3as1syygvjnl5dlh6gkjcs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format";
@@ -8071,12 +8449,12 @@
clipmon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clipmon";
- version = "20160926.329";
+ version = "20180129.254";
src = fetchFromGitHub {
owner = "bburns";
repo = "clipmon";
- rev = "3f985aa2a55fbfd8566425c90e1968998f57b8ee";
- sha256 = "0jkim6zdmqq8swq70yic7cypj89d1rks5lla1kq9qvrmll36x31w";
+ rev = "95dc56c7ed84a654ec90f4740eb6df1050de8cf1";
+ sha256 = "0mfb4k0i71y49hn0xk5a1mv4zaj249qcan0y0nzvgf7mmvr32n9w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4dc92d73705ebb61ff8218f3483dd2da51ce8d32/recipes/clipmon";
@@ -8134,12 +8512,12 @@
clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
melpaBuild {
pname = "clj-refactor";
- version = "20170720.712";
+ version = "20180316.1000";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clj-refactor.el";
- rev = "f5295df68955c23fffd60718039fd386d13c77f5";
- sha256 = "14lp3jxxpjfm31rbrf2rb988fzh4xfacqdcwp15b87pixziln08x";
+ rev = "2648558b4c27fccbd71ca679ff4bf9b9150c6c60";
+ sha256 = "1kfs1y3cwazz118ll18hyvw4wdms4byzj3z9i7kriys46lsgd05y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8293,12 +8671,12 @@
clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "clojure-cheatsheet";
- version = "20161004.2328";
+ version = "20180201.4";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-cheatsheet";
- rev = "57e877d9466934b5319989b542f93b42dffec9ae";
- sha256 = "1d61q50h4vxk8i3jwxf71rbqah7ydfsd0dny59zq0klszfz2q26b";
+ rev = "85c382317a56bbdfac03ae95999c28fc0cde65d7";
+ sha256 = "0w9l6nz583qyldz44jqdh4414rgm6n2fzbaj5hsr5j1bkdizq7xl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet";
@@ -8314,12 +8692,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
- version = "20171103.1150";
+ version = "20180313.620";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8";
- sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l";
+ rev = "d1e0a6e99f8a98cc2976a23e856efa6d25283f23";
+ sha256 = "1xp0f5ivyg8xlfggvyazkxyqk0wqix9104frpn4g5bfihwp01m7i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8335,12 +8713,12 @@
clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode-extra-font-locking";
- version = "20171102.1020";
+ version = "20180114.911";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8";
- sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l";
+ rev = "d1e0a6e99f8a98cc2976a23e856efa6d25283f23";
+ sha256 = "1xp0f5ivyg8xlfggvyazkxyqk0wqix9104frpn4g5bfihwp01m7i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8377,12 +8755,12 @@
clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "clojure-snippets";
- version = "20170713.2310";
+ version = "20180314.608";
src = fetchFromGitHub {
owner = "mpenet";
repo = "clojure-snippets";
- rev = "36207f9d8738851f5b686dfe0225ad0553bf8e68";
- sha256 = "0fb4l4gjzpr5rij4kyvz0r705blv2a5w1rf1c92d34g8jyy2hmd5";
+ rev = "6068dca90467a0f4ebc2cd39338a173d6f5ddc04";
+ sha256 = "0vvadcydpsz4b17dlm1jd4fbddzfqibh3mlzv3k4gvp67vv10cqy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
@@ -8395,22 +8773,22 @@
license = lib.licenses.free;
};
}) {};
- clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, simple-httpd }:
melpaBuild {
pname = "clomacs";
- version = "20170726.436";
+ version = "20180211.421";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clomacs";
- rev = "8d3e12a2f73e81499fa18f30adaea8c861e4a9b1";
- sha256 = "01wpzbv4vjad0nvbydc0rwb3jdqbncwajs5xrng88n1xxhrajh1x";
+ rev = "2fa47d068f4955424e810cbe94d861a103efc259";
+ sha256 = "0m57hvq8s6cigv7ajmim71320bj06a2wk9v82pbvxpjqyyijpkym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh";
name = "clomacs";
};
- packageRequires = [ cider emacs s ];
+ packageRequires = [ cider emacs s simple-httpd ];
meta = {
homepage = "https://melpa.org/#/clomacs";
license = lib.licenses.free;
@@ -8419,12 +8797,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
- version = "20170919.455";
+ version = "20171219.524";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
- rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362";
- sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l";
+ rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d";
+ sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -8545,12 +8923,12 @@
cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "cmake-ide";
- version = "20171101.236";
+ version = "20180314.1546";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "cmake-ide";
- rev = "114e2df27f79816f023a07e3e8024c7ab73603f0";
- sha256 = "1n7zv325kjvmz694r11sbz6650b8y22kv2mbx4yrdha9r6y2m1f7";
+ rev = "4fe0a65235c3202ab6a5a6c72c91e20b43f9dd65";
+ sha256 = "0c8xcrjgyk86zk18sqbknlihwblj53h4xjjdhrf26gp28j6hrbf4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8566,12 +8944,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "20160928.505";
+ version = "20180104.1137";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "67c981fdc25e01ae52daa67c447a03fd05b40634";
- sha256 = "0yri0jg6k66w1qi7vi2f2ij3rfiibs0nzpqdm7gapf3q7nabyrg8";
+ rev = "c824b6c667cdcb978d6ed52ca5d19fd0b6bfde27";
+ sha256 = "0p2y9y2f238pns1az6ig204lj5cqq4ala0am6dc8sdidlf8m1x1z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8587,12 +8965,12 @@
cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-project";
- version = "20170725.912";
+ version = "20171121.315";
src = fetchFromGitHub {
owner = "alamaison";
repo = "emacs-cmake-project";
- rev = "ae763397663fbd35de0541a5d9f2de18a5de3305";
- sha256 = "0ynxcbf0jbn6b4dxswhk9qhijmhp05q6v925nglq67j0xjm8bicw";
+ rev = "d3f408f226eff3f77f7e00dd519f4efc78fd292d";
+ sha256 = "1r8a3arpkkn91k619z4b6ywnq15glc4n1ji33l0q2m59f5sfk8mp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0857c4db1027981ea73bc32bcaa15e5df53edea3/recipes/cmake-project";
@@ -8650,12 +9028,12 @@
cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cnfonts";
- version = "20170731.1611";
+ version = "20171205.111";
src = fetchFromGitHub {
owner = "tumashu";
repo = "cnfonts";
- rev = "cbe1ddd49e33b790a568c55351146aa5b909f173";
- sha256 = "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx";
+ rev = "4583e30d5058773606b830072df38a038d40203a";
+ sha256 = "04vc3p4320h3ncxm8s21ijv524w5m0j5gx1f5pyw91k3avvz9hbx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts";
@@ -8668,6 +9046,27 @@
license = lib.licenses.free;
};
}) {};
+ cobalt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cobalt";
+ version = "20180304.355";
+ src = fetchFromGitHub {
+ owner = "cobalt-org";
+ repo = "cobalt.el";
+ rev = "634ace275697e188746ca22a30ff94380ec756be";
+ sha256 = "1mrydmzldgabkkdpmlwfrfb6iddj4by7scc14k9bak5y6hj6ix7l";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b2435d98e7564d333c8224b67ac6ad9c95debda1/recipes/cobalt";
+ sha256 = "0r3fx1xx24x4qapbj2p8krc67rjmrjm88y89baf1x2swk7xdza92";
+ name = "cobalt";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cobalt";
+ license = lib.licenses.free;
+ };
+ }) {};
cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cobra-mode";
@@ -8731,22 +9130,22 @@
license = lib.licenses.free;
};
}) {};
- codesearch = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ codesearch = callPackage ({ elog, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "codesearch";
- version = "20160806.57";
+ version = "20171122.431";
src = fetchFromGitHub {
owner = "abingham";
- repo = "codesearch.el";
- rev = "7013d933cd9d3c04f19a6572176483b48a311807";
- sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp";
+ repo = "emacs-codesearch";
+ rev = "4e6a2382c26d1218a4a007d31de2bab8ef9d2e7c";
+ sha256 = "030zbx1glr6m7sxy89c833iw1v3bgjkcg835c38hlazra1vq783p";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5aee771432c63fe2f0ec719ef000f2c5971947b5/recipes/codesearch";
- sha256 = "0z7zvain9n0rm6bvrh3j7z275l32fmp46p4b33mizqd1y86w89nx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0da1c6971ac2d3e9ee67731d00a9e8ca2d169826/recipes/codesearch";
+ sha256 = "1zm7fqwiknk07c8aks1silnkxifkfbdzvbzg77wrap48k8mnw03l";
name = "codesearch";
};
- packageRequires = [ dash ];
+ packageRequires = [ elog ];
meta = {
homepage = "https://melpa.org/#/codesearch";
license = lib.licenses.free;
@@ -8881,12 +9280,12 @@
color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-identifiers-mode";
- version = "20170814.1121";
+ version = "20180308.1739";
src = fetchFromGitHub {
owner = "ankurdave";
repo = "color-identifiers-mode";
- rev = "5750ee9e1ab8a6890381bb461982113b1eb98879";
- sha256 = "17ry98s4lcl6g63bj8a0wd1rmh8whlxlmzfdjhp8mapdybqplcql";
+ rev = "e9705815cc547293fbb1c5cdac5ba90391a82878";
+ sha256 = "10cqkn4y40qwzkv9vsa5zlsqh851xacjvccw4l34piasbvm7q0hy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
@@ -9011,8 +9410,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-solarized";
- rev = "74a7065808f82dbdd9638ae33ed0e4f7a55da35c";
- sha256 = "1af6j8qyzcm4x5p2wkhfh6f62n5i4fapjfrii3rl3l9im39fl8jc";
+ rev = "6dd1d67a8e88a7bd586572cabe519b99a90fc3ee";
+ sha256 = "08bxyrpx7shgzgnmklshgdfa457imdmn5rv4j3pyp8pfwf0zg9h5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized";
@@ -9028,12 +9427,12 @@
color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-sanityinc-tomorrow";
- version = "20171106.634";
+ version = "20180302.1412";
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-tomorrow";
- rev = "a07c940b5e73ed67ff1e13f584065af7b577ec00";
- sha256 = "101h8nmj8r7zjhb8592fzv0mrh20q35llrjcip4q1q6k6ns8lj2w";
+ rev = "1d67e4a4da74323f42c1f70c8bb7dbb9feaaf4e6";
+ sha256 = "0pywpvp1ak4qp98z81qwxdd67yz8sbk8n41hv454y7jnrwxjm0w5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9070,12 +9469,12 @@
color-theme-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-x";
- version = "20160924.854";
+ version = "20180226.1646";
src = fetchFromGitHub {
owner = "ajsquared";
repo = "color-theme-x";
- rev = "7cba227f8bd4c82269405848550a4f4475057c65";
- sha256 = "053dq567iy9hkidsx76wjzgnq91z4gncx4870cj5lyp6j4g4mc8h";
+ rev = "6c2264aa6c5d9a72caeae67ebaa4472090e70350";
+ sha256 = "1fyz8bampcqzpbyg0l1g0nvv2m5n8000xy5yl05217dlxb448nnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/321900baf4149f8b58b075b9fb27716cf708f2a2/recipes/color-theme-x";
@@ -9301,12 +9700,12 @@
common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "common-lisp-snippets";
- version = "20170918.356";
+ version = "20180226.723";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "common-lisp-snippets";
- rev = "cd46223fbc6ee99372a25ba455ffec4354895e45";
- sha256 = "0xii63fw3gx1hhx57yh8gr9mhkgb2vjkfs2sl5z9010myi9504is";
+ rev = "1ddf808311ba4d9e8444a1cb50bd5ee75e4111f6";
+ sha256 = "0zalsvs47hv33dmbs94srpb8q354sr52sxbad182p69dn1khlwyp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets";
@@ -9322,12 +9721,12 @@
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "20171017.1638";
+ version = "20180315.439";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "75b4daa545d55ecbf15a973ce5f63903d11ca7cf";
- sha256 = "0vbg3n2wm76xh522srzmj5w6hnqcpf67s6dzpi8l9c0bj2mgf9pi";
+ rev = "67650dee565c57568d22065041326a58eb0f891d";
+ sha256 = "1307v1b1dk0m95ds69b66jrpapz06mwq15awmyk6vf54h9hpbm6q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9343,12 +9742,12 @@
company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "company-anaconda";
- version = "20160809.705";
+ version = "20171222.342";
src = fetchFromGitHub {
owner = "proofit404";
repo = "company-anaconda";
- rev = "b268a00821c79d7e4c5da0d7035356afb389b3a7";
- sha256 = "0pjiiqads9xawcwldic4m7mfi533s3wmqafz4day92v9135xwczj";
+ rev = "4519b1c9888b0d9665f0805e08362280a4945081";
+ sha256 = "1vsh9m1q6jc4c9xy9xri1764n8fkpz8mz6np6gcmn86jfw5dk0fk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda";
@@ -9414,12 +9813,12 @@
company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "company-auctex";
- version = "20161025.24";
+ version = "20180226.2248";
src = fetchFromGitHub {
owner = "alexeyr";
repo = "company-auctex";
- rev = "d3727c9f5bb13c52b4a345bc8f895d3dbd9178b3";
- sha256 = "0bcf6vaq6bcp60wgfq0vr3mjzv74fn7jibndz5g1d9jkd1vj64xw";
+ rev = "d98ac778658ce242e70bc30f1350a93582473bd6";
+ sha256 = "0jfy96xyhsvpvwn467aq9fchz1wnyqrmr35mz4i76lykirsb93aa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex";
@@ -9437,13 +9836,13 @@
pname = "company-axiom";
version = "20171024.1310";
src = fetchgit {
- url = "https://bitbucket.org/pdo/axiom-environment.git";
+ url = "https://bitbucket.org/pdo/axiom-environment";
rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5";
sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/company-axiom";
- sha256 = "1qjy2idyfwa1a4z1v05ky26dzq8hs6aaszq4bifd7vymasvnamml";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/company-axiom";
+ sha256 = "061n8zn11r5a9m96sqnw8kx252n1m401cmcyqla8n9valjbnvsag";
name = "company-axiom";
};
packageRequires = [ axiom-environment company emacs ];
@@ -9515,15 +9914,36 @@
license = lib.licenses.free;
};
}) {};
+ company-childframe = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, posframe }:
+ melpaBuild {
+ pname = "company-childframe";
+ version = "20180205.2236";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "company-childframe";
+ rev = "fb799c3c8f8099a0ec7d21beb3b90136704c741e";
+ sha256 = "121qqb797vfpfxxkk0gvh5x4p03lb6aarjfydl88ah6rw5087dij";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4fda072eb1e3f4feb9ad9834104f748f5b749a0d/recipes/company-childframe";
+ sha256 = "1l8bd9fnw49apvwjgrlfywascbczavpaxns2ydymmb6ksj00rvzy";
+ name = "company-childframe";
+ };
+ packageRequires = [ company emacs posframe ];
+ meta = {
+ homepage = "https://melpa.org/#/company-childframe";
+ license = lib.licenses.free;
+ };
+ }) {};
company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "company-coq";
- version = "20170615.1842";
+ version = "20180307.510";
src = fetchFromGitHub {
owner = "cpitclaudel";
repo = "company-coq";
- rev = "642c0b5b539692242c476eb00af7bacc91d7fcc0";
- sha256 = "0mykqf03c7fbdb851fqdczb97cq6wq1lkinnjc2jaim5j4hc3gig";
+ rev = "c2bd34f79472c27ee6f819820558c8b26f774748";
+ sha256 = "1dvd7w93gly70x7j7dsn2n90w7n76k2bp96p4zlzxad94kvdj2a8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -9567,12 +9987,12 @@
company-dict = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }:
melpaBuild {
pname = "company-dict";
- version = "20160528.53";
+ version = "20180216.156";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-company-dict";
- rev = "0589c2c3980a8f0df1705e3c0e5e075557eaac75";
- sha256 = "1bfl7b1lj4rgifqcpz4p8nhamxyyh29lbgl1g35rizw4nzv9sizq";
+ rev = "7ab6331d8095e9b93c726da754102fd708c0002e";
+ sha256 = "18lfqankivzdijsklyi49a1v6nqixbmk4d1m6syqd63qj849aixa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict";
@@ -9634,8 +10054,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
- sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
+ rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff";
+ sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9693,12 +10113,12 @@
company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-flow";
- version = "20170325.810";
+ version = "20180225.1359";
src = fetchFromGitHub {
owner = "aaronjensen";
repo = "company-flow";
- rev = "339f502e46e7d9214b61498d539b17f8f0322d17";
- sha256 = "0w2b3fk0q3ia5fjxk8gxj4161rxg43jw0hxpihidl5aak4i6dxb9";
+ rev = "76ef585c70d2a3206c2eadf24ba61e59124c3a16";
+ sha256 = "0zs9cblnbkxa0dxw4lyllmybqizxcdx96gv8jlhx20nrjpi78piw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow";
@@ -9714,12 +10134,12 @@
company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
melpaBuild {
pname = "company-flx";
- version = "20161228.1736";
+ version = "20180102.2118";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "company-flx";
- rev = "0c9fddf7c11c918ed42bd6a5108f8969b37704d5";
- sha256 = "1nv2hlmjdd7y9d25n22gwl0qzrsc0qpfwyhf44g0xq6dg5lgbpkj";
+ rev = "16ca0d2f84e8e768bf2db8c5cfe421230a00bded";
+ sha256 = "09zaaqi8587n1fv5pxnrdmdll319s8f66xkc41p51gcs2p7qa5w1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f27d718ee67f8c91b208a35adbbcdac67bbb89ce/recipes/company-flx";
@@ -9802,8 +10222,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "e990796e68a2ebfc099afed20b99e26d6b64061a";
- sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3";
+ rev = "416643789f088aa5077f667cecde7f966131f6be";
+ sha256 = "1vggwjpcssxp075l8aippgr318m0nkfjyakq7j24ml48g4gc48rm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9865,8 +10285,8 @@
src = fetchFromGitHub {
owner = "hotpxl";
repo = "company-irony-c-headers";
- rev = "5bbd427a2d3d4445e3413f7516def9aa80543b2a";
- sha256 = "172wf0ywbvqn9smwnh4kgxx8gw9g2f76irg3fmcv4d8d53mi08wa";
+ rev = "72c386aeb079fb261d9ec02e39211272f76bbd97";
+ sha256 = "1f462v8xq2hdsr4ks4i79icpfz6fjpb4q7khnx6si55agxj3rvaq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers";
@@ -9907,8 +10327,8 @@
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean-mode";
- rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
- sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
+ rev = "ae90bd280588c96d540892d0f42247db5a126f51";
+ sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean";
@@ -9921,22 +10341,22 @@
license = lib.licenses.free;
};
}) {};
- company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
+ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
melpaBuild {
pname = "company-lsp";
- version = "20171113.105";
+ version = "20180216.2325";
src = fetchFromGitHub {
owner = "tigersoldier";
repo = "company-lsp";
- rev = "f3b4a206ccb73ae95425e9d700c521402fcaaec1";
- sha256 = "12xdshkin0xp6sycmdjcr5alscs16xaibnnxyijzlymdvapn1k3s";
+ rev = "4512d062c38922d8b8cf402ca6043c246e915694";
+ sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
name = "company-lsp";
};
- packageRequires = [ company emacs lsp-mode s ];
+ packageRequires = [ company dash emacs lsp-mode s ];
meta = {
homepage = "https://melpa.org/#/company-lsp";
license = lib.licenses.free;
@@ -9987,12 +10407,12 @@
company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
melpaBuild {
pname = "company-nand2tetris";
- version = "20161011.1748";
+ version = "20171201.1013";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e";
- sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z";
+ rev = "33acee34d24b1c6a87db833b7d23449cf858f64f";
+ sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris";
@@ -10050,12 +10470,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-php";
- version = "20171111.757";
+ version = "20171226.1924";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "217fc49cc8ededd96ab8b7f656ef80fb905c3f4a";
- sha256 = "0dg494qivcb8y87hzkby4qi1cr4pn7fl079yjwrwq54qpwq60jgw";
+ rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c";
+ sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10071,12 +10491,12 @@
company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "company-plsense";
- version = "20171016.1013";
+ version = "20180117.1658";
src = fetchFromGitHub {
owner = "CeleritasCelery";
repo = "company-plsense";
- rev = "68dd1ca0a0837990a2e6c2e36f6b10fdf4a9bb6d";
- sha256 = "07bqm1bg91r3vchy2q2pk3npngqfb73fh0b7mp1g9fj11h25mjfr";
+ rev = "b48e3181e08ec597269621d621aa06636f02d883";
+ sha256 = "14rawd5xfgnkhdpp43mz4a5mf480949ny5hr5w6v5djmsibqxw5s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense";
@@ -10138,8 +10558,8 @@
src = fetchFromGitHub {
owner = "expez";
repo = "company-quickhelp";
- rev = "432c62f034a5097d3f85d7f54afcdc016d7afa12";
- sha256 = "06ijf4ayqkmlmk5waxi7alinv3wpy23b8xm35llf3h1ncg99zwqj";
+ rev = "c42610040ccfaacd8040f47c5e1c629a18987614";
+ sha256 = "0j1fqyi97imv1zp0w0y51j2svs494r2bdi2q9jm11b9bdi3jmf7d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
@@ -10152,22 +10572,22 @@
license = lib.licenses.free;
};
}) {};
- company-racer = callPackage ({ cl-lib ? null, company, dash, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ company-racer = callPackage ({ cl-lib ? null, company, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-racer";
- version = "20160722.1658";
+ version = "20171204.1910";
src = fetchFromGitHub {
owner = "emacs-pe";
repo = "company-racer";
- rev = "c2afd3d989ec2bca7dac094b684063a1922905f6";
- sha256 = "0339p8ymyx8yjgv9lp8lrfzc5mp1mh71rg4m325ia084n81p773a";
+ rev = "a00381c9d416f375f783fcb6ae8d40669ce1f567";
+ sha256 = "13m3yzn4xbyl13z7h1cl6vqjbzikjycy7wydpy4a44yhr466zjr5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c4671a674dbc1620a41e0ff99508892a25eec2ad/recipes/company-racer";
sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4";
name = "company-racer";
};
- packageRequires = [ cl-lib company dash deferred emacs ];
+ packageRequires = [ cl-lib company deferred emacs ];
meta = {
homepage = "https://melpa.org/#/company-racer";
license = lib.licenses.free;
@@ -10207,8 +10627,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "dadd74f015f89317ff77424be30a9accadeeb4a4";
- sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10242,6 +10662,27 @@
license = lib.licenses.free;
};
}) {};
+ company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "company-solidity";
+ version = "20180221.1330";
+ src = fetchFromGitHub {
+ owner = "ssmolkin1";
+ repo = "company-solidity";
+ rev = "9a57a4ff4cad1d423429c78457cd05c38826801c";
+ sha256 = "1v9h85vb6lqjlb5w9g2i042zb3w3y916in7h8jph2b74187a9nl6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ef246601ff6d92d6dfcd809f637e50d9838da0b8/recipes/company-solidity";
+ sha256 = "076z5jqh486k2lkh9rgbhs71bws4fba68pjybr9yyf0sdc5m7kc6";
+ name = "company-solidity";
+ };
+ packageRequires = [ cl-lib company ];
+ meta = {
+ homepage = "https://melpa.org/#/company-solidity";
+ license = lib.licenses.free;
+ };
+ }) {};
company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
melpaBuild {
pname = "company-sourcekit";
@@ -10249,8 +10690,8 @@
src = fetchFromGitHub {
owner = "nathankot";
repo = "company-sourcekit";
- rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
- sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
+ rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781";
+ sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit";
@@ -10308,12 +10749,12 @@
company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }:
melpaBuild {
pname = "company-terraform";
- version = "20170812.722";
+ version = "20180131.1503";
src = fetchFromGitHub {
owner = "rafalcieslak";
repo = "emacs-company-terraform";
- rev = "bd97342fa1b3b77bd19a3ff202a5ce5cbead36d4";
- sha256 = "0yv0hiskdxx2653g5crmb9yq6c8azrvdja56wnhm8i9kvhnhkggh";
+ rev = "74dad245567e06e758e1112c0d75f3eccf48e32c";
+ sha256 = "0y4giv3i947258j5pv6wpzk95zry8sn8ra66m1237lk0k9zhpfdf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform";
@@ -10396,8 +10837,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "e8a6c2bb6cdc18645e2ebc6a8ede8f0c306f013d";
- sha256 = "0gijzvc6krz1228siysk4za3pwfgfmwh04b8zjc57qkccngibnf9";
+ rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2";
+ sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10431,22 +10872,22 @@
license = lib.licenses.free;
};
}) {};
- composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }:
+ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-runtime, request, s, seq }:
melpaBuild {
pname = "composer";
- version = "20170304.1647";
+ version = "20180111.942";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "composer.el";
- rev = "43e50a5e626bedb3c46c875ac765daf615f18ce9";
- sha256 = "0vfr9v60dgynjfz1kpx4c17mhsfbyi9g68jzvjkw7y95pwqv8f0y";
+ rev = "e34ebe795d267e28965c85bd84cbb16b18165bd8";
+ sha256 = "1vqjraldl2an10q1w91l7rx66mpsvqvjgg3j1k7xcvw07570aabl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer";
sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1";
name = "composer";
};
- packageRequires = [ emacs f request s seq ];
+ packageRequires = [ emacs f php-runtime request s seq ];
meta = {
homepage = "https://melpa.org/#/composer";
license = lib.licenses.free;
@@ -10476,12 +10917,12 @@
conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "conda";
- version = "20171109.903";
+ version = "20171122.716";
src = fetchFromGitHub {
owner = "necaris";
repo = "conda.el";
- rev = "64b804c33f2667e8232689770a9f2e332c2dd0ab";
- sha256 = "1w1p1m2d0mwi3frkah5cnphyqsix7fp1li8glhlwf923cg48cxfq";
+ rev = "0bba56d80bb959a20838a024b174d1cf1e2cfd07";
+ sha256 = "0gr3z9s4qzvkmh7wziw5x77w9vch1riqjv5g1kl995yv7v5lxmnp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@@ -10578,6 +11019,27 @@
license = lib.licenses.free;
};
}) {};
+ conllu-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsec }:
+ melpaBuild {
+ pname = "conllu-mode";
+ version = "20180304.637";
+ src = fetchFromGitHub {
+ owner = "odanoburu";
+ repo = "conllu-mode";
+ rev = "5c1f4de04d5cba9ff4fc3246c507f74f50a2aa6c";
+ sha256 = "0zr8pglciqc1af06qsvqjks823wbb7s33g3qvhajxlfcz10iyd98";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode";
+ sha256 = "1wffvvs8d0xcnz6mcm9rbr8imyj4npyc148yh0gzfzlgjm0fiz1v";
+ name = "conllu-mode";
+ };
+ packageRequires = [ cl-lib emacs parsec ];
+ meta = {
+ homepage = "https://melpa.org/#/conllu-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "connection";
@@ -10623,12 +11085,12 @@
contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "contextual-menubar";
- version = "20170908.408";
+ version = "20180204.2309";
src = fetchFromGitHub {
owner = "aaronjensen";
repo = "contextual-menubar";
- rev = "67ddb1c8eec62e2b26524c09585a4f25f03ebb11";
- sha256 = "06rfkv7q9brahjgaqvpixqb26v4a65hyphl7ymjx8qyyypzrzac5";
+ rev = "f76f55232ac07df76ef9a334a0c527dfab97c40b";
+ sha256 = "0zks4w99nbhz1xvr67isgg6yjghpzbh5s5wd839zi0ly30x4riqf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar";
@@ -10686,12 +11148,12 @@
copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "copy-as-format";
- version = "20170603.945";
+ version = "20171215.1616";
src = fetchFromGitHub {
owner = "sshaw";
repo = "copy-as-format";
- rev = "fba9fe57a310a71c5aac90a26434df4c08214833";
- sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76";
+ rev = "971957166fe64d914ec4be209b4f80efeeabbb19";
+ sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -10707,12 +11169,12 @@
copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "copy-file-on-save";
- version = "20171019.347";
+ version = "20180217.914";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "emacs-auto-deployment";
- rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84";
- sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs";
+ rev = "1ad10401711a3bf0a0894eeed357b402238be113";
+ sha256 = "1ydpsh5j9j168crn30lpzv73rw2z80prp0hn2rybgrhvqfs3rbx6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
@@ -10833,12 +11295,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20171101.1121";
+ version = "20180308.1121";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "5009b8149a86949f9e6d7546479e998be2e14337";
- sha256 = "181bhxq2xscd9h1s0aix5lkp7gzg041q713157hrv200p2fnzb6d";
+ rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+ sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10854,12 +11316,12 @@
counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-bbdb";
- version = "20171016.1545";
+ version = "20171129.1737";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-bbdb";
- rev = "298b48cb9e1186347fbcaf1ba354efa5fe2d7556";
- sha256 = "137iv77j9a7mxsfrjxk4fpbaxw964pk4yj15609wijfcwgdjprwd";
+ rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1";
+ sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
@@ -10872,6 +11334,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-css = callPackage ({ cl-lib ? null, counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-css";
+ version = "20180302.236";
+ src = fetchFromGitHub {
+ owner = "hlissner";
+ repo = "emacs-counsel-css";
+ rev = "0536af00236cdce1ed08b40dd46c917e8b4b8869";
+ sha256 = "04qm5dqxnl4s0axbrin7a7dpj3h8rx096q01bwzfs10qsdx3l7c0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/519a05a9f0e43f3e1dfac75759346476bfc40772/recipes/counsel-css";
+ sha256 = "1sckfq8kv68q1anqmslrvhcf83m7b5r0clny6q33b9x0qypkv9xp";
+ name = "counsel-css";
+ };
+ packageRequires = [ cl-lib counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-css";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }:
melpaBuild {
pname = "counsel-dash";
@@ -10896,12 +11379,12 @@
counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-etags";
- version = "20171112.1500";
+ version = "20180304.58";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-etags";
- rev = "be0a14afc4b79202513b74ede8c26e41a5612f09";
- sha256 = "1lpaxrlfn5a4hp56mzw59j2zbc3klv1vhw338ly4pp55y79ibg1y";
+ rev = "e97902f9947c663372698affd1577a8d23876561";
+ sha256 = "1i0gb11x70nj4zp6mdqc91nd9812wsbfkpg94fssgwyqa0dqkb29";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -10935,6 +11418,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-notmuch = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, notmuch, s }:
+ melpaBuild {
+ pname = "counsel-notmuch";
+ version = "20171223.145";
+ src = fetchFromGitHub {
+ owner = "fuxialexander";
+ repo = "counsel-notmuch";
+ rev = "ac1aaead81c6860d7b8324cc1c00bcd52de5e9ca";
+ sha256 = "19frcrz6bx7d7v1hkg0xv7zmbk2sydlsdzn1s96cqzjk1illchkz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/54fe0be4e8e8b90cd2dc3cc8b9c573694c8f773b/recipes/counsel-notmuch";
+ sha256 = "1n4jp9fa5fbv55am0w1b832ncdih8gi6xflwabpwqqj4k5mj94p1";
+ name = "counsel-notmuch";
+ };
+ packageRequires = [ emacs ivy notmuch s ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-notmuch";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-osx-app";
@@ -10959,12 +11463,12 @@
counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "counsel-projectile";
- version = "20171107.1456";
+ version = "20180316.1608";
src = fetchFromGitHub {
owner = "ericdanan";
repo = "counsel-projectile";
- rev = "5ec2118cbb3a6c047638ce305e50b1cd11ef3c03";
- sha256 = "1zbcpin6s4hbbdcmdka55mnngadlisyzn342kak0hzk2s7j6r6r8";
+ rev = "d428d08015f83fe91c058abf7f1fa95657e90483";
+ sha256 = "177w7v9hxx7p5l25hap4n4x8axzvp019a4xhkla8r1i821bxbqjw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -11019,6 +11523,48 @@
license = lib.licenses.free;
};
}) {};
+ counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-tramp";
+ version = "20180311.2327";
+ src = fetchFromGitHub {
+ owner = "masasam";
+ repo = "emacs-counsel-tramp";
+ rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa";
+ sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
+ sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5";
+ name = "counsel-tramp";
+ };
+ packageRequires = [ counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-tramp";
+ license = lib.licenses.free;
+ };
+ }) {};
+ counsel-world-clock = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "counsel-world-clock";
+ version = "20171201.2337";
+ src = fetchFromGitHub {
+ owner = "kchenphy";
+ repo = "counsel-world-clock";
+ rev = "04153fbb21e51b1cfd042bdfc6ed1e8355a1edd7";
+ sha256 = "1gmsqhc6dsq823jbg9g19x7bsz5n7ssnqjzhsd8pnnm561g60dcm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9da8c45e7d06647f9591d80e83f851a7f3af85/recipes/counsel-world-clock";
+ sha256 = "151vm7g7g0jwjlp0wrwlxrjnh9qsckc10whkfgaz9czzvvmsf4cv";
+ name = "counsel-world-clock";
+ };
+ packageRequires = [ ivy s ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-world-clock";
+ license = lib.licenses.free;
+ };
+ }) {};
cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cov";
@@ -11043,12 +11589,12 @@
coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
melpaBuild {
pname = "coverage";
- version = "20160222.114";
+ version = "20180226.2057";
src = fetchFromGitHub {
owner = "trezona-lecomte";
repo = "coverage";
- rev = "d68e5d20108e280b11a802a671bd009c7dcfff89";
- sha256 = "0glnvr10lwi17g44653qqswn9vnyh5r2nmpaa0y6lvfb952zn0k0";
+ rev = "c73d984168955ca0f47f44b0464aa45282df42b6";
+ sha256 = "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd70e138534551dd12ba4d165ba56fbd1e033241/recipes/coverage";
@@ -11166,6 +11712,27 @@
license = lib.licenses.free;
};
}) {};
+ cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+ melpaBuild {
+ pname = "cquery";
+ version = "20180314.2158";
+ src = fetchFromGitHub {
+ owner = "cquery-project";
+ repo = "emacs-cquery";
+ rev = "f38c4b996877b5a0f5f7619bf46b268b64ef4e3c";
+ sha256 = "06s4qjwj9ikbxip84kjvs7yzdax19bp56hikzlmayzg6idbn9ld2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery";
+ sha256 = "01mw6aqiazpzcn6h5h5xcnra8a04yg1ibvpfajx70m5iw9f5w6l6";
+ name = "cquery";
+ };
+ packageRequires = [ dash emacs lsp-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/cquery";
+ license = lib.licenses.free;
+ };
+ }) {};
crappy-jsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "crappy-jsp-mode";
@@ -11271,22 +11838,22 @@
license = lib.licenses.free;
};
}) {};
- cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cricbuzz";
- version = "20170726.504";
+ version = "20171227.1607";
src = fetchFromGitHub {
owner = "lepisma";
repo = "cricbuzz.el";
- rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69";
- sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3";
+ rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889";
+ sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip";
name = "cricbuzz";
};
- packageRequires = [ dash enlive s ];
+ packageRequires = [ dash enlive f s ];
meta = {
homepage = "https://melpa.org/#/cricbuzz";
license = lib.licenses.free;
@@ -11316,12 +11883,12 @@
crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "crux";
- version = "20170801.1334";
+ version = "20180113.251";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "crux";
- rev = "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f";
- sha256 = "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd";
+ rev = "3e07035660f953cb08847362378267f5859bbe69";
+ sha256 = "07l49l5fb7sv2ncvakr7nq616vw6nwrpl9czvqi46dnwvcdpjaxl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
@@ -11337,12 +11904,12 @@
cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cryptol-mode";
- version = "20160819.1444";
+ version = "20180118.535";
src = fetchFromGitHub {
owner = "thoughtpolice";
repo = "cryptol-mode";
- rev = "9bf28f865d30d23b8b4fdef16a79ab66abbcc41f";
- sha256 = "0ihhx4zp725g1qaxq6n2ah8rsg099ccyavqxgkk53rpwr8iia0i2";
+ rev = "dcc9498813a77ffb83010032e0e5a540f00f3d33";
+ sha256 = "0w73i9a6qpab2h58mblhcjqs7xcyr9vpx9mczj3sxzygb2lhzwxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode";
@@ -11379,12 +11946,12 @@
crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "crystal-mode";
- version = "20171023.212";
+ version = "20180306.1821";
src = fetchFromGitHub {
owner = "crystal-lang-tools";
repo = "emacs-crystal-mode";
- rev = "1e8061c049766c25f1c06d43e703d3133426f7c0";
- sha256 = "0w11s1vmp9b4dlq9kvnxi63j69c94bqpg3fn9w4jasnpz4w9nkcf";
+ rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de";
+ sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
@@ -11421,12 +11988,12 @@
csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "csharp-mode";
- version = "20170927.816";
+ version = "20171211.2238";
src = fetchFromGitHub {
owner = "josteink";
repo = "csharp-mode";
- rev = "331b45df9c6e84601cea323638f82ce5e4a68b03";
- sha256 = "00i53c5a85n1i48jyxg78ab2yicx8maybfc6mzxw8s12j9hbw75i";
+ rev = "ba7a81a85ee5fd234f24333ab156ce897cb20cc7";
+ sha256 = "1jb0aq0fs1l3djb0cjfk0b2igvdd06l8lz0g94f63p324jn8rl62";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
@@ -11442,12 +12009,12 @@
csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
melpaBuild {
pname = "csound-mode";
- version = "20171025.401";
+ version = "20180119.1726";
src = fetchFromGitHub {
owner = "hlolli";
repo = "csound-mode";
- rev = "5680a266a32c62e8d7ebd987bf6e5fd40033bbeb";
- sha256 = "1zlb7bwx82rayzphf4q5f1w6yhm3r267fzgn74xmckh50jyq917y";
+ rev = "4fc4e77263d31604c86be799163d96cdad57c610";
+ sha256 = "167s332b9pbbxv24kyhrx543954a86bffxngjhp0cl0slmd81g2m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
@@ -11460,6 +12027,27 @@
license = lib.licenses.free;
};
}) {};
+ css-autoprefixer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "css-autoprefixer";
+ version = "20180311.900";
+ src = fetchFromGitHub {
+ owner = "kkweon";
+ repo = "emacs-css-autoprefixer";
+ rev = "386a5defc8543a3b87820f1761c075c7d1d93b38";
+ sha256 = "0ymba9bhzfi7kkrha4d4sn0hrc3sid4b5k8lhakwwdwafhym0jjb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/122e3813a5b8a57303345e9cd855f4d85eced6f0/recipes/css-autoprefixer";
+ sha256 = "0q40k8jvs4nc57kcljsx5qzylz9ms0kbr3dic3mr3bj0w062b1qg";
+ name = "css-autoprefixer";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/css-autoprefixer";
+ license = lib.licenses.free;
+ };
+ }) {};
css-comb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "css-comb";
@@ -11635,8 +12223,8 @@
src = fetchFromGitHub {
owner = "mortberg";
repo = "cubicaltt";
- rev = "c3612560fa30cecc86902daf097c8dd77b9b0b7d";
- sha256 = "1jkg27wgbvgb7bynzrsncr17k9w888mhk36fzkpxdnj0skm6v6lf";
+ rev = "7f3c7a7cfe60f98da46e6958bec62bac4675ccd2";
+ sha256 = "096523m3spfqw72zp2rzcf1b54997yzs7qxwvr3awhicah1z6mv0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11656,8 +12244,8 @@
src = fetchFromGitHub {
owner = "cubicle-model-checker";
repo = "cubicle";
- rev = "9d108b900e0123236b4991c2d06b5061f34feee8";
- sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr";
+ rev = "c2fba597da83b9ddc1195f1c8710d5330db24735";
+ sha256 = "0gprqhm38y5dcpkmhy1i6rv7pa5l8271b71284p1g90p2iyvm89g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode";
@@ -11736,12 +12324,12 @@
cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "cwl-mode";
- version = "20171030.230";
+ version = "20171205.145";
src = fetchFromGitHub {
owner = "tom-tan";
repo = "cwl-mode";
- rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
- sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
+ rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7";
+ sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
@@ -11841,12 +12429,12 @@
cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyphejor";
- version = "20170518.2255";
+ version = "20171231.2218";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "cyphejor";
- rev = "2d421507afead407f9daae694df254b160c4ff65";
- sha256 = "0rshg8b2wvw285j4b8f68hp4ilfsk324yh4inshj19c9lkbgqp39";
+ rev = "df449180d28691c9bdbef7bcb25aee75b2af50ca";
+ sha256 = "1bni88xdm69m4pq79wq2wb3n50c955amimvlbc63xs1ik3ih52q0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor";
@@ -11883,12 +12471,12 @@
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cython-mode";
- version = "20170907.1648";
+ version = "20180213.854";
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "65ba9eec9adbabc385d88882b7d5fbd2b6292cc7";
- sha256 = "1n2krw36gkikmkbql5am7irx4gismfx2qgiz7lm29mj3kvhqcg64";
+ rev = "93843b9469d164a7e98962f8f0645b93b2f7442f";
+ sha256 = "1n9g9h3pn09mfbwlq2grqjxmwhrm34wkchshhpbswngbpc0m10gk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11925,12 +12513,12 @@
d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "d-mode";
- version = "20161022.717";
+ version = "20180215.727";
src = fetchFromGitHub {
owner = "Emacs-D-Mode-Maintainers";
repo = "Emacs-D-Mode";
- rev = "a97c92ced57224287a84e7fc48ba9aac6b2afc08";
- sha256 = "0ln38lkl8qcnpcpjqck3i6hd5zjv43g7vka3kapz2bnz4s33jn3p";
+ rev = "8d0ed0460189d0e91fa454866c1ed7b9b36f99e2";
+ sha256 = "0pdg6s10vcr95r2azin1svkdgn8grlgwi4di30d0f3vcq8jmmfhi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode";
@@ -11985,6 +12573,27 @@
license = lib.licenses.free;
};
}) {};
+ daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "daemons";
+ version = "20180310.1147";
+ src = fetchFromGitHub {
+ owner = "cbowdon";
+ repo = "daemons.el";
+ rev = "75b54be70a909282b20c872b5f01d30e18e19f84";
+ sha256 = "0jv1i66b035yvj2mj83ihylk6vv7skljnr6kxa15zzj4daw9462c";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons";
+ sha256 = "14givkrw9p0m261hawahzi0n8jarapb63kv1s62faq57mqnq23jr";
+ name = "daemons";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/daemons";
+ license = lib.licenses.free;
+ };
+ }) {};
dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dakrone-light-theme";
@@ -12030,12 +12639,12 @@
danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "danneskjold-theme";
- version = "20171113.528";
+ version = "20180221.541";
src = fetchFromGitHub {
owner = "rails-to-cosmos";
repo = "danneskjold-theme";
- rev = "27862b655ed04a6b6d1e0ba1a5b8c29e957fb7c7";
- sha256 = "152v2lfpp5asa2dyarig0x3mfy7q91ydkp600qgqbq7xc295r77a";
+ rev = "7b32dcdad3933e0eab03d2702014c0b56fc73b9a";
+ sha256 = "1sxqnf8c48p8jnrxabjikijah8d7v11c4k4mvmc67vvn92p20ag5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -12048,22 +12657,22 @@
license = lib.licenses.free;
};
}) {};
- dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
+ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }:
melpaBuild {
pname = "dante";
- version = "20171106.545";
+ version = "20180224.1246";
src = fetchFromGitHub {
owner = "jyp";
repo = "dante";
- rev = "5d4b2a09d5681408225bb5b9189d37e8b3e95079";
- sha256 = "1m7k73m7qw0aqxx29c8y5liai93csmmhg749k6g0danqzy5dzn81";
+ rev = "33c8c4afac616e6de30111f8a7f11d572496a838";
+ sha256 = "0zv6vqzw299ydgwxiky8b2nlb8cyzzw9zsx44ixaqqf73f63bv1n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs";
name = "dante";
};
- packageRequires = [ dash emacs f flycheck haskell-mode s ];
+ packageRequires = [ dash emacs f flycheck haskell-mode lcr s ];
meta = {
homepage = "https://melpa.org/#/dante";
license = lib.licenses.free;
@@ -12093,12 +12702,12 @@
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
- version = "20171104.425";
+ version = "20171227.1045";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
- rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976";
- sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky";
+ rev = "d9b82b58ded9014985be6658f4ab17e26ed9e93e";
+ sha256 = "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -12240,12 +12849,12 @@
darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
- version = "20171010.2057";
+ version = "20171206.639";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
- rev = "e7c13abeeb18f50658482c7df32701ae4ec375a0";
- sha256 = "09smbgql9ibgn9l729ylas747xj48ipm6as61l6a5pbch376qriw";
+ rev = "dc90fc7d526d7e65256e050e3b373908a27b6c45";
+ sha256 = "0rpg7mn8h47hqcm24avcy8r7v8k8by1wjk5xk9j24bbv77aswj9k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12261,12 +12870,12 @@
dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
melpaBuild {
pname = "dart-mode";
- version = "20171024.2137";
+ version = "20180219.1614";
src = fetchFromGitHub {
owner = "nex3";
repo = "dart-mode";
- rev = "adef2a5b672d503ae3e92b30bb80095879b030d0";
- sha256 = "0bb790rpijlv4cjdcwgqzb249rnz6br557lnn74rb9g52wpabl69";
+ rev = "4feac341db7d2b80841fedcf1798dee9070d68bf";
+ sha256 = "031f9lkxyhirasj7m0rj67gk8rh3ry640qcppw2p88k937kc6765";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
@@ -12282,12 +12891,12 @@
dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash";
- version = "20171028.854";
+ version = "20180310.1317";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78";
- sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid";
+ rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08";
+ sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12324,12 +12933,12 @@
dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash-functional";
- version = "20171028.804";
+ version = "20180107.818";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78";
- sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid";
+ rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08";
+ sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12345,12 +12954,12 @@
dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
melpaBuild {
pname = "dashboard";
- version = "20170923.719";
+ version = "20180110.1153";
src = fetchFromGitHub {
owner = "rakanalh";
repo = "emacs-dashboard";
- rev = "8594c4f55448148b720eda5b72d51667fb7a8a39";
- sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr";
+ rev = "e3fc28a6d3626c8cae9eb2e448b2f2e6b1a98f52";
+ sha256 = "0kfdx5za610v3s8hmvy39gqn5w6xc8yljz6ybxzbg09byjinhxmn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -12405,22 +13014,22 @@
license = lib.licenses.free;
};
}) {};
- datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "datetime";
- version = "20170928.815";
+ version = "20180205.1445";
src = fetchFromGitHub {
owner = "doublep";
repo = "datetime";
- rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71";
- sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5";
+ rev = "2a92d80cdc7febf620cd184cf1204a68985d0e8b";
+ sha256 = "0lzdgnmvkvap5j8hvn6pidfnc2ax317sj5r6b2nahllhh53mlr4j";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
- sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime";
+ sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj";
name = "datetime";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs extmap ];
meta = {
homepage = "https://melpa.org/#/datetime";
license = lib.licenses.free;
@@ -12450,12 +13059,12 @@
datomic-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, yasnippet }:
melpaBuild {
pname = "datomic-snippets";
- version = "20130707.1315";
+ version = "20180116.752";
src = fetchFromGitHub {
owner = "magnars";
repo = "datomic-snippets";
- rev = "7116eac8e15a16fc72973b96fa855fd9784bbbb8";
- sha256 = "0ry7magy9x63xv2apjbpgszp0slch92g23gqwl4rd564qafajmf0";
+ rev = "731fbd31b814ef1521bd7eb1558eeab6a4c2e01b";
+ sha256 = "0sbrvd3z32wrpnmarwf9ya0b2c99pg82mxhvjw4b7hggxx65lqsj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4da8ec133ec5e1204966c1b12c9bc0ca1b50d643/recipes/datomic-snippets";
@@ -12597,12 +13206,12 @@
decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "decide";
- version = "20170702.1617";
+ version = "20180316.1101";
src = fetchFromGitHub {
owner = "lifelike";
repo = "decide-mode";
- rev = "90133687118c236142b8110571c463304b3192f9";
- sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s";
+ rev = "257f0e39ac60ca375942950b44eeaee04cb9d961";
+ sha256 = "0hiv3wlqidj1qd8z5jy800spzrpbca2vgq4zg1lkzvbcmhqvcqqm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide";
@@ -12618,12 +13227,12 @@
decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "decl";
- version = "20170314.23";
+ version = "20171212.658";
src = fetchFromGitHub {
owner = "preetpalS";
repo = "decl.el";
- rev = "b25825de88289fab5212dfd6d18874ca2748123f";
- sha256 = "1imz3w41vblw9gpw42v6hlrz2zdzd6kp5pfvb97v8dw8mc06pyvs";
+ rev = "ff7f8a4f1225cbdf141c86172104e67a4cf58c86";
+ sha256 = "1ns1ni6aalr541df3a0ylqy0gj68fcsxdfvm4m1ga5532kxnswnj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl";
@@ -12723,12 +13332,12 @@
define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "define-word";
- version = "20171001.1616";
+ version = "20180128.725";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "define-word";
- rev = "a425ffe44d62622b86477a622c6188a56bc2bd9a";
- sha256 = "02v9yzvinapr6m7pjxr4kcgqnlm7j21ygh1dhkabarz83v43awh3";
+ rev = "06d094f070b5d675441f74e05a449ce4941529e8";
+ sha256 = "0r0lihmkz802ik9qlbs41wfw86vj23mlm7z41zw8h845drxc8vl6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word";
@@ -12765,12 +13374,12 @@
deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "deft";
- version = "20171031.530";
+ version = "20180112.1155";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "deft";
- rev = "c7413a390ac22331ad5226a8c8c007bd08759bc8";
- sha256 = "1rdjffw8vw71ay93zlr2klbr8q4q1sjnw03gsfdyll1q4idbarg1";
+ rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4";
+ sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
@@ -12951,22 +13560,22 @@
license = lib.licenses.free;
};
}) {};
- dhall-mode = callPackage ({ ansi-color ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ dhall-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dhall-mode";
- version = "20171006.1233";
+ version = "20171204.1327";
src = fetchFromGitHub {
owner = "psibi";
repo = "dhall-mode";
- rev = "181e5b0df73ce729cf4b711fa76bb43c2581d29d";
- sha256 = "1jw4is9jxx60hsaqjkmravrkxdfn7ni6zl9wx9i7r2y2r5mmwx88";
+ rev = "bc6aec777594beeac6ba4c6dbfb1c889341589c9";
+ sha256 = "0vfkdj1fyykmylh6gg9igpiylb2n7bd4iqq1gl5mdqid8gsv4sgl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode";
sha256 = "1zkspjwllcw9k4nlnif6jdwzl08ki39vmx90apw029n87xhvx7mp";
name = "dhall-mode";
};
- packageRequires = [ ansi-color emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/dhall-mode";
license = lib.licenses.free;
@@ -12993,22 +13602,22 @@
license = lib.licenses.free;
};
}) {};
- dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+ dictcc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "dictcc";
- version = "20170318.1232";
+ version = "20171213.1334";
src = fetchFromGitHub {
owner = "cqql";
repo = "dictcc.el";
- rev = "24fb40d0822f97c3d796ae81cb6684cd97263248";
- sha256 = "1faj9c4x306s3ml430s01c9zcg9xgj9p34v630046y4lh4i25qc8";
+ rev = "7b988413f7719820cd846827525142a23f401e50";
+ sha256 = "0fiv0qgpqwp6ccakr1wh713pm2ylyvl2i54557fym80zgi9iff96";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc";
sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm";
name = "dictcc";
};
- packageRequires = [ cl-lib dash emacs helm s ];
+ packageRequires = [ cl-lib emacs ivy ];
meta = {
homepage = "https://melpa.org/#/dictcc";
license = lib.licenses.free;
@@ -13038,12 +13647,12 @@
diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diff-hl";
- version = "20170709.2000";
+ version = "20180201.355";
src = fetchFromGitHub {
owner = "dgutov";
repo = "diff-hl";
- rev = "bec9889de7bf48d28826039880cec9bfad24a628";
- sha256 = "0f9krv08jlw1sawjajdfy0cp5mzbq7hzvy478z8p54s1fwga6wxd";
+ rev = "190622d3fa2c3237529ec073a8fa00aee06023a1";
+ sha256 = "0jh270anr2ralixgwsc3wn48jnw3qwz6m18lg0sgwgzyajh0fpb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl";
@@ -13056,6 +13665,27 @@
license = lib.licenses.free;
};
}) {};
+ difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "difflib";
+ version = "20171227.718";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "difflib.el";
+ rev = "b08850251812d71e62fd6956081299590acdf37b";
+ sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib";
+ sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6";
+ name = "difflib";
+ };
+ packageRequires = [ cl-generic emacs ht s ];
+ meta = {
+ homepage = "https://melpa.org/#/difflib";
+ license = lib.licenses.free;
+ };
+ }) {};
diffscuss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diffscuss-mode";
@@ -13146,8 +13776,8 @@
src = fetchFromGitHub {
owner = "alezost";
repo = "dim.el";
- rev = "4b00587dfaabc1f2393b9a9f9993996c288d4445";
- sha256 = "0qvx81glmrsaafcikxz07ym60haxhb39dyspv5x95f2p345f03q4";
+ rev = "79b81724b951fedffdd3113f473c18990af837a9";
+ sha256 = "1fclhpcrsi09z2np7q3dq3hhb3pqxsvv1l2dqis27afxnb1zshr3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim";
@@ -13202,6 +13832,27 @@
license = lib.licenses.free;
};
}) {};
+ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dimmer";
+ version = "20180217.2011";
+ src = fetchFromGitHub {
+ owner = "gonewest818";
+ repo = "dimmer.el";
+ rev = "d033fdda154e688e45cca35902dbff9915351b98";
+ sha256 = "1d457029zyabfjhzrgayibdmxfmia5yr7rqn50kc16k3aavw32f7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer";
+ sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r";
+ name = "dimmer";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dimmer";
+ license = lib.licenses.free;
+ };
+ }) {};
dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "dionysos";
@@ -13247,12 +13898,12 @@
dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-atool";
- version = "20160208.433";
+ version = "20180302.2340";
src = fetchFromGitHub {
owner = "HKey";
repo = "dired-atool";
- rev = "f188ccf6092330dbbefc0e75aa4fad3e7258749d";
- sha256 = "06m2p5sf47ykhkl958x4k0j0rxzrq0wfwf86mvnarlgc1215dbaf";
+ rev = "b92e0106827d34fa686e189c7e9a537a3a947a8b";
+ sha256 = "1i40zd7y1jf9skr3wi2zqv4awrgff244p1h89r707aq67v1j19yk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
@@ -13272,8 +13923,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13293,8 +13944,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
@@ -13419,8 +14070,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13440,8 +14091,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13566,8 +14217,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13587,8 +14238,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13625,12 +14276,12 @@
dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-rainbow";
- version = "20170922.817";
+ version = "20171202.1448";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13646,12 +14297,12 @@
dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-ranger";
- version = "20160924.335";
+ version = "20171229.753";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13664,22 +14315,22 @@
license = lib.licenses.free;
};
}) {};
- dired-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-sidebar";
- version = "20171111.1540";
+ version = "20180312.1715";
src = fetchFromGitHub {
owner = "jojojames";
repo = "dired-sidebar";
- rev = "8ccf915061d2fc460b198a102142013044ba4a90";
- sha256 = "1ha1djw2wdxj8y735hjqc9nwm50z4vlh8d6r810r66789gvn7fkp";
+ rev = "df9d46615930ad3709303babd45bc12b96d0945c";
+ sha256 = "0yj0jlm695v1kzdlvi0lqa0phafvgn1y9bwbin5cikygvn2wjjxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar";
sha256 = "19a4gsx9wmpc94jd992c7dj5mxfnnij2nc6qnb2lhk8ad69h1lmc";
name = "dired-sidebar";
};
- packageRequires = [ emacs ];
+ packageRequires = [ dired-subtree emacs ];
meta = {
homepage = "https://melpa.org/#/dired-sidebar";
license = lib.licenses.free;
@@ -13713,8 +14364,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "7fbaaa2de73bd571de8eee86205f779340b13c69";
- sha256 = "0jzp7d49q1ndsd6yfs1kx49ksid9v96s4qaqhfnzfdwyw7rf4m1j";
+ rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd";
+ sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -13772,12 +14423,12 @@
diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diredfl";
- version = "20171014.1402";
+ version = "20180210.1814";
src = fetchFromGitHub {
owner = "purcell";
repo = "diredfl";
- rev = "085eabf2e70590ec8e31c1e66931d652d8eab432";
- sha256 = "19gjs90ai6fv4q7rhssrgc45d9g4frg680p1jgmbxzrd9jdy013w";
+ rev = "9b2a89951cee8bdf5c0cb67f9c3ad6ac73abf9cb";
+ sha256 = "0x4qhxysmcwllkbia6xkfmlpddxhfxxvawywp57zs8c00193nn1z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl";
@@ -13814,12 +14465,12 @@
direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "direnv";
- version = "20170717.1049";
+ version = "20180307.748";
src = fetchFromGitHub {
owner = "wbolster";
repo = "emacs-direnv";
- rev = "d181475192138b256e124a42660ac60ae62d11d0";
- sha256 = "09pcssxas9aqdnn2n9y61f016fip9qgxsr16nzljh66dk0lnbgrw";
+ rev = "78bb6894348b1d958aa8947837db4b3bceaa55bb";
+ sha256 = "1i37pylq6gh9144vhf0lxqnkzcwqhaq7vm18f64qajvcv3rj5s84";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -13919,12 +14570,12 @@
disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "disable-mouse";
- version = "20170929.1353";
+ version = "20171226.1715";
src = fetchFromGitHub {
owner = "purcell";
repo = "disable-mouse";
- rev = "81639930bcaeedadbcc19728e91719afcac84613";
- sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc";
+ rev = "541363bd6353b8b05375552bab884a6315ea545c";
+ sha256 = "1grs3cz2zdw49frvxy4vc1z3ld804kk5g2ad6ln5grprcd188bz9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse";
@@ -14063,6 +14714,27 @@
license = lib.licenses.free;
};
}) {};
+ disk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "disk";
+ version = "20171115.2331";
+ src = fetchFromGitHub {
+ owner = "kensanata";
+ repo = "disk";
+ rev = "283e54e3be7d08f959076240b2ab324e25632137";
+ sha256 = "15fkfl9kjlpsg9p5g0xhm384ipvrzclwxvqk8vz1zixq0wam2ajm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e6e75695594ce17b618ad8786c8a04e283f68b11/recipes/disk";
+ sha256 = "1jzkqgjw8xl0jc6ssl5bsdjp2dxw88nss6szvjv7frrhsncaq28h";
+ name = "disk";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/disk";
+ license = lib.licenses.free;
+ };
+ }) {};
dispass = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dispass";
@@ -14212,12 +14884,12 @@
dizzee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dizzee";
- version = "20111009.616";
+ version = "20171201.116";
src = fetchFromGitHub {
owner = "davidmiller";
repo = "dizzee";
- rev = "37629f390afb8da03ef0ce81c2b3caff660e12f6";
- sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5";
+ rev = "e3cf1c2ea5d0fc00747524b6f3c5b905d0a8c8e1";
+ sha256 = "1i32msin8ra963w7af6612d038gxb25m1gj97kbjymjq1r8zbdrv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dizzee";
@@ -14401,12 +15073,12 @@
dmenu = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dmenu";
- version = "20160228.627";
+ version = "20180118.445";
src = fetchFromGitHub {
owner = "lujun9972";
repo = "el-dmenu";
- rev = "8dffd614e37d3971f989cbce5849d04d84ee8c76";
- sha256 = "1xx4ccr3mfxay2j3wgd93qw5dpjasaq9mkmmjww3ibpf86ahf7l3";
+ rev = "6e492cd4ee4fb39ecda92776707fc270f54d25e7";
+ sha256 = "085ap58qfwr7gvrx68dy72z4ph1mvwka5i7ydx58m1a3bb9rshnw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/98bcdd71a160b9c04f83cc5b939031c9e7b5eb59/recipes/dmenu";
@@ -14485,12 +15157,12 @@
docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
melpaBuild {
pname = "docker";
- version = "20170718.303";
+ version = "20180222.717";
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
- rev = "4df5f94c78817a1f3755a7c9b1358349bf287270";
- sha256 = "05ggavxq61w55n6b8g76xpqasfka3rbf3326jwxjrd1p6wzs1d3d";
+ rev = "ec2b07255e273639ff76303778661f81c5b74000";
+ sha256 = "0nlf3rw9xa9hggqkw6nxfswbqlnsgbliz9z652kp7c9hfikfmcsj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14535,12 +15207,12 @@
docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "docker-compose-mode";
- version = "20170916.1438";
+ version = "20180311.611";
src = fetchFromGitHub {
owner = "meqif";
repo = "docker-compose-mode";
- rev = "f3c06a43d69dfe80041a82a9365281bd5c65a105";
- sha256 = "1fzz950wb95lp15ak8q4vzls21w9fc3qxqs5hlf50najdw36w52h";
+ rev = "7f4cd0b1718df2ab93d51bd395b2f37df9482265";
+ sha256 = "1fbcxwfvm33xcdj3cs26d9i1zyrryyjjkv7sc3mfxd45nq8d3ivj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -14577,12 +15249,12 @@
dockerfile-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "dockerfile-mode";
- version = "20171105.435";
+ version = "20171124.1647";
src = fetchFromGitHub {
owner = "spotify";
repo = "dockerfile-mode";
- rev = "69bfba7acc6bda0d0a5834c3774fffc145337a63";
- sha256 = "09s13cpldrw19m1n6dh17x85nm5kx1km4f5pmzryll23a3qwcm0x";
+ rev = "4ab78f678e9ee40c7c5729dc8f1f5c1a847be2e7";
+ sha256 = "0dc3pfqf6nrwnqsiyn49l0pgq7rm31kciwsqagnrjnc85nnbpf9m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
@@ -14598,12 +15270,12 @@
dokuwiki = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "dokuwiki";
- version = "20170213.122";
+ version = "20180101.1659";
src = fetchFromGitHub {
owner = "accidentalrebel";
repo = "emacs-dokuwiki";
- rev = "a78289d99068ec3dfb4945877c32751e789d099d";
- sha256 = "0hynymx3gm9nqmpb0a9j8d9g298vsl0gxa9f1yx9xp60mq6y7l3r";
+ rev = "594c4d4904dcc2796bbbd2c0845d9e7c09ccf6f7";
+ sha256 = "0vqx8npw0i02dhw2yb7s4z7njw60r3xyncw4z8l6fj99pp6pfh15";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dokuwiki";
@@ -14661,16 +15333,16 @@
doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom";
- version = "20160121.722";
+ version = "20180301.1508";
src = fetchFromGitHub {
- owner = "emacsorphanage";
+ owner = "kensanata";
repo = "doom";
- rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730";
- sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
+ rev = "e59040aefc92dd9b3134eb623624307fb9e4327b";
+ sha256 = "14lwq30m0s7pkwkbn6vm5gdlkww7sszc6pdhxyinkhj67b0bxpin";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7e41ed64142be89a62fddeceee5e39603a18525c/recipes/doom";
- sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0960deb3b1d106ad2ffa95a44f34cb9efc026f01/recipes/doom";
+ sha256 = "1ji2fdiw5b13n76nv2wvkz6v155b0qgh1rxwmv3m5nnrbmklfjh5";
name = "doom";
};
packageRequires = [ cl-lib ];
@@ -14682,12 +15354,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "20171109.1437";
+ version = "20180312.1228";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-themes";
- rev = "00329ccd8d9fd1bbf31f043288bb087baffed7d0";
- sha256 = "0pdqpcmc6xlvmf03gx5wvfw8q05c5f3kyi53j7z2mc83kp7gq6zz";
+ rev = "933bf2a006c5de611e03d377b967f213e285c296";
+ sha256 = "0lcxglnq5zic2hbjwc67x60dqk3j65rsschhwvxcmcmcyfg0whfi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -14703,12 +15375,12 @@
dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dot-mode";
- version = "20161025.1037";
+ version = "20180312.1600";
src = fetchFromGitHub {
owner = "wyrickre";
repo = "dot-mode";
- rev = "cde2d593cb3f8e31db8778e434d3a4550707d2cc";
- sha256 = "1pvmypsz5c5jkx4g3hvznayyv9cs9yr5sgf251prxnqcl0ivc0y9";
+ rev = "6ca22b73bcdae2363ee9641b822a60685df16a3e";
+ sha256 = "10lmwra48ihxqxyl54m3yn1zy0q5w6cxqd2n5pbs4lva1yck0z4w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dot-mode";
@@ -14721,6 +15393,27 @@
license = lib.licenses.free;
};
}) {};
+ dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dotenv-mode";
+ version = "20180207.1114";
+ src = fetchFromGitHub {
+ owner = "preetpalS";
+ repo = "emacs-dotenv-mode";
+ rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea";
+ sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode";
+ sha256 = "1lwfzfri6vywcjkc9wassrz0rdrg0kvljxsm6b4smlnphp6pdbbs";
+ name = "dotenv-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dotenv-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dotnet";
@@ -14745,12 +15438,12 @@
download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "download-region";
- version = "20160430.1116";
+ version = "20180123.1733";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "download-region";
- rev = "eb9e557529a73b4cfc8281c70dd0d95db333fffa";
- sha256 = "0v52djg39b6k2snizd9x0qc009ws5y0ywqsfwhqgcbs5ymzh7dsc";
+ rev = "bbba3ecd80818d5d940d41fe89a6e2ec5dd2c53c";
+ sha256 = "1cwlbdmdils5rzhjpc3fqjmd3dhalk6i7bxskpahbrr9xxfq0iw4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7801d9fac121f213609a802fe9d88bdc5364d1f3/recipes/download-region";
@@ -14997,12 +15690,12 @@
drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
melpaBuild {
pname = "drupal-mode";
- version = "20170926.38";
+ version = "20171120.1509";
src = fetchFromGitHub {
owner = "arnested";
repo = "drupal-mode";
- rev = "b0ca2c39650136f7e5672461e64397b9add30b92";
- sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6";
+ rev = "47fda0a38a5b197f4606137d9c3b7d44aaeaa886";
+ sha256 = "1rg46prsymxc9lyhk7cbr53089p970mmmybiir2qsyx2s4m6mnfl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
@@ -15081,12 +15774,12 @@
dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dtrt-indent";
- version = "20171001.1233";
+ version = "20180218.1123";
src = fetchFromGitHub {
owner = "jscheid";
repo = "dtrt-indent";
- rev = "7fd55af3b0311ea24b68397054e705c835fa5ef1";
- sha256 = "1sgmd1zqdwa1f6y8d6vaacyipkqn2ivvaim1xndbkihgmhyn4kf0";
+ rev = "7019ecd7f20428cd33d96a25934416adc28e4159";
+ sha256 = "0vb3fhi361v4kjyhvmax60550f3xkkkm2fyhi3ssjq21cq0k923g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@@ -15144,12 +15837,12 @@
dumb-diff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dumb-diff";
- version = "20171106.1659";
+ version = "20171211.1322";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-diff";
- rev = "a89162a41be228f587f6d778ce2a350ee0b61792";
- sha256 = "1wznlaphsdh6bz5zppwabnmbsymz09b6aqadwr8b3l1r841s4y9v";
+ rev = "1a2331d283049b71a07c1b06b1e0627a950d55f4";
+ sha256 = "05gmpp4s9y2ql27vb5vpqn3xh35qjfxgq9gzyvg86df43qfl8wvl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf7fa0b4235247d82569ed078f92774f10afa45c/recipes/dumb-diff";
@@ -15165,12 +15858,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20171105.1624";
+ version = "20180228.2206";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "ce4eaa49b629140806a8808712356a5a09c2abad";
- sha256 = "1bjpqghfp1jprhaciqjm11n6bdy5wzph625p2v0xcd59pr8jsj6p";
+ rev = "260054500d4731c36574b6cbc519de29fdd22f43";
+ sha256 = "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15249,11 +15942,11 @@
dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dyalog-mode";
- version = "20171012.1339";
+ version = "20171211.722";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "9e446540a794";
- sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi";
+ rev = "87db00b912be";
+ sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -15542,12 +16235,12 @@
eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "eacl";
- version = "20171109.40";
+ version = "20180308.1656";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "eacl";
- rev = "0ee57b495036b6c1b54d668e84be373f8a1c8d9a";
- sha256 = "1fizb09g0dc9rzlj34n26vi12h3gk4mn96iyrsa60in5c9yn9f04";
+ rev = "80113a9f6cc246cef67e3e20ec052788c38ab116";
+ sha256 = "1pwppn0m288d6j9b7cdshgc3rxv0nfs94klc1fpsyfxqx0a6f23z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
@@ -15602,27 +16295,48 @@
license = lib.licenses.free;
};
}) {};
- easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "easy-hugo";
- version = "20171025.1516";
+ version = "20180312.352";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
- sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
+ rev = "b14dc7f9d0da804daf8219fea48604b192a4389d";
+ sha256 = "0y1d1vpqbdm86y52fd97l64zfnl4g428h30152mamhmbjzjsi0v5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g";
name = "easy-hugo";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs popup ];
meta = {
homepage = "https://melpa.org/#/easy-hugo";
license = lib.licenses.free;
};
}) {};
+ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "easy-jekyll";
+ version = "20180108.559";
+ src = fetchFromGitHub {
+ owner = "masasam";
+ repo = "emacs-easy-jekyll";
+ rev = "e7016084c6212e393496cf19fb5e519c380227ba";
+ sha256 = "0jpg31z7f2him4lcnazknx9lpipf1nbqvhaqr5razkckq71llq18";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
+ sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv";
+ name = "easy-jekyll";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/easy-jekyll";
+ license = lib.licenses.free;
+ };
+ }) {};
easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-kill";
@@ -15689,12 +16403,12 @@
ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ebal";
- version = "20170810.631";
+ version = "20171231.2216";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ebal";
- rev = "65a131b95a1e934c0cab384ef533b0ac58961f0c";
- sha256 = "1b8i7qh743lhmkrmw1ac486i8nk8fdxl0ayxjs2sfb8fk4621rfr";
+ rev = "b7e5f2c730036197cfa7d819006b91b4dcc2efba";
+ sha256 = "0zbcx5ksf02kv7vavdnixblb8xk3zipwp5nrlyxyshmksw7qg3wh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -15731,12 +16445,12 @@
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
melpaBuild {
pname = "ebib";
- version = "20171110.1";
+ version = "20180213.531";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "ebib";
- rev = "ab9596e03b749785919857f9785dc37c3c5dfc4e";
- sha256 = "0xn1dna7bwk5m144z53lpv0fxh5mg42gk8a7mgfz9d6yj890k33w";
+ rev = "cbad0a51d7905712201d83e9f4f52a7bb047652f";
+ sha256 = "1jmg63q4msy83nr0xzivay9n8nv48kawqj5jxlfq83fwkvnk1szm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15773,12 +16487,12 @@
eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
melpaBuild {
pname = "eclim";
- version = "20171024.1038";
+ version = "20171113.1754";
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
- sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
+ rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff";
+ sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15815,12 +16529,12 @@
ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ecukes";
- version = "20171110.627";
+ version = "20171216.408";
src = fetchFromGitHub {
owner = "ecukes";
repo = "ecukes";
- rev = "c8092db08be5337ff3f3dd2857bfa94e360945d2";
- sha256 = "1dkinyigacb4yxqikd9za4inbh7yz7pl8bhrpihrxzabxirmvw55";
+ rev = "3a77ba9f1064c2bca47b401974c009e65727c46e";
+ sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -16151,12 +16865,12 @@
edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "edit-server";
- version = "20170725.859";
+ version = "20180120.752";
src = fetchFromGitHub {
owner = "stsquad";
repo = "emacs_chrome";
- rev = "3ba9de868cb8ed37d8a0982fb99cf023d76b3c90";
- sha256 = "0jknhdg33f1vgcfflp4bmvbnbh12h9vxnbyyf9dnibcln56nhar5";
+ rev = "f01f5775760d73a8b0975d8caf009c3b1e7b2229";
+ sha256 = "1rri1h1ilhmyspp8krbqh2qz4f4wigmxk8kwvg39pr4mmma3dz4f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server";
@@ -16193,12 +16907,12 @@
editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "editorconfig";
- version = "20171107.301";
+ version = "20180211.2028";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-emacs";
- rev = "2ec90f13ad98481c5324eea4877de7a80d814d86";
- sha256 = "160f7ciy8yp75gja3abm4rjy61wmk2b7b0k032qimiawkvg57bx2";
+ rev = "f52d2133f3948221ba84a396c693eff958fc0eb9";
+ sha256 = "1ml9hgsyndzn03bz4a81yhalfg34mk5il56kqv4bhqkwjkl1axm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16214,12 +16928,12 @@
editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "editorconfig-charset-extras";
- version = "20170712.108";
+ version = "20180222.2057";
src = fetchFromGitHub {
owner = "10sr";
repo = "editorconfig-charset-extras-el";
- rev = "bf2d23c57a485ee41d21a9a0015d5bd52baabf85";
- sha256 = "0qgg2v9xpr8bm97pj4pxd9q6j8i6h94gb1j7lla0sn80cwymxwrx";
+ rev = "ddf60923c6f4841cb593b2ea04c9c710a01d262f";
+ sha256 = "1v5a6s4x7cm6i0bxaqdpsg8vqj479lp5h45glx4ipk0icdq8cvd9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras";
@@ -16394,8 +17108,8 @@
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "61df217004a753cbbd046319f9d2617b88f574bf";
- sha256 = "12scqa9s413vvpfkvxyly1v9d3y6bq7b18bdd599q7nd786d1vvj";
+ rev = "9948d6a1933af7af45621c9521d7a124c715191b";
+ sha256 = "0j2026bnz5wjcw9g1kbgjddapv0hnfmfiv1aab24ffh5s1mr8gnl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16411,12 +17125,12 @@
ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
melpaBuild {
pname = "ego";
- version = "20170601.817";
+ version = "20180228.1704";
src = fetchFromGitHub {
owner = "emacs-china";
repo = "EGO";
- rev = "93ccd450d2d9e5db27aebb024a1b2ed56d5131dc";
- sha256 = "0izxsckmkdw70cz3ljar2r4iv784c43mnzjkayly08hlabq1g6b6";
+ rev = "719809679c1a60887735db41abae53b61f08ef59";
+ sha256 = "10f179kl53la4dyikzl1xysccx4gk04skzwaw3w1pgr8f5fjppxc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego";
@@ -16431,15 +17145,15 @@
}) {};
eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "eide";
- version = "20170906.1216";
+ version = "20171229.1435";
src = fetchgit {
- url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
- rev = "25f9af215781163b10d411fe2b5674033eb24165";
- sha256 = "0mwy5a67hap9bx1klk2pzfaav65drd6mfkkhnk2045z4jvzgkn70";
+ url = "https://git.tuxfamily.org/eide/emacs-ide.git";
+ rev = "faae6f1384826d18f70b28826dc528d70e91a5c9";
+ sha256 = "02hylmgs6il59kkq59i9lpdg9gdirpb2y37xzybh7n5lqyzdafai";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
- sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide";
+ sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni";
name = "eide";
};
packageRequires = [];
@@ -16472,12 +17186,12 @@
ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
melpaBuild {
pname = "ein";
- version = "20171107.1314";
+ version = "20180311.1029";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "f63451ca038d6e6c68cfc511836a37d697d0d459";
- sha256 = "05ch2nll2359klq0picm51hkl82chv39npc6jdlc6y7mvvjicqvp";
+ rev = "115c16eb9f38447790a75c71e67036c5f4be15e0";
+ sha256 = "112wnfhn468gfgac1vhclm6lycsp904wmf60akcng71fqgvyzcda";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16542,30 +17256,22 @@
license = lib.licenses.free;
};
}) {};
- ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
+ ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
melpaBuild {
pname = "ejc-sql";
- version = "20171019.1304";
+ version = "20180305.1047";
src = fetchFromGitHub {
owner = "kostafey";
repo = "ejc-sql";
- rev = "bd5e3f334044c8b33e2a0a2e0d8767aa6f0e03b8";
- sha256 = "1pyvpsi4krbmdx2739nnw5g71x3y209xwjl5a7xqbczy9qqxs18n";
+ rev = "dad0777b7dbcdee8d16134b565924a9081806ae8";
+ sha256 = "0cmkcnz2mqi3qdcl6srrdzp1yxk6qvm0dk413wkx1grx5gqs1vpr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx";
name = "ejc-sql";
};
- packageRequires = [
- auto-complete
- cider
- clomacs
- dash
- direx
- emacs
- spinner
- ];
+ packageRequires = [ auto-complete clomacs dash direx emacs spinner ];
meta = {
homepage = "https://melpa.org/#/ejc-sql";
license = lib.licenses.free;
@@ -16595,12 +17301,12 @@
el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-get";
- version = "20170813.1436";
+ version = "20180126.1603";
src = fetchFromGitHub {
owner = "dimitri";
repo = "el-get";
- rev = "07c75d259d89dabb34878d6085a94fb11aef1947";
- sha256 = "1b1cgfh7wzcw5m32mhn9w6gzllr09hfv2ghdb4wwaw567xcqd4qh";
+ rev = "93fb44441b18b67d61400ca5f63e3194c34181b6";
+ sha256 = "0w9iiwnbrk18si064q433f89f8xf5b2lk5zxx1b3nrawbbk76k1r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16739,22 +17445,22 @@
license = lib.licenses.free;
};
}) {};
- el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }:
+ el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-spice";
- version = "20140805.1138";
+ version = "20180128.921";
src = fetchFromGitHub {
owner = "vedang";
repo = "el-spice";
- rev = "65d9ec84b581a5867eebbc58de93958e992ca80d";
- sha256 = "1sba405h1sy5vxg4ki631p4979gyaqv8wnwbgca5jp2pm8l3viri";
+ rev = "4e0852ebf5d8e9cbb3eaaa6ae9c53d126b53f58c";
+ sha256 = "08mkn4qfxax3fgppw79117phm05hihifwj4pgll9ivrilbf75lb8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice";
sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
name = "el-spice";
};
- packageRequires = [ thingatpt-plus ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/el-spice";
license = lib.licenses.free;
@@ -16809,8 +17515,8 @@
src = fetchFromGitHub {
owner = "sigma";
repo = "el-x";
- rev = "417851972dd967ab82a772256c3d9c1b343e7f82";
- sha256 = "0vm40044b4r132py9l12d8d1nwp4553xj8a4w2wfrg651wkwp3g8";
+ rev = "e7c333d4fc31a90f4dca951efe21129164b42605";
+ sha256 = "00wp2swrmalcifx9fsvhz9pgbf6ixvn8dpz1lq6k6pj9h24pq7wh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0346f6349cf39a0414cd055b06d8ed193f4972d4/recipes/el-x";
@@ -16847,12 +17553,12 @@
el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el2org";
- version = "20170804.2142";
+ version = "20180311.855";
src = fetchFromGitHub {
owner = "tumashu";
repo = "el2org";
- rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e";
- sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b";
+ rev = "81f1c97db8911f5bdf92c729630ab509de4ec73f";
+ sha256 = "152y6a6qjch2w84axghzcqiswhx1cq5bq1r1gjfffh41wsddqb53";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
@@ -16865,6 +17571,69 @@
license = lib.licenses.free;
};
}) {};
+ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "elbank";
+ version = "20180316.627";
+ src = fetchFromGitHub {
+ owner = "NicolasPetton";
+ repo = "Elbank";
+ rev = "28143b3076f2ac64a9db84a53e9af0ad43fe4322";
+ sha256 = "0gdhdq3g34m1jqpq4m12pbf70sl5jrmj8wbakj36vh540p12f0ph";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank";
+ sha256 = "1ry84aiajyrnrspf7w4yjm0rmdam8ijrz0s7291yr8c70hslc997";
+ name = "elbank";
+ };
+ packageRequires = [ emacs seq ];
+ meta = {
+ homepage = "https://melpa.org/#/elbank";
+ license = lib.licenses.free;
+ };
+ }) {};
+ elcontext = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, osx-location, uuidgen }:
+ melpaBuild {
+ pname = "elcontext";
+ version = "20180225.2211";
+ src = fetchFromGitHub {
+ owner = "rollacaster";
+ repo = "elcontext";
+ rev = "d34e68f0580cc3d3eda8c85fc446c71094fc52fc";
+ sha256 = "05z0xfy9s0iqzvy63bnfhdpqc04yikwairb8b00k9xkspd3sdfdl";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/12bcb0bfc89c1f235e4ac5d7e308e41905725dc6/recipes/elcontext";
+ sha256 = "1firdsrag7r02qb3kjxc3j8l9psvh117z3qwycazhxdz82z0isw7";
+ name = "elcontext";
+ };
+ packageRequires = [ emacs f ht hydra osx-location uuidgen ];
+ meta = {
+ homepage = "https://melpa.org/#/elcontext";
+ license = lib.licenses.free;
+ };
+ }) {};
+ elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "elcord";
+ version = "20180306.1515";
+ src = fetchFromGitHub {
+ owner = "Mstrodl";
+ repo = "elcord";
+ rev = "3071250488613d8dbd79daf81ddbe3bad4b87001";
+ sha256 = "0lcs0713r4vcln2im53mkfwcibr3j7ygs467rfgf163kd979gp5c";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord";
+ sha256 = "0a1f99mahaixx6j3lylc7w2zlq8f614m6xhd0x927afv3a6n50l6";
+ name = "elcord";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/elcord";
+ license = lib.licenses.free;
+ };
+ }) {};
eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eldoc-eval";
@@ -16886,24 +17655,24 @@
license = lib.licenses.free;
};
}) {};
- eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }:
+ eldoc-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }:
melpaBuild {
- pname = "eldoc-overlay-mode";
- version = "20170909.651";
+ pname = "eldoc-overlay";
+ version = "20171219.140";
src = fetchFromGitHub {
owner = "stardiviner";
- repo = "eldoc-overlay-mode";
- rev = "4512e5499cd4f647ad3b5212b853f0299d6cff47";
- sha256 = "1dp7pjr89bq0fjjqvha2smw54aymy4pyjx643qp0x1dhpwa7bv5h";
+ repo = "eldoc-overlay";
+ rev = "a391396f4cdf30a2f27a4c426b58b44ab3d0f0d0";
+ sha256 = "1g1sp6ws4y28536jkf5crbkmnrl7jcbh5s3ysyys6xn8gvz0vm17";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eldoc-overlay-mode";
- sha256 = "09rhh8rj9rcdnl1jfnjlyzcdr56h9yhmfsb27i4v59g06x8qc954";
- name = "eldoc-overlay-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f865b248002d6d3ba9653c2221072a4aa54cd740/recipes/eldoc-overlay";
+ sha256 = "0nn6i89xbw8vkd5ybsnc1zpnf3ra4s8pf01jdj2i59ayjs64s28x";
+ name = "eldoc-overlay";
};
packageRequires = [ emacs inline-docs quick-peek ];
meta = {
- homepage = "https://melpa.org/#/eldoc-overlay-mode";
+ homepage = "https://melpa.org/#/eldoc-overlay";
license = lib.licenses.free;
};
}) {};
@@ -16931,12 +17700,12 @@
electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
melpaBuild {
pname = "electric-operator";
- version = "20171022.625";
+ version = "20180204.1405";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "electric-operator";
- rev = "278086fcffa1a4607392ca2b0ad57522e492b52c";
- sha256 = "1kf1281igi6pzg04fsiqwhwrlqv56c1fi56a4z6ch76wh5s63vj3";
+ rev = "478a976db3ea764f9c88c3302fb3bea1ab41f1ca";
+ sha256 = "08qzi8wvlf64xfhhndnmr9xksk3n9whzvjqaikf5kz1jrygncnrp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -17015,12 +17784,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "20171103.737";
+ version = "20180222.746";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "312b3bf4ca542dd84e3cc502c5297498d4c1f7ef";
- sha256 = "0633gvyk1xh5624g0lp3sriqmrzdhb8dbc6xvmnwqrcqdb3yrigv";
+ rev = "8668227f93a46fdd8d5d8746d428dd2da061e253";
+ sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17036,12 +17805,12 @@
elfeed-goodies = callPackage ({ ace-jump-mode, cl-lib ? null, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, popwin, powerline }:
melpaBuild {
pname = "elfeed-goodies";
- version = "20160926.209";
+ version = "20171126.2251";
src = fetchFromGitHub {
owner = "algernon";
repo = "elfeed-goodies";
- rev = "f3f2595c845a8001d1bb28a185cc05cf984998ef";
- sha256 = "1qfny4qmhy2cb0yxjpzn039kmzhy3n29mik0am0csx9a71gii109";
+ rev = "fc0c3e72f9fcd7bbf5237f6f2323bc666e8240b4";
+ sha256 = "16qkh3cp764hayj4n003sm1q673bq7b3rzf1mii5f3xp6n8i84b7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ebb8d23961fd9bfe101f7917caa3b405493f31/recipes/elfeed-goodies";
@@ -17064,12 +17833,12 @@
elfeed-org = callPackage ({ cl-lib ? null, dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "elfeed-org";
- version = "20171113.356";
+ version = "20180129.507";
src = fetchFromGitHub {
owner = "remyhonig";
repo = "elfeed-org";
- rev = "1a2bacc160d4e164f012ebf23f3ecccac85df18f";
- sha256 = "0g8hhcfg2rahq6mry4aqqggkc7s26q8is9akzrxwi7dlbhc1ljd4";
+ rev = "b9d09a554127244d4807a3d2d90e062df63b2fd5";
+ sha256 = "0szij299pfxbgqfps8njnxa2w862zzn40crsbc1ppww267dbp60j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elfeed-org";
@@ -17082,15 +17851,36 @@
license = lib.licenses.free;
};
}) {};
+ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "elfeed-protocol";
+ version = "20180204.2003";
+ src = fetchFromGitHub {
+ owner = "fasheng";
+ repo = "elfeed-protocol";
+ rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b";
+ sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
+ sha256 = "1gd2ny764qsnnqf3j7rbdqhh7hqd5c0fzwxx6wacd0dpbq4w56qi";
+ name = "elfeed-protocol";
+ };
+ packageRequires = [ cl-lib elfeed emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/elfeed-protocol";
+ license = lib.licenses.free;
+ };
+ }) {};
elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
melpaBuild {
pname = "elfeed-web";
- version = "20170709.954";
+ version = "20180121.1036";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "312b3bf4ca542dd84e3cc502c5297498d4c1f7ef";
- sha256 = "0633gvyk1xh5624g0lp3sriqmrzdhb8dbc6xvmnwqrcqdb3yrigv";
+ rev = "8668227f93a46fdd8d5d8746d428dd2da061e253";
+ sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17103,6 +17893,27 @@
license = lib.licenses.free;
};
}) {};
+ elgrep = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "elgrep";
+ version = "20180302.527";
+ src = fetchFromGitHub {
+ owner = "TobiasZawada";
+ repo = "elgrep";
+ rev = "5e982024250e75fe02aee358a542ae3ed2a472d5";
+ sha256 = "0bkiay3mmk00lay2cv91qmas346ffhb2nlrg6xw083s5vk45fbbv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep";
+ sha256 = "0b8dma52zv57sh1jbrabfy6k5lzixs7f541s8dsqyrg0fzlq460j";
+ name = "elgrep";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/elgrep";
+ license = lib.licenses.free;
+ };
+ }) {};
elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }:
melpaBuild {
pname = "elhome";
@@ -17124,6 +17935,27 @@
license = lib.licenses.free;
};
}) {};
+ elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "elisp-def";
+ version = "20180309.1434";
+ src = fetchFromGitHub {
+ owner = "Wilfred";
+ repo = "elisp-def";
+ rev = "4c300ea67594892171076f49df7c56f25e35d0ff";
+ sha256 = "15kqlf87nxy5vnny5l6jrfj28mxz97w07h6bmj1n1x9lwxbd830n";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def";
+ sha256 = "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz";
+ name = "elisp-def";
+ };
+ packageRequires = [ dash emacs f s ];
+ meta = {
+ homepage = "https://melpa.org/#/elisp-def";
+ license = lib.licenses.free;
+ };
+ }) {};
elisp-depend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elisp-depend";
@@ -17187,43 +18019,43 @@
license = lib.licenses.free;
};
}) {};
- elisp-lint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elisp-lint";
- version = "20150430.1558";
+ version = "20180224.1242";
src = fetchFromGitHub {
- owner = "nschum";
+ owner = "gonewest818";
repo = "elisp-lint";
- rev = "1168b12575f1ed54ee523d34a90757459a6e42a3";
- sha256 = "1ci6nyk1vvb3wgxzarbf6448i9rjb74zzrhcmls634gfxbryxdyy";
+ rev = "04b0d36ec0e4dc1bb54c2bf4c2d16b2af8cf6a39";
+ sha256 = "04hxpfgvkh4ivaxqbhnp3j68i1kqzg1v19bssnvcagll2mm4r3xg";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3744ee1bbde7ec8cecf2796d6ee875c327eb698c/recipes/elisp-lint";
- sha256 = "102hrxdw72bm11a29i15g09lv7jlnd7vkv7292fm3mcxf5f4hkw9";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint";
+ sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63";
name = "elisp-lint";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/elisp-lint";
license = lib.licenses.free;
};
}) {};
- elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
+ elisp-refs = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "elisp-refs";
- version = "20170831.1347";
+ version = "20180111.1431";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refs.el";
- rev = "9ac6c1a45c620a6d7e0fae3739558fa08b3758a3";
- sha256 = "1yniapnkr3124isnfkv1j4mqwdmb1xb7xngjwprhjlg3k1zj3rfl";
+ rev = "eee751a6120f925cdffcfbb6a4545e599b953e94";
+ sha256 = "01gckl8fwmwr5kp1qy4dcmvm7dh4677brwjy4xpqwhiq094fw9b1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx";
name = "elisp-refs";
};
- packageRequires = [ dash f list-utils loop s ];
+ packageRequires = [ dash loop s ];
meta = {
homepage = "https://melpa.org/#/elisp-refs";
license = lib.licenses.free;
@@ -17278,8 +18110,8 @@
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "emacs-elixir";
- rev = "861788186f4dbd500209656dcf38a15b3efe74dd";
- sha256 = "1py8slpda3vsw88v1wp1imnn3r17hz54621c6ks8xm75lnhn60ra";
+ rev = "e928aaf118e399fca2df47c91712b9a469eb1764";
+ sha256 = "0x0ip0mh7zn6lmzj3p3v3jlc9x1j0afrq5rfgi22zk40zkyh26zn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode";
@@ -17316,12 +18148,12 @@
elm-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "elm-mode";
- version = "20171111.2331";
+ version = "20180114.9";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
- rev = "527c269543f203cfaf87f406369137424f791a5a";
- sha256 = "0az7x05ds98ccr4lp6n4zqmhd9bkqxlzh7g9k1va8l9mq862fy8r";
+ rev = "09c6e62e14a2c9afaad03a867c7a268b6bc68ab0";
+ sha256 = "0vc0m5rg9py01w07pifg3fp2z9cna6y21k2xmfns7p6i5c5fjj2g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17526,12 +18358,12 @@
elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elpa-mirror";
- version = "20171012.15";
+ version = "20180228.1636";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "elpa-mirror";
- rev = "f4a84f71368dc343d09093312d1b2c2e9a5a3987";
- sha256 = "07j3bsv3vinpkxxbw4fyfgb5jb1kcd068821l59pk9yrw145kb96";
+ rev = "6ca78e3fb69ef582da1a01f1d193e07ae8223142";
+ sha256 = "0s0c5qqg1cl63kig7kc4fx9rz4kgchxc3w3ywgh5csmgwlkpg0id";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -17547,12 +18379,12 @@
elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20171110.657";
+ version = "20180314.1340";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "6c10424da59909e9b7f7e6bd345522fc4c011b2d";
- sha256 = "0cwz6xgrd827798gq46l08wsc3l1kh8bh5zp3vdik3cqdcqk7lxz";
+ rev = "2f4388f949482a4dd83b2dfc408dd94f72edd3d4";
+ sha256 = "1mbv1xr015pimfqx108gcnpq9ah974h8lbhc9rkb866rbwsfrnss";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17573,6 +18405,27 @@
license = lib.licenses.free;
};
}) {};
+ elpygen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+ melpaBuild {
+ pname = "elpygen";
+ version = "20171225.936";
+ src = fetchFromGitHub {
+ owner = "vkazanov";
+ repo = "elpygen";
+ rev = "21929c997a05968f9eefe52b85a76ceaab3b0d81";
+ sha256 = "093ck4dkdvbgafb1bmkmszg1ba81ns5kjbk2iq2b5p9dvfcjjr3k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e670bd79a85c4e2a9ca3355feb8aaefa709f49cb/recipes/elpygen";
+ sha256 = "01fak1dz9mna3p4c2r0scb0j10qk3lvpq270jy6rvzlcbwri4akl";
+ name = "elpygen";
+ };
+ packageRequires = [ emacs yasnippet ];
+ meta = {
+ homepage = "https://melpa.org/#/elpygen";
+ license = lib.licenses.free;
+ };
+ }) {};
elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "elquery";
@@ -17765,12 +18618,12 @@
elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elx";
- version = "20170805.449";
+ version = "20180202.958";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "elx";
- rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5";
- sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh";
+ rev = "99840665f3ffff36633d52b9970352fc523434a6";
+ sha256 = "0hfpbfvk2f20sy1gia77aw7ndyxpc268bk4n2n6zlfb4j9jcp2sf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
@@ -17867,85 +18720,85 @@
license = lib.licenses.free;
};
}) {};
- emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
+ emacsql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql";
- version = "20170807.1901";
+ version = "20180205.1835";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
- sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
+ rev = "75ac0448a5965c82c616c862cab180c241110fd2";
+ sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
name = "emacsql";
};
- packageRequires = [ cl-generic cl-lib emacs finalize ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/emacsql";
license = lib.licenses.free;
};
}) {};
- emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ emacsql-mysql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-mysql";
- version = "20170410.1008";
+ version = "20171218.1827";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
- sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
+ rev = "75ac0448a5965c82c616c862cab180c241110fd2";
+ sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
name = "emacsql-mysql";
};
- packageRequires = [ cl-generic cl-lib emacs emacsql ];
+ packageRequires = [ emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-mysql";
license = lib.licenses.free;
};
}) {};
- emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
+ emacsql-psql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-psql";
- version = "20170410.1008";
+ version = "20171218.1827";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
- sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
+ rev = "75ac0448a5965c82c616c862cab180c241110fd2";
+ sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
name = "emacsql-psql";
};
- packageRequires = [ cl-generic cl-lib emacs emacsql pg ];
+ packageRequires = [ emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-psql";
license = lib.licenses.free;
};
}) {};
- emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ emacsql-sqlite = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-sqlite";
- version = "20170806.1551";
+ version = "20180128.1252";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
- sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
+ rev = "75ac0448a5965c82c616c862cab180c241110fd2";
+ sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite";
- sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite";
+ sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x";
name = "emacsql-sqlite";
};
- packageRequires = [ cl-generic cl-lib emacs emacsql ];
+ packageRequires = [ emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-sqlite";
license = lib.licenses.free;
@@ -18038,12 +18891,12 @@
ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ember-mode";
- version = "20161105.855";
+ version = "20171208.559";
src = fetchFromGitHub {
owner = "madnificent";
repo = "ember-mode";
- rev = "3e45cf3e290ac422c1b9713f3e7db5c634bcdaf2";
- sha256 = "0g6xmqrjqzwl67ij05lwk72fdhm77p3b45jf7vc8xfn050nvn06l";
+ rev = "755256782478cb724edd8f111225d7c8d342f90c";
+ sha256 = "02x12b26l9qyq9cmg56ys222qxbc8zldw40scq3mfhfqqk4b43g7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode";
@@ -18143,11 +18996,11 @@
emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms";
- version = "20171105.502";
+ version = "20180217.1219";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/emms.git";
- rev = "11954d51e976a83635971fc000a163b0e7056134";
- sha256 = "1dfyc0f6wfvw90lw135mf6vx5yqx7nwbi5b3a3c6dzsm060dzsqx";
+ rev = "0459003a1686b5742e660d08e7c936d1b06e8e7c";
+ sha256 = "1gym522bhxbip4vfg0lxkpjnb00nb4rh08xdmz33r71rclh4vrkv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18160,6 +19013,27 @@
license = lib.licenses.free;
};
}) {};
+ emms-bilibili = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "emms-bilibili";
+ version = "20180102.2018";
+ src = fetchFromGitHub {
+ owner = "0xDEATHCODE";
+ repo = "emms-bilibili";
+ rev = "294bca3dfc42fe3a55fb326ab39bc0fcfc8c5090";
+ sha256 = "0q8z3q1agwgb3d0kpvac7a98p3q4ljjnv404cf9kihjjfxvh4vm5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/533f96d1e68eda20b2d2e7f8eb3e7fa118904970/recipes/emms-bilibili";
+ sha256 = "1mx3fn2x526np8awjn0ydsqh59b4aznf3sig410fbr6wk6pa6y47";
+ name = "emms-bilibili";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/emms-bilibili";
+ license = lib.licenses.free;
+ };
+ }) {};
emms-info-mediainfo = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-info-mediainfo";
@@ -18226,12 +19100,12 @@
emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-player-mpv";
- version = "20170628.303";
+ version = "20180210.310";
src = fetchFromGitHub {
owner = "dochang";
repo = "emms-player-mpv";
- rev = "8c72282c98f9b10601e9a6901277040cda4b33aa";
- sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6";
+ rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7";
+ sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv";
@@ -18247,12 +19121,12 @@
emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-player-mpv-jp-radios";
- version = "20171102.811";
+ version = "20171211.609";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "emms-player-mpv-jp-radios";
- rev = "57924973b9e7a3b059b6dd40decb194abc596875";
- sha256 = "0q1sfb2rgzpvxbpq0d3zl03bc8abyzq2d5pvy8z0ighwbhabkrrs";
+ rev = "686be9b27537bdc7987f1ab0525393208bfc480b";
+ sha256 = "0c53mbl53ii0h64a1vdvskm29wjr7v1ms54ax5d588bv4c67wsms";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18415,12 +19289,12 @@
emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
melpaBuild {
pname = "emojify";
- version = "20171018.744";
+ version = "20180128.607";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "emacs-emojify";
- rev = "001c3adcc521223f6b53a2243635528b2cb7f7e8";
- sha256 = "0hsrlzx8bslzhpipryxxqrdaiw66cgak14p8v47l0ylvwmxxqn13";
+ rev = "8d89c10a5eb975544f8475261e758de390d141ba";
+ sha256 = "1aa9kvfq6vh5rjwg5hif9lc7c886893f9ayl5nqgpxcdjvlpnvc9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18433,6 +19307,27 @@
license = lib.licenses.free;
};
}) {};
+ emojify-logos = callPackage ({ emojify, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "emojify-logos";
+ version = "20171125.214";
+ src = fetchFromGitHub {
+ owner = "mxgoldstein";
+ repo = "emojify-logos";
+ rev = "96c74383a7c69e839ba41de3507154ca4ad564a1";
+ sha256 = "1z2rhs2kvafcfqqvq78yb5zp0pnn9s0mhng0rymfghi704cdifm6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/114d5596a7b36f47c150c413c6ecc74de36ca239/recipes/emojify-logos";
+ sha256 = "0kgci1svi80xnz44bvh19si8bcjllrkm9rbd8761h77iylkqs3q5";
+ name = "emojify-logos";
+ };
+ packageRequires = [ emojify ];
+ meta = {
+ homepage = "https://melpa.org/#/emojify-logos";
+ license = lib.licenses.free;
+ };
+ }) {};
empos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "empos";
@@ -18553,12 +19448,12 @@
enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "enh-ruby-mode";
- version = "20171101.1638";
+ version = "20180123.1835";
src = fetchFromGitHub {
owner = "zenspider";
repo = "enhanced-ruby-mode";
- rev = "9467cd7fc8b6bb3caf644b223e3046fc32013ccb";
- sha256 = "0spsgfkka6sld8ac3m2biydyp8xj84vxa0w7apqvhhmfk3klbbhf";
+ rev = "989f7191078c8c1c46921167f5f96119fad930a5";
+ sha256 = "167b34cgp5f7nfrcp9jn8phzs125jx8mkbni8yshfb5i2mf7g0ml";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -18637,12 +19532,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "20171027.1433";
+ version = "20180201.1340";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "483e94546d9b1de5841b8853882d5644cc419479";
- sha256 = "0dd6agcjpncd3vkdx405ql03rpfacwda0njcz69f1cp7z8rc5cdz";
+ rev = "2819a9c2ae2bc6d095887c2cbb6f9bd8617f1e52";
+ sha256 = "1cfr9xs268nwjjhx7n00h5sssm479bzd5f7c847hg6x2hyqkfzxb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -18750,12 +19645,12 @@
epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epkg";
- version = "20171024.651";
+ version = "20180222.1622";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "epkg";
- rev = "6114b78b84cd8a96a117b7652d1e5138eee4b896";
- sha256 = "1fmvy8h3ng2ykfmr2n0zms2h3csq24f23ldf5zdxyg34riag4nl2";
+ rev = "bc78f600b2c451bc8df1cf73bbb14476c11ece1d";
+ sha256 = "0w4c3j5pnzn6yisfb02s2aw8pzhqlkmidzk0yxfalgn8gmqbz57r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -18771,12 +19666,12 @@
epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epl";
- version = "20150517.433";
+ version = "20180205.1249";
src = fetchFromGitHub {
owner = "cask";
repo = "epl";
- rev = "83797835f729f39b80acba4c7e83d73a2e410e26";
- sha256 = "1rgxvmz9nv7922c30xz8ax3cwj8mmwxfni3xjwnhpfa744in4441";
+ rev = "78ab7a85c08222cd15582a298a364774e3282ce6";
+ sha256 = "0ksilx9gzdazngxfni5i632jpb1nprcxplsbhgqirs2xdl53q8v8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl";
@@ -18855,12 +19750,12 @@
eproject = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "eproject";
- version = "20151205.2130";
+ version = "20180312.942";
src = fetchFromGitHub {
owner = "jrockway";
repo = "eproject";
- rev = "fdff000d601eb8bdb165db3dc4925c6797308b78";
- sha256 = "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2";
+ rev = "068218d2cf2138cb2e8fc29b57e773a0097a7e8b";
+ sha256 = "110b8gn47m5kafmvxr8q9zzrj0pdn6ikw9xsx4z1rc58i02jy307";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d7e82668617a9b599f8994c720f3f123ba1e008a/recipes/eproject";
@@ -18959,12 +19854,12 @@
erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erc-image";
- version = "20170909.312";
+ version = "20180206.941";
src = fetchFromGitHub {
owner = "kidd";
repo = "erc-image.el";
- rev = "15805aa7ed4b13eeaaa4ec294443ef0f9d21c0c2";
- sha256 = "0ja8iv4wp58xab190mf3pj1bbaz25w8pvns03ayajzrflpkhjs79";
+ rev = "9f4d7b93a3c7e12ac935b50943177923a8c01d22";
+ sha256 = "0dd2v91rp3lai10258bszpd9wsa1lvx08xspsnijv64axh73yf7r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image";
@@ -19019,6 +19914,27 @@
license = lib.licenses.free;
};
}) {};
+ erc-status-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "erc-status-sidebar";
+ version = "20171223.1324";
+ src = fetchFromGitHub {
+ owner = "drewbarbs";
+ repo = "erc-status-sidebar";
+ rev = "9e972f4e31287362020daa81dc7af26999ea6c5b";
+ sha256 = "0g7m5r5f01i73k05wny0xycrjcyhzwc314a5lb8h09kglwnmisgv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/29631de8ec4140a8e35cc500902b58115faa3955/recipes/erc-status-sidebar";
+ sha256 = "04qh70ih74vbavq7ccwj1ixpd8s3g8rck9bxv6zhm1yv34bslw5d";
+ name = "erc-status-sidebar";
+ };
+ packageRequires = [ emacs seq ];
+ meta = {
+ homepage = "https://melpa.org/#/erc-status-sidebar";
+ license = lib.licenses.free;
+ };
+ }) {};
erc-terminal-notifier = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erc-terminal-notifier";
@@ -19211,12 +20127,12 @@
eredis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eredis";
- version = "20160809.2053";
+ version = "20180221.1313";
src = fetchFromGitHub {
owner = "justinhj";
repo = "eredis";
- rev = "0d7d524592be488309c7c339d137ba836e52bfff";
- sha256 = "0hj8czwqzdjs7ciyg4xf0imdqfv423c6q862gy83ni09zk5ncm3i";
+ rev = "8a96034805fe0664132ce2e12deb9936503af2d4";
+ sha256 = "1w4z98vr7iy6yxdk3lha7flk48ckxl2baaq8kx7abkirzfl8j4hh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63f06713d06911f836fe2a4bf199b0794ac89cf0/recipes/eredis";
@@ -19295,12 +20211,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20170913.604";
+ version = "20180302.427";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "19245b1ac7bf881319950adb973ff2ce24fea23e";
- sha256 = "1av39vwqbd3j7gbm9371sqczds20d0iybqbc1w9hxlr860mig3nn";
+ rev = "bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee";
+ sha256 = "0f93f2w0c8gclvizh4vlkfii7y07ca7fqr40wqgs1bqjdqw9b9cv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19379,11 +20295,11 @@
ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ert-junit";
- version = "20161018.1217";
+ version = "20180208.935";
src = fetchgit {
url = "https://bitbucket.org/olanilsson/ert-junit";
- rev = "c4cd27b60f9e7ccd05fd8a2097cde947eb250599";
- sha256 = "0zm71kv4wxs6yf70qwrfavxc1845bg4aqqk36zypy17g1x40bms7";
+ rev = "e0cd3c21292e4a80fa8a9648981b61e62a996e80";
+ sha256 = "0i6962j2k6qmdlrw2m5jv2pyxvciyawd954q462nv64cddaa5581";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit";
@@ -19420,12 +20336,12 @@
ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "ert-runner";
- version = "20171111.451";
+ version = "20180215.857";
src = fetchFromGitHub {
owner = "rejeep";
repo = "ert-runner.el";
- rev = "80ff435058f0e9815d0ac8c7a53143c474e00db3";
- sha256 = "1mgbrfgdvby25aaw3l9d0h4b7h5zap6s1m1vlxmmv20fhxza7wbc";
+ rev = "0de42343a9de834320397d169c81725b2827e41f";
+ sha256 = "0jc7n6mdv1kka47wmjjhgfw46l16mqlj5kkkyw16gd9g8dwcf6sr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner";
@@ -19462,12 +20378,12 @@
es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
melpaBuild {
pname = "es-mode";
- version = "20170915.801";
+ version = "20180212.1425";
src = fetchFromGitHub {
owner = "dakrone";
repo = "es-mode";
- rev = "511eaf59123c2dc4f900cd31d3c30c5bf98599ea";
- sha256 = "1ldyf39z7faizbg2nzh2myd5yld9iwxi9r5260sp1dv0ab2im4gy";
+ rev = "c5ad728ce3fc2c513108e0ada2cd0c08ab94f870";
+ sha256 = "0drmxxqgml36fymn4gqxbjimh8dgmm4yr68hsmsd0iz1lxglgda1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
@@ -19543,6 +20459,27 @@
license = lib.licenses.free;
};
}) {};
+ esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "esh-autosuggest";
+ version = "20171223.1855";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "esh-autosuggest";
+ rev = "2fd996c1a29b21e60854a3c90d7d4fc3d5b0aded";
+ sha256 = "1vkbyhkvvj5h63ybxg795m61c4157jm2v01y9m98jm4pxysmls7m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest";
+ sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx";
+ name = "esh-autosuggest";
+ };
+ packageRequires = [ company emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/esh-autosuggest";
+ license = lib.licenses.free;
+ };
+ }) {};
esh-buf-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esh-buf-stack";
@@ -19714,12 +20651,12 @@
eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-prompt-extras";
- version = "20171020.2207";
+ version = "20180109.2234";
src = fetchFromGitHub {
owner = "hiddenlotus";
repo = "eshell-prompt-extras";
- rev = "9b1a49853909c4fae95d32bb9a68cace471c161e";
- sha256 = "03sr68mfi52ajqb6d9k3lpcrapjkqx9yynpfwin9y2328pmriaib";
+ rev = "1d8825dcc005b488c6366d0b3015fc6686194eea";
+ sha256 = "1nqzd24wwvyzf3bn7m7vd4xqmj4p8z51h8cnli07yja17cr5gwx6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras";
@@ -19795,22 +20732,22 @@
license = lib.licenses.free;
};
}) {};
- eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eslintd-fix";
- version = "20170711.552";
+ version = "20171128.453";
src = fetchFromGitHub {
owner = "aaronjensen";
repo = "eslintd-fix";
- rev = "895d70be11ccdbcdf0b44d5ae2a85d4ccac2920c";
- sha256 = "1h43l4jvp3wbyyda3745m6c6ik6pn4k7pmq94ia9fbp4zqh4hsvr";
+ rev = "3efb041c9ad0116e745efaede7f7972bc2179a72";
+ sha256 = "16siwr2d930kifdhzgbyiszphp6i5ggbyi76ya6gkzy6wh1s9b56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v";
name = "eslintd-fix";
};
- packageRequires = [];
+ packageRequires = [ dash emacs ];
meta = {
homepage = "https://melpa.org/#/eslintd-fix";
license = lib.licenses.free;
@@ -19903,12 +20840,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "ess";
- version = "20171112.1151";
+ version = "20180314.612";
src = fetchFromGitHub {
owner = "emacs-ess";
repo = "ESS";
- rev = "a218dec600c25687a81419e42b555141911504c6";
- sha256 = "0wl90xiifn83clm25ya953pa91734h0sav1426y5czrmswzw7mj1";
+ rev = "87034e808c5279d73d666797971fac505215fd7f";
+ sha256 = "0ycgid2b74f07wc97ywwr5rkk4hxxwhc4zly9xfqa75ngrj993z4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20008,12 +20945,12 @@
esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esup";
- version = "20170923.1328";
+ version = "20180226.254";
src = fetchFromGitHub {
owner = "jschaf";
repo = "esup";
- rev = "a589005a9a888537deef94d6fe38a9b8790c97c7";
- sha256 = "04lxmd0h7mfjjl0qghrycgff0vcv950j1wqv0dbkr61jxp64n5fv";
+ rev = "d4db4f3023afff4321cd3f99be75ad44e77cd0b0";
+ sha256 = "1z8ban35vrkibr07awfg6z4cy79irjiz6hchcyid94l6iifbwf0y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -20029,12 +20966,12 @@
esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esxml";
- version = "20170903.150";
+ version = "20171129.7";
src = fetchFromGitHub {
owner = "tali713";
repo = "esxml";
- rev = "6d58e047b7c1e3e8cab87cf7ee15e039e8a22510";
- sha256 = "0bkbp3bycb4vrk0y5n7013yqqzz7rjvfwkr9lppa6sixilhc8h66";
+ rev = "5548ceba17deae0c3c6d0092672edc4de3c75ce3";
+ sha256 = "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml";
@@ -20068,6 +21005,27 @@
license = lib.licenses.free;
};
}) {};
+ eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
+ melpaBuild {
+ pname = "eterm-256color";
+ version = "20180308.1615";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "eterm-256color";
+ rev = "dab96af559deb443c4c9c00e23389926e1607192";
+ sha256 = "0ysxblc90kjcz84siprnyxwh94scflivqbxylzkvjm7hbx93rsh1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color";
+ sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b";
+ name = "eterm-256color";
+ };
+ packageRequires = [ emacs f xterm-color ];
+ meta = {
+ homepage = "https://melpa.org/#/eterm-256color";
+ license = lib.licenses.free;
+ };
+ }) {};
ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ethan-wspace";
@@ -20134,12 +21092,12 @@
eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
melpaBuild {
pname = "eval-in-repl";
- version = "20171112.1854";
+ version = "20171122.543";
src = fetchFromGitHub {
owner = "kaz-yos";
repo = "eval-in-repl";
- rev = "5f8da66b7bc697e3b86abbe0a4e103f82ce4d038";
- sha256 = "0nh8hshh4fvyax11sffk1gjs4cicm46chcdgzdfkpr26icg6ka5h";
+ rev = "fea05a5b81d74ac53cb2a83aa83a73d9526bcc42";
+ sha256 = "0xm1ggdaihy1cyg4b3b9x1n93bp4qiv30p1mfzmmqm6w89z1agf0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@@ -20239,12 +21197,12 @@
evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "20171112.519";
+ version = "20180307.109";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "5337d2b3d2f739b4b5b4a73bc0e66363be6b71f9";
- sha256 = "1hdpkqz8nnzap0d7dnv8nkj66mj1y4w00ibzari500sg9xb4gc49";
+ rev = "90b41a21a31e99d4153c536f1a04a69b73d96360";
+ sha256 = "1vfvhz0r9n1psb6z35r282y4snkxjsbwr3whpzin2a5g515vvx92";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -20383,6 +21341,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-collection";
+ version = "20180313.1759";
+ src = fetchFromGitHub {
+ owner = "emacs-evil";
+ repo = "evil-collection";
+ rev = "4d3f755884a93132659976c510fdc90b2b98622c";
+ sha256 = "05lwd9c2hdd8pdd5vy2f8h3q2djj4zpp4dfwbqqrgqkhw0wavg7s";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection";
+ sha256 = "1fggdlssb8sai00vbrxph8cama3r0f7w8qhmiajj4cy2il7jgmhy";
+ name = "evil-collection";
+ };
+ packageRequires = [ emacs evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-collection";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-commentary";
@@ -20428,12 +21407,12 @@
evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-easymotion";
- version = "20170110.2004";
+ version = "20180113.2254";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "evil-easymotion";
- rev = "f9b5aa52f238ea14c2b16982e56c3b2c8f739101";
- sha256 = "098x03vlz3gvkaa3wahi1557l9x39n1v8jclj5aqxvjdzapi6myi";
+ rev = "79c13ed3bce018ac09d358e642e5bd7025e93603";
+ sha256 = "0496dnbciq8gbivihas1y58gwd4nbfz767rr98zpwgkz8l2jvy73";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion";
@@ -20530,6 +21509,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-expat = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-expat";
+ version = "20180302.657";
+ src = fetchFromGitHub {
+ owner = "edkolev";
+ repo = "evil-expat";
+ rev = "523edb0d1fd6ad17b777c1893cbe1f4857469a4d";
+ sha256 = "10irfd546pz0sz0ckfms1md37ni44p7i12imii5ck13hga7grv7i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat";
+ sha256 = "03niji6wymhlfkvdg90gasccs4683djxcj925c8k0vdgmfr8sx32";
+ name = "evil-expat";
+ };
+ packageRequires = [ emacs evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-expat";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-extra-operator = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-extra-operator";
@@ -20596,12 +21596,12 @@
evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-goggles";
- version = "20171103.2328";
+ version = "20180210.938";
src = fetchFromGitHub {
owner = "edkolev";
repo = "evil-goggles";
- rev = "75d124851fd31bb7014036e969300a0259128557";
- sha256 = "0184y95d52nbldpn3khxk6f3dlh36v0mjsvhhgg557gwhg5psasi";
+ rev = "deab4966d75321a9172947ee5cdf2329eb2c5a6b";
+ sha256 = "1b4w40x23kbzry80d4rxxynasmrkbry9jj5jkc4l4rcj8lk3vbbi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -20785,12 +21785,12 @@
evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "evil-magit";
- version = "20171018.722";
+ version = "20180313.931";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-magit";
- rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a";
- sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3";
+ rev = "69dfa5a06e8a4024803223b9873ea5d591a97294";
+ sha256 = "1kd09z4qxcanvxnawhczwp3y61kn4gnaaji9chqrny633r8j64jk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
@@ -20827,12 +21827,12 @@
evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
- version = "20171101.2202";
+ version = "20180131.502";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
- rev = "fb5807c0965f3689b9e37f5e5b0fce022938bb43";
- sha256 = "02yz4m9nzn0dql279xbgaxbrwhn6xxb30kf0pyjqyxg2njzfihid";
+ rev = "20270ab6b0a3a398942609f7acc3d0162b954591";
+ sha256 = "0vnaplchyl1z9d8fhrc83157a6d97dgwdja4y0nm7bkgm1jqgbdc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -20890,12 +21890,12 @@
evil-mu4e = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-mu4e";
- version = "20170911.122";
+ version = "20171127.1214";
src = fetchFromGitHub {
owner = "JorisE";
repo = "evil-mu4e";
- rev = "64b663c3b31d14c4260921a7ec4b8d475d5ed339";
- sha256 = "1cms5kvgkhaq1gb6yai5ykn3mkb3vjs99b75f7lyl6da89k9kx9w";
+ rev = "234f8a7b24e3b21b6d849d209c006a258ae056ce";
+ sha256 = "0gl8gfdnq61lx6qjyswgxhbg5m3p26cps0pix3rssqb64v7lrxci";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/332f3f9c6dc106e58345abbc2d8fd99056d518c0/recipes/evil-mu4e";
@@ -20911,12 +21911,12 @@
evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
melpaBuild {
pname = "evil-multiedit";
- version = "20170623.1135";
+ version = "20180209.1819";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-multiedit";
- rev = "e135fd8662406807bc0d9d0f2688e7dbe89b98c8";
- sha256 = "1dw3mf3dckjhnzvwj7jcwlgzkh592njvcg2xbs2wv1456rnnqaz3";
+ rev = "ea3d9177b74ab0bc65e55df9cc0a0b42e4ef815d";
+ sha256 = "17zm35r474z8ras4xy7124pcb972d385pbdv4jxyj5vq042vq07w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -20932,12 +21932,12 @@
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-nerd-commenter";
- version = "20171106.1510";
+ version = "20171206.441";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-nerd-commenter";
- rev = "6a05c86bdf668fa2bb8a9daf76f3d7b241d7ba3d";
- sha256 = "0nbgrg1d8g2v7lfdwnd26wm1n4qpwci4a0x3qawngcjkyj9df4q5";
+ rev = "41d43709210711c07de69497c5f7db646b7e7a96";
+ sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -20995,12 +21995,12 @@
evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-org";
- version = "20171107.1159";
+ version = "20180309.252";
src = fetchFromGitHub {
owner = "Somelauw";
repo = "evil-org-mode";
- rev = "e38cf914de6627fed6405004555e0c04fcf39906";
- sha256 = "1nzbwvhq9k554x6i7qjy4y9s9r4h6lwcmc7na6ic14ybmxv60dl3";
+ rev = "79c8e067bbc31ead51894a28492f28cf3a103808";
+ sha256 = "02qdsc6fzcxmblvlg0zpznzfi8xkmc4rr44zdxgw462xyfk2fwrq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -21076,6 +22076,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-replace-with-char";
+ version = "20171223.906";
+ src = fetchFromGitHub {
+ owner = "ninrod";
+ repo = "evil-replace-with-char";
+ rev = "b08293f380ca8809ef12df572d37f977bed0ae52";
+ sha256 = "05d505scnmhplaqrcj7fpb107bfgh4zpxrrq942nn035yw07yjjx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char";
+ sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r";
+ name = "evil-replace-with-char";
+ };
+ packageRequires = [ emacs evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-replace-with-char";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-replace-with-register";
@@ -21142,12 +22163,12 @@
evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
melpaBuild {
pname = "evil-smartparens";
- version = "20171103.941";
+ version = "20171210.713";
src = fetchFromGitHub {
owner = "expez";
repo = "evil-smartparens";
- rev = "9fe4eed1c6327197afe6c13bb0771e18908aff00";
- sha256 = "1di4qz5fbrlwbg16c2j0m7y8zqfxw027qd7zqmc3rwk9znbhg7wl";
+ rev = "026d4a3cfce415a4dfae1457f871b385386e61d3";
+ sha256 = "05habba44zls2d20kgzshrq2psagay16cnvcnkqgrbhvj1rxfmrk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
@@ -21163,12 +22184,12 @@
evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-snipe";
- version = "20170903.603";
+ version = "20180228.2218";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-snipe";
- rev = "69adb46546a871beb54a445cb22652ac276555c1";
- sha256 = "1g6whd2zg880wxxyn269q4b0697aybj1lc936gi7nrxvm6fnaiwc";
+ rev = "5de756fc02108cb2360908f6ec5e9630492ef422";
+ sha256 = "10ch2xkw3ca3g190344jw9wsq297sip9nh12wmd8wxgsnqjlfzfs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21202,15 +22223,36 @@
license = lib.licenses.free;
};
}) {};
+ evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }:
+ melpaBuild {
+ pname = "evil-string-inflection";
+ version = "20180313.1055";
+ src = fetchFromGitHub {
+ owner = "ninrod";
+ repo = "evil-string-inflection";
+ rev = "00b62fb82de36e9c7b44bd644c7e11ae88f35f62";
+ sha256 = "0f24722vl3sqri389hi6qj7hhfalqpjvyq4ain5hhr0gsx2dznw4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection";
+ sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh";
+ name = "evil-string-inflection";
+ };
+ packageRequires = [ emacs evil string-inflection ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-string-inflection";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-surround";
- version = "20171004.600";
+ version = "20180102.601";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-surround";
- rev = "822a0f61c3fd7c55cda4e04c8590ae5144401c26";
- sha256 = "0xd87whrznwk1hggb0jrx6n1m5sbj0014qv26qvvc3f11vrrda2x";
+ rev = "2af81ab3ac64e4b0515a157a672d8cb89f0172b9";
+ sha256 = "00bcz353cc82wpk5cai5ni99z2la4gwm0k1fvanysx1amg8vxvfy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
@@ -21289,12 +22331,12 @@
evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-test-helpers";
- version = "20171002.135";
+ version = "20180109.1040";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "5337d2b3d2f739b4b5b4a73bc0e66363be6b71f9";
- sha256 = "1hdpkqz8nnzap0d7dnv8nkj66mj1y4w00ibzari500sg9xb4gc49";
+ rev = "90b41a21a31e99d4153c536f1a04a69b73d96360";
+ sha256 = "1vfvhz0r9n1psb6z35r282y4snkxjsbwr3whpzin2a5g515vvx92";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
@@ -21419,8 +22461,8 @@
src = fetchFromGitHub {
owner = "alexmurray";
repo = "evil-vimish-fold";
- rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15";
- sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn";
+ rev = "c617fecb91303f8c63f85a6101a503fdc88aae84";
+ sha256 = "05zm0gngdamfs5cqnjq4lh7253hdj0lggdgfphl56ynblhf8qf36";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold";
@@ -21559,15 +22601,36 @@
license = lib.licenses.free;
};
}) {};
+ exato = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "exato";
+ version = "20180305.242";
+ src = fetchFromGitHub {
+ owner = "ninrod";
+ repo = "exato";
+ rev = "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6";
+ sha256 = "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato";
+ sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn";
+ name = "exato";
+ };
+ packageRequires = [ emacs evil ];
+ meta = {
+ homepage = "https://melpa.org/#/exato";
+ license = lib.licenses.free;
+ };
+ }) {};
exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "exec-path-from-shell";
- version = "20170508.4";
+ version = "20180224.1916";
src = fetchFromGitHub {
owner = "purcell";
repo = "exec-path-from-shell";
- rev = "5e355fbc50913d1ffe48bf86df0bcecd8b369ffb";
- sha256 = "1flkhbyxa7mi97vj4w6c2anzq7qz51sac6yqk308blfvd9z3pf95";
+ rev = "885b3de9bb6365771dd09f5267f6ff843d5109e8";
+ sha256 = "0x5a0v4z5hgvi7biwbsbxw9l8in0gxwrz77g9vffz9djvlr70r1h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell";
@@ -21603,12 +22666,12 @@
exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "exotica-theme";
- version = "20171113.128";
+ version = "20180212.1529";
src = fetchFromGitHub {
owner = "jbharat";
repo = "exotica-theme";
- rev = "5d7657029c89ee38b95223e9c2b887387f915e89";
- sha256 = "0whb82q8jwda3l7zhdljcgzs0qsx3q5b2q0qqm8mg9dvmi9mlyrx";
+ rev = "ff3ef4f6fa38c93b99becad977c7810c990a4d2f";
+ sha256 = "1kp6q55g3dcya4y79x877vqwxa4z2rkkvhs49pkwr3wljf4af2pd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
@@ -21645,12 +22708,12 @@
expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "expand-region";
- version = "20170514.1309";
+ version = "20171217.2125";
src = fetchFromGitHub {
owner = "magnars";
repo = "expand-region.el";
- rev = "2357f1d5efd9d5b9e37f3513342237fec2629291";
- sha256 = "0sggq57q8fxzd0my2kwbb2li91zq13cyhxn789bafzxq2d5fpk9h";
+ rev = "f99b7630efcdb47c9c6182489c55fba3bcaee521";
+ sha256 = "0sdk9qqxd8dkjf554p7ch2w8pd8a7c4q64c5yd8gphc8fmzc32rn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@@ -21708,12 +22771,12 @@
extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "extempore-mode";
- version = "20160620.1813";
+ version = "20180104.2221";
src = fetchFromGitHub {
owner = "extemporelang";
repo = "extempore-emacs-mode";
- rev = "ce052da4899ea85ee33792a344359fdd19bc653b";
- sha256 = "163in2pbvqyknsm3la5zqinlw018crx0f0cvr9caal86v5gx65cr";
+ rev = "ae5f40d4b0883a4519e460cd7720e5fcc3a68fa5";
+ sha256 = "1f888h7xv6zz6kq38ak1vpwjrjr2sqgwpfxwb9x0ldf3kkx4wf1w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7bd3e57171f5283604e9375613a7a94416ee99a7/recipes/extempore-mode";
@@ -21747,15 +22810,57 @@
license = lib.licenses.free;
};
}) {};
+ extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "extmap";
+ version = "20180205.1047";
+ src = fetchFromGitHub {
+ owner = "doublep";
+ repo = "extmap";
+ rev = "3860b69fb19c962425d4e271ee0a24547b67d323";
+ sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap";
+ sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j";
+ name = "extmap";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/extmap";
+ license = lib.licenses.free;
+ };
+ }) {};
+ exwm-surf = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "exwm-surf";
+ version = "20171204.340";
+ src = fetchFromGitHub {
+ owner = "ecraven";
+ repo = "exwm-surf";
+ rev = "6c17e2c1597fe4b7b454a1dac23b9127ac951e94";
+ sha256 = "0rb921fq3pyzv0w1s6n0zx4j7cvv68mb50hfa8nqnppz5ii1k0lb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4fc27fae2b58c7af87dadba9217cc05f8ab4890c/recipes/exwm-surf";
+ sha256 = "066qbn1w63irh9b03qs0fv77x71cind22kdj6wygaznrpgwr0kny";
+ name = "exwm-surf";
+ };
+ packageRequires = [ emacs exwm ];
+ meta = {
+ homepage = "https://melpa.org/#/exwm-surf";
+ license = lib.licenses.free;
+ };
+ }) {};
exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
- version = "20170916.2015";
+ version = "20180227.257";
src = fetchFromGitHub {
owner = "tumashu";
repo = "exwm-x";
- rev = "abb210ff56134cc6a285d91b875f3115bc951ad0";
- sha256 = "1l7578jfn3va6bpkjfbazygsn8asxhc7cpss32mnsrzkm1ix6sz8";
+ rev = "4f7946db67d6599baba6b3961e8f543a68707742";
+ sha256 = "00lcn5106xig2y9gyir1f1gzyp2i05rwq1lbbbah8aipkdi3z9xl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -21779,12 +22884,12 @@
eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eyebrowse";
- version = "20170318.1418";
+ version = "20171216.944";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "eyebrowse";
- rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20";
- sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn";
+ rev = "ad94b5bed74a74769775e937e167d301f4ea70e3";
+ sha256 = "1f1b70fyq9j19i41rsishrdkslwnx0af7gzwirhs25sgkpsqz2hr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -21842,12 +22947,12 @@
eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eziam-theme";
- version = "20171007.939";
+ version = "20180208.628";
src = fetchFromGitHub {
owner = "thblt";
repo = "eziam-theme-emacs";
- rev = "909a84dc5959aac982d1c296e82d687d172d3ecd";
- sha256 = "0mw9h55f708mv0ngixmdn7976yrhqjcnzac80f6mzddpwavgrhd6";
+ rev = "8891dc05b54c0ea848ee3bf7b42e759f73c1bb1a";
+ sha256 = "1wi1qqzf630ffz0kkk12f81jmm8ii7cckf1wds3phpb67msn5ial";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -21863,12 +22968,12 @@
f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "f";
- version = "20171107.1248";
+ version = "20180106.122";
src = fetchFromGitHub {
owner = "rejeep";
repo = "f.el";
- rev = "3623a4577c89740cfad8d961f3201d3222c79ff6";
- sha256 = "0vwczzrck2gmjb16ais1bvcl307kfvzrfp27wnrmqnznjhnpwj59";
+ rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48";
+ sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f";
@@ -21884,12 +22989,12 @@
f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "f3";
- version = "20170728.1120";
+ version = "20180130.358";
src = fetchFromGitHub {
owner = "cosmicexplorer";
repo = "f3";
- rev = "1ed0ac4368a9f631f6dfad7ad17e9f7434a42bd6";
- sha256 = "03crpcb1jbbc12nz912qdkipmm94xlrpzr2cgckya0cj8sdgv9fz";
+ rev = "000009ce4adf7a57eae80512f29c4ec2a1391ce5";
+ sha256 = "0q3ylw0i1bg7pzsv4gj72jcfjjfh57vsb3fnfnhhh5i5vladiqsf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3";
@@ -21905,12 +23010,12 @@
fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fabric";
- version = "20160907.215";
+ version = "20171115.2256";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "fabric.el";
- rev = "2d436122243bcdd64ec5700e42d88ea9d363aefc";
- sha256 = "0g083jbxqzzg0pja1fhqshg6dv7p22ymnlsg02l073059sfy4c94";
+ rev = "df79be341d0b34ed23850f9894136092fa5fea8c";
+ sha256 = "1mnz81k1jz2sa3zj68ihzgq66l9fcxvzb67ad62p8bvi2aksxx7z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/83939d2a4d5874244a4916eee9ae6b327af18b5d/recipes/fabric";
@@ -21989,12 +23094,12 @@
faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faff-theme";
- version = "20170522.1219";
+ version = "20180315.1304";
src = fetchFromGitHub {
owner = "WJCFerguson";
repo = "emacs-faff-theme";
- rev = "e79dc142d99bc5a455a46345d3aba6f95f3f3f42";
- sha256 = "0j5vdbwwpav09v3kkx7cn5qd41inam0jd7smx8133hqpnirsh8mv";
+ rev = "abbfde9311a2b0562541d2bf455182d6197f8c48";
+ sha256 = "15x2lb41df0kvlvncqp7m4a97yb7m4jhpgb8hp35if5cgp99xmbj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme";
@@ -22115,12 +23220,12 @@
fasd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fasd";
- version = "20161216.831";
+ version = "20180203.745";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "emacs-fasd";
- rev = "5940b84dfa1ea7225b740d3a8dd215290d964873";
- sha256 = "1wqh7x0c1i0w5lfh0j7xilvp5vmwvbsblp2jd6bz3n5j2ydgpc00";
+ rev = "f6393895bddbe9a1c77d4f6963a7e7ec6ff18bc4";
+ sha256 = "1bjb20p2sp1avjmr57b3zf15w01fi7h4dd46zahhap1lrk9sxgx9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd";
@@ -22178,16 +23283,16 @@
faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faust-mode";
- version = "20170908.542";
+ version = "20180205.126";
src = fetchFromGitHub {
- owner = "magnetophon";
+ owner = "rukano";
repo = "emacs-faust-mode";
- rev = "0f099007574d1430bb0cf73f73dcc284d9d3a190";
- sha256 = "0rmq6ca75x47hk2bpsk1j2ja62kpplgyanpiqq4hk6q259rd4lyv";
+ rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c";
+ sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode";
- sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode";
+ sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z";
name = "faust-mode";
};
packageRequires = [];
@@ -22199,15 +23304,15 @@
faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faustine";
- version = "20170908.658";
+ version = "20171122.402";
src = fetchgit {
- url = "https://bitbucket.org/yassinphilip/faustine";
- rev = "ae67cd9d1a2625d80726dace9dd83539e71d1b36";
- sha256 = "1wvf37g2bb9xbxi0qxn1sfq0ygaqxfzsnzdbnail6f29qyl541al";
+ url = "https://bitbucket.org/yphil/faustine";
+ rev = "07a38963111518f86123802f9d477be0d4689a3f";
+ sha256 = "0dj35hwkm5v8758c4ssl873vkvplba5apjsh7l23nsmnzdji99zg";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine";
- sha256 = "0pkjxfzgdhkjjx38d1c2kw8m5cw5ryhfj7lykpym79wsa471hf9s";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine";
+ sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s";
name = "faustine";
};
packageRequires = [ emacs faust-mode ];
@@ -22279,6 +23384,27 @@
license = lib.licenses.free;
};
}) {};
+ feebleline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "feebleline";
+ version = "20180202.1420";
+ src = fetchFromGitHub {
+ owner = "tautologyclub";
+ repo = "feebleline";
+ rev = "c6a8a955c0f441d4b4663fabd5cecdc92235b74b";
+ sha256 = "09g67mkschca2vp73263xm5zf48831zfxlyyfcmkjpsvrgm83ii2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/782295d8c530878bd0e20cde7e7f7f8f640953dd/recipes/feebleline";
+ sha256 = "0c604ahhv9c89r3hj7091zhhfpbykh4c23sn6ymqw4pp0dq4pgkj";
+ name = "feebleline";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/feebleline";
+ license = lib.licenses.free;
+ };
+ }) {};
fetch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fetch";
@@ -22364,12 +23490,12 @@
fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fill-column-indicator";
- version = "20170905.1008";
+ version = "20171209.1124";
src = fetchFromGitHub {
owner = "alpaker";
repo = "Fill-Column-Indicator";
- rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779";
- sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y";
+ rev = "d2536b1c48f78679e15a2b50cd5d8c0ffde4b155";
+ sha256 = "0f8h32n8mnrwijz3lrslbx521f0fkhn24cwd16r8hcjk976l5kbp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@@ -22410,8 +23536,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "elisp-finalize";
- rev = "0496a7b8f2f8b197010d8602b5fc529f5104704a";
- sha256 = "1canhfvqjkm0bbr9g50pi0cibhq3mf7g79k2m18d8zarc9jljrjm";
+ rev = "846731531e7d1d80451787992e07bfe7dedbe9ff";
+ sha256 = "0kqsqmfvnh0slx0hmrsw66rh62sgzyhzck7ii9zylkq72wj60fgl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
@@ -22427,12 +23553,12 @@
find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }:
melpaBuild {
pname = "find-by-pinyin-dired";
- version = "20170206.208";
+ version = "20180209.1818";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "find-by-pinyin-dired";
- rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f";
- sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h";
+ rev = "3b4781148dddc84a701ad76c0934ed991ecd59d5";
+ sha256 = "03fw1si115padxss6zb9fr0dsyq1bxlhxikgh4i5swp4jd4331k5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired";
@@ -22448,12 +23574,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "20171025.1943";
+ version = "20180224.2103";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "a3ecd28182ba3102fefdc080e807866464153edc";
- sha256 = "08dk8jjg63rs15hq4rb32368nja2iwdsp8dxwb3isza96lsfkwmx";
+ rev = "aba912a73d1f3fcff0d184b49008a2fa1655ad7e";
+ sha256 = "145n04lid9alrm8nl6gfnll75jz1ssli48pbsc9zyva00ryk83my";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -22676,15 +23802,36 @@
license = lib.licenses.free;
};
}) {};
+ firrtl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "firrtl-mode";
+ version = "20180221.1555";
+ src = fetchFromGitHub {
+ owner = "ibm";
+ repo = "firrtl-mode";
+ rev = "1ac00d526018945389bcb2292dbdd8395381774a";
+ sha256 = "02xznsiij39lhjr261vl7yz4k4i76vshh5kwa7ax95zpj2zbs0v6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbf9ab9db03410c35b8b73a23bf8062b10f0815/recipes/firrtl-mode";
+ sha256 = "11n3wjr9sinqafjs88bznb5rppnignwkn4m4ppixi6xr31v3i4ws";
+ name = "firrtl-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/firrtl-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
fish-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fish-completion";
- version = "20171104.1509";
+ version = "20171209.508";
src = fetchFromGitHub {
owner = "Ambrevar";
repo = "emacs-fish-completion";
- rev = "547fe4f61b8e311e5db17be9f6d277d08523beba";
- sha256 = "0qkq23fad7apm2q1xn3b7agkkv3pvcwv012kvma568zk4jcfw3zg";
+ rev = "12e5db70b5efe7a3cd37e8fd25eb526d08007aac";
+ sha256 = "0p06rahi66fa3i2gfkf6nzf7hnysdpz475d5dib2wps7labfh9qd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/832bae268cd08d7ebfd4b7a8d0570af8549cdbd6/recipes/fish-completion";
@@ -22700,12 +23847,12 @@
fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fish-mode";
- version = "20170430.623";
+ version = "20180306.818";
src = fetchFromGitHub {
owner = "wwwjfy";
repo = "emacs-fish";
- rev = "888d037008272f6001207a2990e51ba87fe187e6";
- sha256 = "1r2clxm68nq8jhgc5cly51i6axjmi720r5m34dhf6zblwib4lfdp";
+ rev = "bac709ac1235751952d6022dddc6307d9135d096";
+ sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode";
@@ -22721,12 +23868,12 @@
fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fix-input";
- version = "20170518.2311";
+ version = "20171231.2220";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "fix-input";
- rev = "a0fd233bba6206854c5d7365d7182aaae842f210";
- sha256 = "1zwbysh9fq6dbdi93cdzgrsp2azy8b3j0gz32ih0vbs9xyysbhlz";
+ rev = "37bc0734a2e71d66245ee3960879577e5ef906bb";
+ sha256 = "04k4wqsdbwxbq5a4dxvr3mqqsa5y3c0238llh2wig1r763ligm3j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input";
@@ -22763,12 +23910,12 @@
fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fix-word";
- version = "20170518.2343";
+ version = "20171231.2215";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "fix-word";
- rev = "7df98ac9f9b0e6e09d7999d83e678cb22248be77";
- sha256 = "13i604lmx30r0kk0s998dp4czzazqavyqqi3kx6lh6mj2csgkgda";
+ rev = "8e66b6a7b599c6c5098490e83ef4e69acf307603";
+ sha256 = "1p8hz66fyzivvwwya0br3v7dx0fqna9jw9291zgshvhxbin867fp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word";
@@ -22809,6 +23956,27 @@
license = lib.licenses.free;
};
}) {};
+ flame = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flame";
+ version = "20180303.1216";
+ src = fetchFromGitHub {
+ owner = "mschuldt";
+ repo = "flame";
+ rev = "2cfb860a483197e92a4c20d7b9b055d586e76fe0";
+ sha256 = "1h6mm2zjv03y2d6dv4gq7iaz6r2glgcljzgmi6m4jp6flvyqh09g";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b7a14c14368de722855286c088020a5657f7cf8b/recipes/flame";
+ sha256 = "1br9c48anscq9vbssr0gq8f5kbq755hjaglbljwwh9nd5riycv5v";
+ name = "flame";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/flame";
+ license = lib.licenses.free;
+ };
+ }) {};
flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flappymacs";
@@ -22875,12 +24043,12 @@
flatland-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flatland-theme";
- version = "20140805.305";
+ version = "20171113.721";
src = fetchFromGitHub {
owner = "gchp";
repo = "flatland-emacs";
- rev = "b2c2df1fc20a3a23787644f91f8121d9353f9bf9";
- sha256 = "0cl8m1i1aaw4zmkrkhfchhp0gxhpvhcmpjglsisjni47y5mydypf";
+ rev = "a98a6f19ad4dff0fa3fad1ea487b7d0ef634a19a";
+ sha256 = "02gbzxd1v003aaj5rn3vr00n4390bhdx2jhpa7nb430fg3s1ppdy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a081fd0c5598fdf5bc0ab92f4d009f32132a29e/recipes/flatland-theme";
@@ -22959,12 +24127,12 @@
flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flex-compile";
- version = "20171107.1257";
+ version = "20171213.1019";
src = fetchFromGitHub {
owner = "plandes";
repo = "flex-compile";
- rev = "82e217aaab34dfd1faf7d03c82eca49706190232";
- sha256 = "1zp0gki61g487x6bypxlkbjzi972y80pzmhqdisl6qx9yrmk60vy";
+ rev = "1952f6deee9d95196906f46fea2b24882cc614b6";
+ sha256 = "0wx0857f25k2rr5y6mikhi0czgvf6r1667fy8hjgl6gk0fyi960f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile";
@@ -23000,12 +24168,12 @@
flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flim";
- version = "20161210.1728";
+ version = "20180118.522";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "flim";
- rev = "3510d32e5820b2c22b4e9c9f29177beea42c5bfb";
- sha256 = "0ggr8fkzwa6k0i7gl41qxkvkvnzpqzbhnd6klbk6j6j0rw1pmgn8";
+ rev = "e969ab24f729835b6f8dd71d57cee1aff345f959";
+ sha256 = "1gs3f2dvqh0pfc2mdz00l66wm4hsl2qb7pz29r5yfzjbk5inwqry";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim";
@@ -23039,6 +24207,27 @@
license = lib.licenses.free;
};
}) {};
+ fliptext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "fliptext";
+ version = "20171124.1256";
+ src = fetchFromGitHub {
+ owner = "andre-r";
+ repo = "fliptext.el";
+ rev = "fd821f645ffebae6ae3894afa7ba7fc06f91afc6";
+ sha256 = "1jf63kp1myxihv6r13cddxgr8cchxcnnmylj5dx50y42595ia4yh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e36776cbed8eab151f69d0edd5217a7bba7c2451/recipes/fliptext";
+ sha256 = "1wbrvqrvrpk2lx7b6y30rrshr7a25b2191bnx4v8lm3cv16gv8p7";
+ name = "fliptext";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/fliptext";
+ license = lib.licenses.free;
+ };
+ }) {};
floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "floobits";
@@ -23063,12 +24252,12 @@
flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flow-minor-mode";
- version = "20170916.312";
+ version = "20180315.1124";
src = fetchFromGitHub {
owner = "an-sh";
repo = "flow-minor-mode";
- rev = "93184633933b5aa62e6e92b7fe1311261012e591";
- sha256 = "1laainsc5l4l4r5j17hblv7b1ppxrgfak73ama1qn7kb14y1jfrf";
+ rev = "6c782a3fe3f810484009d87813b88804beafafac";
+ sha256 = "1awf44fyjwzlxjavk31lha8iknm8nxr2r6z07sxhzyy23ff127mh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
@@ -23081,6 +24270,27 @@
license = lib.licenses.free;
};
}) {};
+ flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flower";
+ version = "20180316.1052";
+ src = fetchFromGitHub {
+ owner = "PositiveTechnologies";
+ repo = "flower";
+ rev = "98c53b03da698833058b9ad6b6eb8be46cfd00f6";
+ sha256 = "08wq66gvqy14mcpm8x14xz3hvw4h7rcd5ivynma91d4358qrmqap";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower";
+ sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd";
+ name = "flower";
+ };
+ packageRequires = [ clomacs emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/flower";
+ license = lib.licenses.free;
+ };
+ }) {};
fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }:
melpaBuild {
pname = "fluxus-mode";
@@ -23109,8 +24319,8 @@
src = fetchFromGitHub {
owner = "lewang";
repo = "flx";
- rev = "ae0981b253b17b52dec666e2f739f889e7952291";
- sha256 = "0csflhd69vz3wwq5j7872xx2l62hwiz1f5nggl5nz7h7v9anjx3r";
+ rev = "46040d0b096a0340d91235561f27a959a61d0fef";
+ sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx";
@@ -23126,12 +24336,12 @@
flx-ido = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
melpaBuild {
pname = "flx-ido";
- version = "20151030.1112";
+ version = "20180117.719";
src = fetchFromGitHub {
owner = "lewang";
repo = "flx";
- rev = "ae0981b253b17b52dec666e2f739f889e7952291";
- sha256 = "0csflhd69vz3wwq5j7872xx2l62hwiz1f5nggl5nz7h7v9anjx3r";
+ rev = "46040d0b096a0340d91235561f27a959a61d0fef";
+ sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx-ido";
@@ -23147,12 +24357,12 @@
flx-isearch = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
melpaBuild {
pname = "flx-isearch";
- version = "20160105.1217";
+ version = "20180102.2114";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "flx-isearch";
- rev = "54ae0a5a31e6a07b68823d486ff4ec9e4c558588";
- sha256 = "1cmjw1zrb1nq9nx0d634ajli1di8x48k6s88zi2s2q0mbi28lzz1";
+ rev = "f132fd6367e369885ab3a865fbfe20eee989bc0b";
+ sha256 = "1dcvfl4fyhgw0rhfhixzlzjfr99fisa83f7lmlwzz2zs96myhhkz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd1438cc0821b8ae1d01e2a3bc8f07ca8a79134/recipes/flx-isearch";
@@ -23168,12 +24378,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "20171109.216";
+ version = "20180315.25";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "d309432efb0a4646ab6ef55759c0e9d07d70a8f2";
- sha256 = "0y0ds64ij4idm27wm5k2c505m8l7azw8w6r2q8ipshpapnpmdhlj";
+ rev = "3cdef22f638a3d66b6d98ef5c51f28dcd1651e3a";
+ sha256 = "128bmgbjskgamwi6w25vjay19kd8bfq4k1rkac62jl0xa5c3kvs8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23315,12 +24525,12 @@
flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-clang-analyzer";
- version = "20170704.2333";
+ version = "20180225.2039";
src = fetchFromGitHub {
owner = "alexmurray";
repo = "flycheck-clang-analyzer";
- rev = "a33752224cb1da13b35d0d60b2017fe73d167781";
- sha256 = "1f6nb92fg1lgf4xz8x1i61njwnqrab94p88kliaa7g9r4hfhgv8j";
+ rev = "adc9e7663bafcc9b740c09b691898413627e74ab";
+ sha256 = "10c45myq9vgsssp5v3vnip4klj9dxk8dh42zap44f9lw99ascx2r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer";
@@ -23382,8 +24592,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "squiggly-clojure";
- rev = "2a0e96889b128808866a1e2e98694be1b251fd37";
- sha256 = "1yw9ky7720hx6z401623bw7h6rr2b837a7x8gfw6shq4k26kirzb";
+ rev = "0fe57ab9c0d6262a3c0dbc9c28a9ca98390a6016";
+ sha256 = "1495d09vr8dlf9q6127fa46ghhgyw5bmzx22wdzzrfvc70m041a1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure";
@@ -23399,12 +24609,12 @@
flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-color-mode-line";
- version = "20171020.2128";
+ version = "20171121.2307";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-color-mode-line";
- rev = "157b1edd79b44c26ef18862160e0ab50db27352e";
- sha256 = "0lrk2b6xa12zcv18z4j1lpl7b36sl7saz14warxc1fw3p7dr4hm4";
+ rev = "cc474804d4e8088a627485faaf4217a5781aec7d";
+ sha256 = "0lk8p0wb7g9lvxjv9rl59hd9f0m0ksw9rgspis8qshpz8pj5785f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line";
@@ -23459,6 +24669,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-crystal";
+ version = "20180306.1821";
+ src = fetchFromGitHub {
+ owner = "crystal-lang-tools";
+ repo = "emacs-crystal-mode";
+ rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de";
+ sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal";
+ sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn";
+ name = "flycheck-crystal";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-crystal";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-css-colorguard";
@@ -23630,12 +24861,12 @@
flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dmd-dub";
- version = "20170816.648";
+ version = "20180316.746";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "flycheck-dmd-dub";
- rev = "5a2e65fbae90e1dd69cfa78e4af0bda25c7db973";
- sha256 = "1zh6yb5snjrp09zh24fip97pqq7vk472g8nmjjqk0iq8m9i8sphs";
+ rev = "7e975ec648b048d6dc11ff3e41ec5b2cc201a958";
+ sha256 = "0k2pzfx6iia74cfjgf59dv5d0dsqi5424v41lmdigb7daqw0rbw7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
@@ -23669,15 +24900,36 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-dtrace = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-dtrace";
+ version = "20180126.1135";
+ src = fetchFromGitHub {
+ owner = "juergenhoetzel";
+ repo = "flycheck-dtrace";
+ rev = "0b03e2e50c5d706a4fd4bcdc0ac643425d64d51b";
+ sha256 = "00ld1aih6axdh7zz5bhlgxqzbh80vla08hklmf5lz7mq3v7aizz7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cdcdd10fbcd58a5c67e4d07632212e7dedf42dbe/recipes/flycheck-dtrace";
+ sha256 = "14sg7zkq9f5zbcfn8app8m9mdc8cnwcxh7h4glsz32yaqc1dj7h8";
+ name = "flycheck-dtrace";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-dtrace";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-elixir";
- version = "20160629.59";
+ version = "20171122.507";
src = fetchFromGitHub {
owner = "lbolla";
repo = "emacs-flycheck-elixir";
- rev = "05cbad6657dc02f527be061e1709a53abb46bd8f";
- sha256 = "0pnm1v1m535r27br6h00ijiljjybkipvrvlrj1p9mbhwvvvmmwp6";
+ rev = "1f19a739cdb93851c6b01b1e188e215d035cd4a1";
+ sha256 = "01820hm6231z3zaq97jmmvdrpnyp38cb0m6xms5ihq2r1fqx8z2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/da2ab73ab1426f71ea2b2bea2b418941856b3454/recipes/flycheck-elixir";
@@ -23735,12 +24987,12 @@
flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-flow";
- version = "20171018.327";
+ version = "20180216.1156";
src = fetchFromGitHub {
owner = "lbolla";
repo = "emacs-flycheck-flow";
- rev = "2e21ec3c4eacdc100b1a45e97884350f53b832d3";
- sha256 = "0ijazydkz9lwxbnsvanpv3202k35a4knipp08inlw3pm3k16p3mj";
+ rev = "8173accf0e389f7ba0936d399da84839a7f887af";
+ sha256 = "14g3mi8i4iy5f3fd3f7yx8ha18zi0kxqgn3sxkvdnk9rp1cdfnk1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
@@ -23795,15 +25047,36 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-gradle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-gradle";
+ version = "20180306.1809";
+ src = fetchFromGitHub {
+ owner = "jojojames";
+ repo = "flycheck-gradle";
+ rev = "3710464576f423ae4825fa18826c007adcc6aa5b";
+ sha256 = "0dislqlr4h5p85kkfhi8fnq86176xkgxdsvypr8l027svbb9aabi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/382d9afd2bbb0c137719c308a67d185b86d84331/recipes/flycheck-gradle";
+ sha256 = "0zd92lx0mqjqwzclvvhfwwahq80qspyv9k7qcxjc0bl3avjk6a47";
+ name = "flycheck-gradle";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-gradle";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-haskell";
- version = "20171107.1420";
+ version = "20180209.1357";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-haskell";
- rev = "ff21330a5a7db4e42d6ccf4410ef4a3231e5f19a";
- sha256 = "0vdm6bmvqvf5s7cvadkl0l88cza429xcy21icv55ii5iw1k4hywf";
+ rev = "cbc4a54c0bb9ab0b9559a1e2b7eb1c02c2f38f14";
+ sha256 = "1kxcc12vrxbcpc8wjf9srczlhqjqs8nxdi8z01zd7d5fxcafikwh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
@@ -23879,6 +25152,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-jest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-jest";
+ version = "20180307.1";
+ src = fetchFromGitHub {
+ owner = "jojojames";
+ repo = "flycheck-jest";
+ rev = "2f524e275338e46edb9c1c9ab543020f9031b030";
+ sha256 = "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/31e2ac9de5f28ee9d847097cdeb60afa99476a51/recipes/flycheck-jest";
+ sha256 = "19dg8v0xzni7x6zn472n4ach1c1jv4syzarfi8ba8r6n26vz9ss4";
+ name = "flycheck-jest";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-jest";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-joker";
@@ -23945,12 +25239,12 @@
flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-ledger";
- version = "20140605.1146";
+ version = "20180125.31";
src = fetchFromGitHub {
owner = "purcell";
repo = "flycheck-ledger";
- rev = "2944c56ad72945f78f88fa363e0239b40650d829";
- sha256 = "16zfa0npi6jmyvjalsiqk11zp41vc5bfpgz5ssh1xa8v9fk6rxaj";
+ rev = "044f28d126d1bce55c4b78ba6d5bc92e1f6cfd69";
+ sha256 = "1k14jwz79mjsm0cfig5lc0byfrhvm495wrkybdl36b56q4qhxf58";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger";
@@ -23963,6 +25257,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-lilypond = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-lilypond";
+ version = "20171203.532";
+ src = fetchFromGitHub {
+ owner = "hinrik";
+ repo = "flycheck-lilypond";
+ rev = "cc1b7677a932c42e5dab1661ad7b923d4aae744c";
+ sha256 = "1yfsg52z4nhbh33fbsig24c9s0mc4xm72ll36h6ibld9fvqsgv6k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/da99de90193c9ad362afdbbae28dfba52ef3676e/recipes/flycheck-lilypond";
+ sha256 = "0yx0jbilr8z58df13wcssp3p95skcvl8mnhhr6lijak44sd7klbf";
+ name = "flycheck-lilypond";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-lilypond";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-liquidhs";
@@ -24026,6 +25341,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-mmark";
+ version = "20180203.932";
+ src = fetchFromGitHub {
+ owner = "mmark-md";
+ repo = "flycheck-mmark";
+ rev = "7fdcc48ff6ffa5e7db126a76f4948ab08b9eb8d4";
+ sha256 = "0g6a8nm5mxgca7psyi127ky68mal0lj7n486fgrwsg3bxglbsk5m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2fd10423ab80e32245bb494005c8f87a8987fffb/recipes/flycheck-mmark";
+ sha256 = "0lnw7pz40hijcpi9b92vjxvvyh9v50ww2f2r8z9pyhl9mjy2245x";
+ name = "flycheck-mmark";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-mmark";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-mypy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-mypy";
@@ -24092,12 +25428,12 @@
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
- version = "20171014.651";
+ version = "20171231.453";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
- rev = "29a9eb320d62400564360986f7ad400b74070d8e";
- sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022";
+ rev = "07f17d1dbe878fdcabac791a8916ddf643571a68";
+ sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -24155,12 +25491,12 @@
flycheck-perl6 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-perl6";
- version = "20150414.1832";
+ version = "20171231.445";
src = fetchFromGitHub {
owner = "hinrik";
repo = "flycheck-perl6";
- rev = "6a9a929ffb58595bbe9fe3d7c2e78617c8e9bb5a";
- sha256 = "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3";
+ rev = "7a69ddbb54dc0748734ace95f598c69e9882aa94";
+ sha256 = "1bsbw5pjin7m556pnphq8plgfjvbp1pl738lf5qc85jcvinv998m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f/recipes/flycheck-perl6";
@@ -24278,6 +25614,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, posframe }:
+ melpaBuild {
+ pname = "flycheck-posframe";
+ version = "20180313.450";
+ src = fetchFromGitHub {
+ owner = "alexmurray";
+ repo = "flycheck-posframe";
+ rev = "93a8c590ac2275d754b4ca57f64e8335620ae789";
+ sha256 = "1n3nhv13wwkqw2wmajgkvmykj1s4g5jx9gjyv5k8qxc5pmf2b3f8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/124f2a7833e3386a0bf57c8111d782ae7a7ee02e/recipes/flycheck-posframe";
+ sha256 = "02ym2isn761w2nsfxiqjh0jk4md9wy3hk9na2aw7pyycm5cgmfwp";
+ name = "flycheck-posframe";
+ };
+ packageRequires = [ emacs flycheck posframe ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-posframe";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-purescript";
@@ -24302,12 +25659,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pycheckers";
- version = "20171110.48";
+ version = "20180316.1028";
src = fetchFromGitHub {
owner = "msherry";
repo = "flycheck-pycheckers";
- rev = "6f7c6d7db4d3209897c4b15511bfaed4562ac5e4";
- sha256 = "0mg2165zsrkn8w7anjyrfgkr66ynhm1fv43f5p8wg6g0afss9763";
+ rev = "88fcbed2ab07dc14724d728dfe5ac899ced67e04";
+ sha256 = "1nz0pbafrr41sz2c7f07p1kagqqwkk6p7vkgxjw9vp5ik85a1hhf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -24369,8 +25726,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "dadd74f015f89317ff77424be30a9accadeeb4a4";
- sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24386,12 +25743,12 @@
flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-rust";
- version = "20170404.842";
+ version = "20171021.151";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-rust";
- rev = "a89c0298f5e8fdcb0c33833ca1eca64632cec053";
- sha256 = "1h2n1y69fxj2naxlyl7056rhggbpmh13ny2rcf0jjr1qnrrq756n";
+ rev = "962f18603c45e3f9a84d059886c7d13178cbf31e";
+ sha256 = "0c3lnfj1z27q1pyhfzwxh26ska1wvcnmqmdzpc6zps72prjfdknd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust";
@@ -24428,12 +25785,12 @@
flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-status-emoji";
- version = "20170923.1439";
+ version = "20180210.1000";
src = fetchFromGitHub {
owner = "liblit";
repo = "flycheck-status-emoji";
- rev = "e85072a04f4277a48d90364b8e48fcb26a650d38";
- sha256 = "12k0nakwv7z90fprpzfrsnmha0w5zsvpq7qiv0md3k3h41b5mgfv";
+ rev = "ca3d3993cd30d8881dabebd1c540d819967c0212";
+ sha256 = "0nqw77q31k6y0lc5v7ly8vnnyl72k8y0jxj9dclqfiq9ch53y3c3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji";
@@ -24470,12 +25827,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
- version = "20170926.317";
+ version = "20171231.452";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
- rev = "756833425f51baa9eb0a2fa7493df6e68612c88d";
- sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi";
+ rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d";
+ sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -24488,6 +25845,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-swiftlint = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-swiftlint";
+ version = "20180312.1656";
+ src = fetchFromGitHub {
+ owner = "jojojames";
+ repo = "flycheck-swiftlint";
+ rev = "8496fd4499ef5c0e0cfeb65f4d76c6f9dd8991f3";
+ sha256 = "0d2s9brccv7lgw2vnglhhaq29mxb3pxiclhx4w28gb76x8r2rsf7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7e2a979726507e974a0a19dfc2ca6884157025be/recipes/flycheck-swiftlint";
+ sha256 = "1nwxv4l3ml9hlc8qf8a8x1bnnvdj80sb8nfbkcfiqwak315wihr4";
+ name = "flycheck-swiftlint";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-swiftlint";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
melpaBuild {
pname = "flycheck-tip";
@@ -24533,12 +25911,12 @@
flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-vale";
- version = "20170619.2322";
+ version = "20180308.2243";
src = fetchFromGitHub {
owner = "abingham";
repo = "flycheck-vale";
- rev = "97df981468120aaedeaa4cf8ecfd68b07046d998";
- sha256 = "1zic9mirz2xi25pcj3d6r9sclambyn9q5dp7v9jvvxqkml3vy88c";
+ rev = "7777e0d4cf961b6ee6ae4ef917636121d18b3ee8";
+ sha256 = "1k0bhyy2r9c79lld7mbhw8n4c1hlzwr5qp5wmcxzya0fnp3s6g9j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale";
@@ -24551,6 +25929,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-xcode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-xcode";
+ version = "20180121.2251";
+ src = fetchFromGitHub {
+ owner = "jojojames";
+ repo = "flycheck-xcode";
+ rev = "6147ab777e2c08e4f5ffdbd85d3013ca700fa835";
+ sha256 = "1jwd7xhg7gfjppimf1kxwxwsgzkqc8w86wgp7kqphp79ydd4jgp8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc66203fdd1721bf1a6f8dcec51694c57d2e690/recipes/flycheck-xcode";
+ sha256 = "0n86hn6rf0mrx1385pwxgkx28xrbnksarlzb07h9d63s0yb5shaa";
+ name = "flycheck-xcode";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-xcode";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-yamllint";
@@ -24575,12 +25974,12 @@
flycheck-yang = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yang-mode }:
melpaBuild {
pname = "flycheck-yang";
- version = "20170915.1308";
+ version = "20180312.1131";
src = fetchFromGitHub {
owner = "andaru";
repo = "flycheck-yang";
- rev = "c5f65fe3f710f73d56e04d077868719afc1ebfaf";
- sha256 = "00w91mif3wnxgj93qag51yyadnfcsyxik96vf91qlfvwh4wi6ii7";
+ rev = "47881fc42ef0163c47064b72b5d6dbef4f83d778";
+ sha256 = "0bkbl1pas44bl6s3xjdb5zjbd6bmfjk39md5ds1ix4wchnkjm3iy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e58b4f4294d11424918b399898c0044f5b76ab14/recipes/flycheck-yang";
@@ -24596,12 +25995,12 @@
flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
melpaBuild {
pname = "flycheck-ycmd";
- version = "20170614.1434";
+ version = "20180207.843";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "e8a6c2bb6cdc18645e2ebc6a8ede8f0c306f013d";
- sha256 = "0gijzvc6krz1228siysk4za3pwfgfmwh04b8zjc57qkccngibnf9";
+ rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2";
+ sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -25041,8 +26440,8 @@
src = fetchFromGitHub {
owner = "benprew";
repo = "flymake-puppet";
- rev = "9579e5c736cb890195464fabf51df113313de88d";
- sha256 = "1bk16l8rbvrwmcd0zd2yg8xmfn7b036716niy21wfizmar0pk7p7";
+ rev = "8a772395f4ccc59d883712ab53a92a17c1d9a429";
+ sha256 = "00w87qa7r8rigmpv58vpjwpn9x13sv7db5m6z4cqh76qkgkghgqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/302dbe34e7949da9c65e9c7bf2ab924db91b968f/recipes/flymake-puppet";
@@ -25268,12 +26667,12 @@
flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flyspell-correct";
- version = "20170213.700";
+ version = "20171205.940";
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
- sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
+ rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277";
+ sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
@@ -25293,8 +26692,8 @@
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
- sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
+ rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277";
+ sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm";
@@ -25314,8 +26713,8 @@
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
- sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
+ rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277";
+ sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy";
@@ -25335,8 +26734,8 @@
src = fetchFromGitHub {
owner = "d12frosted";
repo = "flyspell-correct";
- rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
- sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
+ rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277";
+ sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup";
@@ -25352,12 +26751,12 @@
flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flyspell-lazy";
- version = "20141222.652";
+ version = "20180224.1306";
src = fetchFromGitHub {
owner = "rolandwalker";
repo = "flyspell-lazy";
- rev = "31786fe04a4732d2f845e1c7e96fcb030182ef10";
- sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
+ rev = "3ebf68cc9eb10c972a2de8d7861cbabbbce69570";
+ sha256 = "1n67y90vm041mz172gjqypw3b5za5f18sic54h7wz4a9naynwyb6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/flyspell-lazy";
@@ -25440,8 +26839,8 @@
src = fetchFromGitHub {
owner = "troyp";
repo = "fn.el";
- rev = "2dc78b7ef9e24f9fe872d40c8fe6050f7ce819cf";
- sha256 = "0nvhis3myclgvazhiljv7fgis1x5hwr5rr8rhxx3290fgsgdp0bw";
+ rev = "f685fd0c08ec3b1d1b9974b37e62edd78a000cb8";
+ sha256 = "1k8pwlpcvlwr4pavg85ja8hdc7rrbafqs1mhhqr5gbq8cp822sja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn";
@@ -25457,12 +26856,12 @@
focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "focus";
- version = "20170612.743";
+ version = "20171203.2103";
src = fetchFromGitHub {
owner = "larstvei";
repo = "Focus";
- rev = "a84ade00a2b57e47430d5b2df5246069f197356f";
- sha256 = "0qz52gak45nbi6pgsdl3h2a01d89gbzm0glpv1jjy5dvabr98835";
+ rev = "045ee6175e9340f873db03445c74ff9eefa35a27";
+ sha256 = "1hrx8bj4gf0dqbfxgvis62zxnkiyms6v730s55vd8711zxdl0pw4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus";
@@ -25562,12 +26961,12 @@
fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fold-this";
- version = "20150601.342";
+ version = "20180224.40";
src = fetchFromGitHub {
owner = "magnars";
repo = "fold-this.el";
- rev = "90b41d7b588ab1c3295bf69f7dd87bf31b543a6a";
- sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
+ rev = "4fb509a4176e950d083a5321ad62742f2e9bcb7b";
+ sha256 = "1csazxx6wnnriklbrdqxmf7nc67gqb7c5zppr797bk4j4calskgf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this";
@@ -25688,12 +27087,12 @@
forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "forecast";
- version = "20170924.1440";
+ version = "20180106.920";
src = fetchFromGitHub {
owner = "cadadr";
repo = "elisp";
- rev = "02829f582d03c149d0aace9a0bdf2bd405b2e4a2";
- sha256 = "0rvwhvmv9b6ma6jf5gbmmy9ahrsli4qflc8z2n2whl743rbcfpk6";
+ rev = "3059378379a6fbd0363cd14fe6227c27739af4e1";
+ sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast";
@@ -25709,12 +27108,12 @@
foreign-regexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "foreign-regexp";
- version = "20160318.907";
+ version = "20180224.321";
src = fetchFromGitHub {
owner = "k-talo";
repo = "foreign-regexp.el";
- rev = "e368c4dbd3b7a95a14cbc3c25617b5f1bc5a7fb4";
- sha256 = "1459hy5kgp0dkzy1jab41aibixgmrk9lk6ysn1801spd8gwph371";
+ rev = "2ec5c44f27c2396ee487aa0ed77ae47d143fa5aa";
+ sha256 = "0zww0q8x99sfwzf05pk7blsi3v8xiw4xgmlwnv1qlf2qxjkz1xhb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d05514013948a520cf0dcaf1dc2ef2300dd55e98/recipes/foreign-regexp";
@@ -25877,12 +27276,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
- version = "20170728.507";
+ version = "20180316.914";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
- rev = "34402a27430f8297d157ac3fba3adb09bd3e0d7f";
- sha256 = "0ci46n4gy5dprz8998xf8dybi5182wv3h65wb2g4h2zhi1n5053i";
+ rev = "8269066a9035fcf50eb835de3745a62c1cb96660";
+ sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -25961,12 +27360,12 @@
frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "frames-only-mode";
- version = "20170802.455";
+ version = "20180114.1048";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "frames-only-mode";
- rev = "d2e6a825e2079adb58012e9677c494d317494724";
- sha256 = "1x8w2788yaqfi5ys541kp4wi3rcfa2lvbhnxgd8dwr9h0da332xa";
+ rev = "4dbc6871d8220cb95d287dd35475725a1b7662ab";
+ sha256 = "19y23jdfp9i950vl8ahywfh6gkf8cmy0nd3fk931xkx0x5kp64h9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
@@ -25979,6 +27378,27 @@
license = lib.licenses.free;
};
}) {};
+ frameshot = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "frameshot";
+ version = "20180228.408";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "frameshot";
+ rev = "65994602fdf3d8881f0cabffebbce6c0e493e3c8";
+ sha256 = "0crvvacpajlhdida54gvv4y11xx78qscr6nznx0bhdb12sj3n45q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot";
+ sha256 = "1z5f988m9s25miyxbhaxk6m4af9afvblb2p5mdidva04szjklr70";
+ name = "frameshot";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/frameshot";
+ license = lib.licenses.free;
+ };
+ }) {};
framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
melpaBuild {
pname = "framesize";
@@ -26137,12 +27557,12 @@
fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
melpaBuild {
pname = "fstar-mode";
- version = "20171105.1108";
+ version = "20180315.1927";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "742e427068b5a8568f257585db3fc89c2c6c620e";
- sha256 = "1id41sw15cvazrh7rfb3b840n2ff42qspfr7pm1sfb3v0g7cq6i6";
+ rev = "57d00abf5f4087fbb52f4072513672d6258f4656";
+ sha256 = "107pv959hqpd05w70i5klabkcy52kcfz2y6c9xb98m75c9i5bzbb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26166,12 +27586,12 @@
fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fuel";
- version = "20170805.2030";
+ version = "20180224.1411";
src = fetchFromGitHub {
owner = "factor";
repo = "factor";
- rev = "d2f3977768f5588b9467cc73c12d9a1de204d9e8";
- sha256 = "1cx1fyr372zhkf35mjvl46c3zim7whz8z2ax88dqavh67h92ai9h";
+ rev = "e50be2a1ca65e9d3b3c8116fd71f743ab59fcf65";
+ sha256 = "19g188kniikjw2pjszj4shsad9iwr0z00fq1ias1yiq529z2pmri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -26268,6 +27688,27 @@
license = lib.licenses.free;
};
}) {};
+ fuo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "fuo";
+ version = "20180314.948";
+ src = fetchFromGitHub {
+ owner = "cosven";
+ repo = "emacs-fuo";
+ rev = "5318bef9d935b53031e6312652554920def69af2";
+ sha256 = "02f4kl1y277pry13hz1jscdh2nrbn3xp7zm1dmqyn8yfhn1s1yx2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/25fb625becf7f582d2a8d53726d6f01d9ea89ecc/recipes/fuo";
+ sha256 = "02mvgz2cxrdn5kp5dw0c57rl5nfavqli5yqbxczmbsih164ljdxf";
+ name = "fuo";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/fuo";
+ license = lib.licenses.free;
+ };
+ }) {};
furl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "furl";
@@ -26296,8 +27737,8 @@
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "50fcb5d6885cf9b38a3d242cf5d4f869af74d2ef";
- sha256 = "02nhv4a02v0xgv8y4qxgh1q55mjplz8mj7c34292iz02mbxmzbyj";
+ rev = "1c8650d39a16ead77df9f5f741d21d148818ed82";
+ sha256 = "0wifcbs5m4q9vvb0ch7x4ki05mc1babi35vqpc4pp24axm5b3c3s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26355,12 +27796,12 @@
fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fwb-cmds";
- version = "20160523.535";
+ version = "20180206.1549";
src = fetchFromGitHub {
owner = "tarsius";
repo = "fwb-cmds";
- rev = "57973f99cf4a185b5cccbf941478fad25e8428c3";
- sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b";
+ rev = "7d4abf8aa13b2235e4e2f0bb9049ebd6b491f710";
+ sha256 = "10xjs8gm9l3riffxip1ffg8xhcf8srffh01yn6ifyln5f70b063d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds";
@@ -26418,12 +27859,12 @@
fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fzf";
- version = "20171026.554";
+ version = "20180102.1712";
src = fetchFromGitHub {
owner = "bling";
repo = "fzf.el";
- rev = "ef1dc851077913a327261a6b971fab5f5f657831";
- sha256 = "12zbvr7806xiyx2q944nfnqqfnm43v9ziaihkb9n10s2sp6ippb7";
+ rev = "b750cccae7c37a9ee4d40d928bb508cc3234bfbf";
+ sha256 = "0a1g7bv4qakzzrvvsh5m5ic3yhha57fj3d09gmr7rb5b3p2kl5cz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -26439,12 +27880,12 @@
gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gams-mode";
- version = "20170309.2204";
+ version = "20171117.1815";
src = fetchFromGitHub {
owner = "ShiroTakeda";
repo = "gams-mode";
- rev = "ce51aa1afec78bf96aedb4badf33463383b7593e";
- sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5";
+ rev = "900e1788695d91dde2a3d7fee97681a3380285de";
+ sha256 = "1lix0x2gj6lrcx6imr5w3scyix99526fwpx0vzs1dzxfzglscjja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode";
@@ -26518,6 +27959,27 @@
license = lib.licenses.free;
};
}) {};
+ gdscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gdscript-mode";
+ version = "20180117.2056";
+ src = fetchFromGitHub {
+ owner = "AdamBark";
+ repo = "gdscript-mode";
+ rev = "31af5283eaec207bc864022a28e2824132471eaf";
+ sha256 = "0f24zsklkhhvj6qdyid2j1qcyhjnncxjma93zhr0klvn5j1z3aar";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/52f99eafb2e80a7fa13a98add98b03a147f35e8b/recipes/gdscript-mode";
+ sha256 = "0v4ab5xxpq1kya2is5qq61fmfgxgvbigyz7wp907z3mc00kg2818";
+ name = "gdscript-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/gdscript-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geben";
@@ -26584,12 +28046,12 @@
geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geiser";
- version = "20171102.1825";
+ version = "20180313.1902";
src = fetchFromGitHub {
owner = "jaor";
repo = "geiser";
- rev = "da22a526c1f683a90bb60840d05a6bb5f3a74ffe";
- sha256 = "101v0hfsdzksc3pr6vds7ypwmrpxvslmwmskwm9i94sxs39j067c";
+ rev = "e357eae8fa8c7d6a59f22a1c97cb90a386762089";
+ sha256 = "1ayy3pg0af5bhskkr03dmv0vad6zmlk89sn8304s0mq5barmmfi6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -26605,12 +28067,12 @@
general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "general";
- version = "20171106.818";
+ version = "20180215.1455";
src = fetchFromGitHub {
owner = "noctuid";
repo = "general.el";
- rev = "4b75854316d3db0cd143dcf874a56f90a252f506";
- sha256 = "0g8fq1ny2c1gjshr8wckgdg0qp4lg1m6430cr5zxazhqf1m59qcp";
+ rev = "de82992bba6226f1be3aac9ed6568f1a3b23295b";
+ sha256 = "1693mrknq0mwzgwrh5z92nv7c80g6ynlymk5qfq8icpii4rlz5n2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -26710,12 +28172,12 @@
ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ggtags";
- version = "20170918.1838";
+ version = "20171203.1553";
src = fetchFromGitHub {
owner = "leoliu";
repo = "ggtags";
- rev = "6293c438a4a7aae08b8f5dd5fc0082d3da0aa530";
- sha256 = "0rb293wjnc36gjy1vvvqsy605nn0vli1b1w210vvcjbg7zgcsak1";
+ rev = "eec392d2d639030c5a51bce8431f2815ad8e7bc5";
+ sha256 = "0mlva84zbi93jrvvd3bgyndc68iib27zsjsd2f52df89198brjqs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -26728,22 +28190,22 @@
license = lib.licenses.free;
};
}) {};
- gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }:
+ gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache }:
melpaBuild {
pname = "gh";
- version = "20170512.2049";
+ version = "20180308.1338";
src = fetchFromGitHub {
owner = "sigma";
repo = "gh.el";
- rev = "76255942ccc84d5cf918a2b6411a8ac98a7c8585";
- sha256 = "09b09zqawll6lbrhl352x7g62s4spq97rd8x32shn9m01w6paz9r";
+ rev = "92418cd1b67ff6e8fb0a64478444975a4b8581a3";
+ sha256 = "1vl6wy904jw1mqdic54ssvvbs4xqxhmgacldnfkdkx586vwf0hqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh";
sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
name = "gh";
};
- packageRequires = [ dash emacs logito marshal pcache s ];
+ packageRequires = [ emacs logito marshal pcache ];
meta = {
homepage = "https://melpa.org/#/gh";
license = lib.licenses.free;
@@ -26773,12 +28235,12 @@
ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "ghc";
- version = "20170613.1212";
+ version = "20180121.418";
src = fetchFromGitHub {
owner = "DanielG";
repo = "ghc-mod";
- rev = "06515c44830788254602af90118de07ae2effb12";
- sha256 = "1ymjq9nsqzf8vhrzniwqzszwbdlq5y2nmr8pgbwhmh3bvfbpj7ff";
+ rev = "39b96c475090f91e4f717197c96e083fdb2ccaf7";
+ sha256 = "0f9qzk3czamqjb42xg2bmx70hafza8cn84zylx60bw8yx4i0q7nx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -26836,12 +28298,12 @@
gherkin-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gherkin-mode";
- version = "20140107.804";
+ version = "20171224.553";
src = fetchFromGitHub {
owner = "candera";
repo = "gherkin-mode";
- rev = "ff9e47350c5ba319feb6b87fe20695519681fa64";
- sha256 = "0dbdms3ddsfhscwy7jj0cfpn3jdxnzynrfz5jps2l91adx2g011y";
+ rev = "0313492e7da152f0aa73ddf96c0287ded8f51253";
+ sha256 = "15m9a2dcxgmbj0ni2qcxg3vpxvs50pyjvlacm3xd2xhm9wd484hr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82d80becedead8db441eed6f7856ca64d78815e2/recipes/gherkin-mode";
@@ -26896,22 +28358,22 @@
license = lib.licenses.free;
};
}) {};
- ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "ghub";
- version = "20170803.601";
+ version = "20180316.1351";
src = fetchFromGitHub {
owner = "magit";
repo = "ghub";
- rev = "7c52e9063ad10f76d45d816a92c65cf1f6c7b9af";
- sha256 = "1iynfqza146mnkvsgfjnfmja4m42m71s0nw015iks428nzrrkf1j";
+ rev = "18bab447b69507802f0261dc284376276ae8a5c8";
+ sha256 = "0ld9s2vrzzfmy6cjnylxh6zik4hwzspx3m8n2751m3avmjdazxfc";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
- sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub";
+ sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps";
name = "ghub";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs let-alist ];
meta = {
homepage = "https://melpa.org/#/ghub";
license = lib.licenses.free;
@@ -26920,12 +28382,12 @@
ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
melpaBuild {
pname = "ghub-plus";
- version = "20171019.944";
+ version = "20180203.1017";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "ghub-plus";
- rev = "e04050f81106029c342deb7adbfc67b2a888ec58";
- sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6";
+ rev = "80a8e9480839eddf1e4e48a23b03ae17d4dffe0d";
+ sha256 = "1wdkniszcd5zaqvhfw5j82icf7hh6jy0fg0sifmcmfssvb7xx97n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -26938,15 +28400,36 @@
license = lib.licenses.free;
};
}) {};
+ gif-screencast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gif-screencast";
+ version = "20180309.242";
+ src = fetchFromGitHub {
+ owner = "Ambrevar";
+ repo = "emacs-gif-screencast";
+ rev = "825e606950ec842304bf75cf85baef707b853b03";
+ sha256 = "0xdzfw19zll8v9kpvay2rm8piq92ksz574m2gb6b63nm3z7sia1j";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b149509fb245975b450d15470c7d915e3c7b474d/recipes/gif-screencast";
+ sha256 = "12kjr76b1180g3grfycghmgr3xf4vmhlhks8x3ri1gigdf0j8vaa";
+ name = "gif-screencast";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/gif-screencast";
+ license = lib.licenses.free;
+ };
+ }) {};
gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gift-mode";
- version = "20170809.130";
+ version = "20180204.1358";
src = fetchFromGitHub {
owner = "csrhodes";
repo = "gift-mode";
- rev = "573e4a8001e9585d347a99323a1649c2055ae5ff";
- sha256 = "0qhhgwhj5nghlq5nrz7ycy2y5s1q10xzsahlh41fm5givm0rb650";
+ rev = "b8dcb86c7f83df0fbdc0da4f80c187423c936e50";
+ sha256 = "01x87aam43xmhx7np9rvrdhln3pwn4zfn4d8s38rdpi77n9prw5k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode";
@@ -26983,12 +28466,12 @@
gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
melpaBuild {
pname = "gist";
- version = "20170604.1834";
+ version = "20171127.2006";
src = fetchFromGitHub {
owner = "defunkt";
repo = "gist.el";
- rev = "a03f142455e8b39f77fbd57ee1c1e44478c1f9e2";
- sha256 = "1xisjaxr54zrxzxj8cp8f90kzphd5v3j56d14534fm5r1f5343vp";
+ rev = "b2712a61d04af98a05cc2556d85479803b6626be";
+ sha256 = "0zpdh7j0nm9qgzgp55kim04r9hi8cyi3f6kflxrs8srzxwb4gs6k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist";
@@ -27043,6 +28526,27 @@
license = lib.licenses.free;
};
}) {};
+ git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "git-attr";
+ version = "20180204.15";
+ src = fetchFromGitHub {
+ owner = "arnested";
+ repo = "emacs-git-attr";
+ rev = "c03078637a00ea301cbcc7ae301ae928b10af889";
+ sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr";
+ sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi";
+ name = "git-attr";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/git-attr";
+ license = lib.licenses.free;
+ };
+ }) {};
git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-auto-commit-mode";
@@ -27109,12 +28613,12 @@
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "git-commit";
- version = "20171007.346";
+ version = "20180202.321";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "1c69e9e9107ac9c881c763f69d11a3686d201a74";
- sha256 = "1qi32vplmjwnqpcrxgvf1qgzrkbgqi3wgngixwl67dm8xv7di799";
+ rev = "242ea1d84b3ae2489caa68acd3070e24d08aa00a";
+ sha256 = "1vx3c0r4ci1f967whzjk6hdn11yh7k778s22fa8n522a1mj3gh7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27253,6 +28757,27 @@
license = lib.licenses.free;
};
}) {};
+ git-io = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "git-io";
+ version = "20180223.112";
+ src = fetchFromGitHub {
+ owner = "tejasbubane";
+ repo = "emacs-git-io";
+ rev = "e141629f3133c38fdb0dcee58b205f9457d0f802";
+ sha256 = "0vvnifx9cprdr4dbi2jm6j18h2wj7d1dysbaz5lc62c3kwxz3dfp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a713197f227e3c43de3609dd505cf7cd226d94b9/recipes/git-io";
+ sha256 = "1acwc9iqchvlvx98fxh4xf3xphv0xzrnxpv8kkl8qaly41izfj0v";
+ name = "git-io";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/git-io";
+ license = lib.licenses.free;
+ };
+ }) {};
git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-lens";
@@ -27316,6 +28841,27 @@
license = lib.licenses.free;
};
}) {};
+ git-msg-prefix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "git-msg-prefix";
+ version = "20180118.646";
+ src = fetchFromGitHub {
+ owner = "kidd";
+ repo = "git-msg-prefix.el";
+ rev = "848f2c7475f5e4937b09f55e85ea89a3be5f8588";
+ sha256 = "0ab6qjq5nky15vj88j5s8sh7gp9lbwgxrfqsc08bg6gdf2rx2dvx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bd37811d17beaa54e08eb4968791da960d37b391/recipes/git-msg-prefix";
+ sha256 = "0vicaj91yhbzda76wrwmbfby2ikaja52bcm923jx8brjh1wd99wr";
+ name = "git-msg-prefix";
+ };
+ packageRequires = [ dash emacs s ];
+ meta = {
+ homepage = "https://melpa.org/#/git-msg-prefix";
+ license = lib.licenses.free;
+ };
+ }) {};
git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-ps1-mode";
@@ -27340,12 +28886,12 @@
git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-timemachine";
- version = "20170325.220";
+ version = "20180307.414";
src = fetchFromGitHub {
owner = "pidu";
repo = "git-timemachine";
- rev = "7cb0d03bc370d3e734c8ee23b809a4e768b01743";
- sha256 = "11yjw08dp8m25psl27qfgk8c9m9v51rbiyq3lp0mp9mhr17wdp9d";
+ rev = "dbcb92ffaa5f8350d47f4fbd74512f4000b8c043";
+ sha256 = "1ml06jfjyrcqmbpr5hqvbpi3yy6l2aa836jq8qjla1h74g9qka7z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
@@ -27386,8 +28932,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "git-modes";
- rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401";
- sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc";
+ rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe";
+ sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode";
@@ -27428,8 +28974,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "git-modes";
- rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401";
- sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc";
+ rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe";
+ sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode";
@@ -27638,8 +29184,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "git-modes";
- rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401";
- sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc";
+ rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe";
+ sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode";
@@ -27655,12 +29201,12 @@
gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
melpaBuild {
pname = "gitlab";
- version = "20170710.724";
+ version = "20180312.947";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "emacs-gitlab";
- rev = "67567a354a1888419331b79862f151817d9747c5";
- sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
+ rev = "68318aca3206d50701039c9aae39734ca29a49f9";
+ sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab";
@@ -27673,6 +29219,48 @@
license = lib.licenses.free;
};
}) {};
+ gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }:
+ melpaBuild {
+ pname = "gitlab-ci-mode";
+ version = "20180314.1704";
+ src = fetchFromGitLab {
+ owner = "joewreschnig";
+ repo = "gitlab-ci-mode";
+ rev = "cbad305987ff26fd604a8632fc7ee2f1a733417c";
+ sha256 = "0kcffrmww03lbarw2q4fw0sghncfiqw067wv7j1k00fyy7fwlrad";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode";
+ sha256 = "1jg6ihrgccrcwg30ysyqw9k7rmvfmsrp70skr2057hfamvccwn4f";
+ name = "gitlab-ci-mode";
+ };
+ packageRequires = [ emacs yaml-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/gitlab-ci-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
+ gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gitlab-ci-mode-flycheck";
+ version = "20180313.1157";
+ src = fetchFromGitLab {
+ owner = "joewreschnig";
+ repo = "gitlab-ci-mode-flycheck";
+ rev = "11293547385b8252ce1776bfc6455630fbc669d4";
+ sha256 = "1xfhdnny7gyxqpccss0qsmialrjw3dm8x80s7a7ahfyrx5f77yxm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck";
+ sha256 = "19ixd60yynsvmaj7mkppp6k73793x794vrnhx3hh6n7dap1rsjdh";
+ name = "gitlab-ci-mode-flycheck";
+ };
+ packageRequires = [ emacs flycheck gitlab-ci-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/gitlab-ci-mode-flycheck";
+ license = lib.licenses.free;
+ };
+ }) {};
gitolite-clone = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
melpaBuild {
pname = "gitolite-clone";
@@ -27718,12 +29306,12 @@
gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "gitter";
- version = "20161203.9";
+ version = "20180122.56";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "gitter.el";
- rev = "3ff1c72ee85be4e3b648b4c52b0638129f3cf7a6";
- sha256 = "19vd81pdjjbmiq3md1052x1lf43c8q9pfpq2b8lrdpz6qaphk6f6";
+ rev = "11cb9b4b45f67bdc24f055a9bfac21d2bd19ea1a";
+ sha256 = "14ri86kxqz9qfhcr0bkgfyggy4bgg9imk9akhw6dfzqkl90gn2gy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter";
@@ -27757,22 +29345,22 @@
license = lib.licenses.free;
};
}) {};
- glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
melpaBuild {
pname = "glab";
- version = "20170924.359";
- src = fetchFromGitLab {
- owner = "tarsius";
- repo = "glab";
- rev = "9848182275e0448390ccdd8dcd8e1e3a1853950c";
- sha256 = "1fw1ck85y9r6z331g1wj7rix29fwy6gwbm7vqj3wff0lszy208ba";
+ version = "20180218.652";
+ src = fetchFromGitHub {
+ owner = "magit";
+ repo = "ghub";
+ rev = "18bab447b69507802f0261dc284376276ae8a5c8";
+ sha256 = "0ld9s2vrzzfmy6cjnylxh6zik4hwzspx3m8n2751m3avmjdazxfc";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab";
- sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab";
+ sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8";
name = "glab";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs ghub ];
meta = {
homepage = "https://melpa.org/#/glab";
license = lib.licenses.free;
@@ -27928,12 +29516,12 @@
gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnu-apl-mode";
- version = "20170406.732";
+ version = "20180129.2300";
src = fetchFromGitHub {
owner = "lokedhs";
repo = "gnu-apl-mode";
- rev = "d79e519308727dec897f2574c938c6425b9a30c2";
- sha256 = "1dr9wcj697d68dxg1026ggxvyvpxjdvydilmym3fhczijdpwm33y";
+ rev = "fa569827c916ed46e410e9f28e4b4d28f8567654";
+ sha256 = "0x1i1xcd3d34c9c87isd39d9ra69ywd01ag0hgkkgdzrk44znshj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode";
@@ -28054,12 +29642,12 @@
gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnus-summary-ext";
- version = "20160704.1120";
+ version = "20180113.516";
src = fetchFromGitHub {
owner = "vapniks";
repo = "gnus-summary-ext";
- rev = "2298b0eca887a9df1e2d7c61d92176bb175ea482";
- sha256 = "1df85xwrr9wciwa83m2qfkfcbi1p623pdhqxm56005x4rmxg0rqr";
+ rev = "025fd853fe9280ae696a89ec2c2cac9befd010aa";
+ sha256 = "07ww2nc03daz70f2ajw7b2gin22xa306001zclhrxkm1cpjif2fi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext";
@@ -28142,8 +29730,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "e990796e68a2ebfc099afed20b99e26d6b64061a";
- sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3";
+ rev = "416643789f088aa5077f667cecde7f966131f6be";
+ sha256 = "1vggwjpcssxp075l8aippgr318m0nkfjyakq7j24ml48g4gc48rm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28261,6 +29849,27 @@
license = lib.licenses.free;
};
}) {};
+ go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-fill-struct";
+ version = "20171224.1931";
+ src = fetchFromGitHub {
+ owner = "s-kostyaev";
+ repo = "go-fill-struct";
+ rev = "a613d0b378473eef39e8fd5724abe790aea84321";
+ sha256 = "16bgfykvqc61hlx1hj55z15y83zgpavhb853sblds75m8w7mndqg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct";
+ sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7";
+ name = "go-fill-struct";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/go-fill-struct";
+ license = lib.licenses.free;
+ };
+ }) {};
go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "go-gen-test";
@@ -28345,6 +29954,27 @@
license = lib.licenses.free;
};
}) {};
+ go-imports = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-imports";
+ version = "20180107.1423";
+ src = fetchFromGitHub {
+ owner = "yasushi-saito";
+ repo = "go-imports";
+ rev = "5b3a1d520c599553f621efaf9aec71609d2b9bb6";
+ sha256 = "19v05qc9fmrbdcrjliw02hqrl29dqsg3l57qp2rn8z63n3s17rqq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4118ebf0db84cc047fab311c789bfbffd6eb2d92/recipes/go-imports";
+ sha256 = "0xxlh4rmyvfxiynsdqng6wd3js7h3azhb8ii0ch7n0hhqkcnda4x";
+ name = "go-imports";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/go-imports";
+ license = lib.licenses.free;
+ };
+ }) {};
go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go-mode";
@@ -28474,12 +30104,12 @@
go-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "go-snippets";
- version = "20170831.2302";
+ version = "20180112.2211";
src = fetchFromGitHub {
owner = "toumorokoshi";
repo = "go-snippets";
- rev = "7e38fc0ddf2cc786cdb273882ff9b3563abc3c7a";
- sha256 = "0dsbp0x8qmv2k649x7l264zc8cv08dlrxz09lv643fchm56rsljm";
+ rev = "d437df148879566ffe7f2e503a3cf2602aa9fb28";
+ sha256 = "0rs2yj9bh0snf13hfj9bvyawl16j8416naz6h52l21q72ymd4b0k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca9f3022e7f4d5391be394cd56f6db75c9cff3b6/recipes/go-snippets";
@@ -28513,6 +30143,27 @@
license = lib.licenses.free;
};
}) {};
+ go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-tag";
+ version = "20180226.2011";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "emacs-go-tag";
+ rev = "59b243f2fa079d9de9d56f6e2d94397e9560310a";
+ sha256 = "0r72qk79q8yyidpxgq4r0295fm73id946p1r4s65bwyzii76rjyi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag";
+ sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f";
+ name = "go-tag";
+ };
+ packageRequires = [ emacs go-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/go-tag";
+ license = lib.licenses.free;
+ };
+ }) {};
gobgen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gobgen";
@@ -28537,12 +30188,12 @@
god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "god-mode";
- version = "20151005.925";
+ version = "20180117.334";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "god-mode";
- rev = "6cf0807b6555eb6fcf8387a4e3b667071ef38964";
- sha256 = "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix";
+ rev = "344167ed9b4c212273dd056e7481cf1373b461d0";
+ sha256 = "0y7phh7amrdphv9dkf0304z2knyas745ir59ybngh1a55dfc2mf4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2dff8dc08583048f9b7b4cb6d8f05a18dd4e8b42/recipes/god-mode";
@@ -28639,15 +30290,36 @@
license = lib.licenses.free;
};
}) {};
+ goldendict = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "goldendict";
+ version = "20180121.120";
+ src = fetchFromGitHub {
+ owner = "stardiviner";
+ repo = "goldendict.el";
+ rev = "1aac19daaec811deb9afe45eea4929309c09ac8b";
+ sha256 = "1il432f6ayj2whl4s804n5wykgs51jhbx4xkcbfgqra58cbjrjhi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/af87026905478d9134a4a036e792f6afd9c10768/recipes/goldendict";
+ sha256 = "0zvrlz169pg9bj1bmks4lh5zn8cygqzwiyzg49na2a7wf2sk9m1f";
+ name = "goldendict";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/goldendict";
+ license = lib.licenses.free;
+ };
+ }) {};
golint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "golint";
- version = "20150414.1730";
+ version = "20180221.1215";
src = fetchFromGitHub {
owner = "golang";
repo = "lint";
- rev = "6aaf7c34af0f4c36a57e0c429bace4d706d8e931";
- sha256 = "1z1j2l0j5175xvin5v56nsq7byg5nfpfvl9xgjszparchkyr8ndz";
+ rev = "46530068cce6db92aaafde350b5059841861d5be";
+ sha256 = "17wwvcmyrmi654jkbg6787kc3k0i5w99byk3g69a1rw90gx87gbr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -28705,12 +30377,12 @@
google-c-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "google-c-style";
- version = "20140929.1118";
+ version = "20180130.936";
src = fetchFromGitHub {
owner = "google";
repo = "styleguide";
- rev = "664829b970331224a697b1e766fafee729d773ee";
- sha256 = "12qvhjak3bjm7c164capr9k5wwjfxlbv0hzrp1w85c4n2japjxik";
+ rev = "89be4df26da2a8c50853d2e82ed4b3cc29abc8e2";
+ sha256 = "0ih82n619x7k39y0mv6mcaniv3s418b4nq5ql04rv3r4xk5z71gl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -28915,12 +30587,12 @@
goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "goto-chg";
- version = "20170917.1200";
+ version = "20180105.1033";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "goto-chg";
- rev = "81fca94d2592cf32bab451c39a9cd2d9b03fbd6b";
- sha256 = "033msplvpahkva9ha09gsg9232fyz2bjihrdxaa2z9g4yzql8jkq";
+ rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4";
+ sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg";
@@ -28978,12 +30650,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
- version = "20171108.1429";
+ version = "20180129.905";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "46c79c93aa37681c9cdb8bcda3f56f707dde4fb7";
- sha256 = "1x3ipkl1v66351xpx87j16f08x079a8q8abzi22bf6fl77ypsalf";
+ rev = "af9d8fad593242a5ff7e6de55f5d3dd677fcf227";
+ sha256 = "129rzpffxsnnnsmb268j028vwd9m5pb042skp829883mxk8gx231";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29020,12 +30692,12 @@
grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grab-mac-link";
- version = "20170822.2321";
+ version = "20180116.251";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "grab-mac-link.el";
- rev = "fa23db288c93ff12d804939aa3c78e809169523e";
- sha256 = "1r2rcxcipyxdr16m8y93yc86vqxcmxamvkj60dg6ljsxg2lgvbx4";
+ rev = "19369badf8b0621eb03ea9e3adeecb22b9710c23";
+ sha256 = "0bp4x8s16zj2v7z0i5sxvqafka9v27riizjdrgfbvlvw9idlnsq0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link";
@@ -29041,12 +30713,12 @@
grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grab-x-link";
- version = "20161130.2147";
+ version = "20180205.346";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "grab-x-link";
- rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76";
- sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1";
+ rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c";
+ sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link";
@@ -29108,8 +30780,8 @@
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2";
- sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1";
+ rev = "7ac48be3bfd2653422de7ef696827e49f4fbf273";
+ sha256 = "0h733mn02fg4jqgaxx4f6drz1b8n2nq6ma0a4f6clw3cl8djlarn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29146,12 +30818,12 @@
grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grandshell-theme";
- version = "20170507.104";
+ version = "20180131.1439";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "grandshell-theme";
- rev = "2f7e607cde9dd38ad4a95f3f3ad6cd85eba09f7b";
- sha256 = "0mc29g3hz7fb2a91rr24z2fnlqdwnq1q3lh14qyd7i9zpy5965dl";
+ rev = "823232a83a51e8a3f7b4db09e23658fc1a1c93ca";
+ sha256 = "0a1svfbxw7g31rnf3lcjsy2x21s14c2gpbrzjpl06qa0p3cnn4db";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
@@ -29167,12 +30839,12 @@
graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
melpaBuild {
pname = "graphene";
- version = "20170810.640";
+ version = "20171125.854";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene";
- rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe";
- sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz";
+ rev = "9dbd50e532ca45076e03db0f96a57d21528fc460";
+ sha256 = "0sqxnjmfbr0plahdmp87j8xpl3qkyimf9vkqall4ccljx8irdl6s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -29218,22 +30890,22 @@
license = lib.licenses.free;
};
}) {};
- graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "graphql-mode";
- version = "20171102.1606";
+ version = "20180303.1558";
src = fetchFromGitHub {
owner = "davazp";
repo = "graphql-mode";
- rev = "1f3bd34b18a41dbda75a0baee38aa0f0f1fffb7a";
- sha256 = "16cqncjyai3kak9p108c85d8jp0n83jpfijkwjv8nx2s5wyw57dx";
+ rev = "36b1a4ed9fe78ccd1f386111644e69a5424a1a7b";
+ sha256 = "1azq0igx07aff9r7fbl0l4vbr44c4ylfq41g5rahbc70spd85bk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
sha256 = "074dc8fgbrikb5inv837n9bpmz1ami7aaxsqcci1f94x3iw8i74i";
name = "graphql-mode";
};
- packageRequires = [ emacs request ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/graphql-mode";
license = lib.licenses.free;
@@ -29325,12 +30997,12 @@
green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-is-the-new-black-theme";
- version = "20171005.1641";
+ version = "20180228.206";
src = fetchFromGitHub {
owner = "fredcamps";
repo = "green-is-the-new-black-emacs";
- rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122";
- sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka";
+ rev = "8eb51dff843f39552f009e34efbf831052557188";
+ sha256 = "1jrlbp93qjdb7mfsq1x0n45j7n3zq5q3dzyifp7767bd7ng3srlg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
@@ -29367,12 +31039,12 @@
green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-screen-theme";
- version = "20170824.728";
+ version = "20171130.234";
src = fetchFromGitHub {
owner = "rbanffy";
repo = "green-screen-emacs";
- rev = "05a9641d4f7354be7ff1b8dd34cbe5ef7054348c";
- sha256 = "036l9rbp7p9bf7wb85zr4ykyxiippiwlq53vk30lvkpwbv9vc5qz";
+ rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0";
+ sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
@@ -29385,6 +31057,27 @@
license = lib.licenses.free;
};
}) {};
+ gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gregorio-mode";
+ version = "20170705.751";
+ src = fetchFromGitHub {
+ owner = "jsrjenkins";
+ repo = "gregorio-mode";
+ rev = "736fd3d05fb67f707cca1a7ce24e3ee7ca5e9567";
+ sha256 = "1w13a3irak6i74kl7va8d2simd2kjvw5253s8jvapi1mg4ifw379";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/34cdc536cd0509c5a151c16f44f4db2c5b44365f/recipes/gregorio-mode";
+ sha256 = "1x3z4gc88h13miz72a597lz9hcn2lxps9jvldl2j62s6nvr88pff";
+ name = "gregorio-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/gregorio-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
grep-a-lot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grep-a-lot";
@@ -29406,6 +31099,27 @@
license = lib.licenses.free;
};
}) {};
+ grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "grep-context";
+ version = "20180311.807";
+ src = fetchFromGitHub {
+ owner = "mkcms";
+ repo = "grep-context";
+ rev = "9602b7b9582d5a5cc036edf0877533b23570ad2d";
+ sha256 = "1ybw0mvif1cfkw7vr9kvb9naz06rjmcnyh6l8lk20wfpmcc1rz2r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context";
+ sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g";
+ name = "grep-context";
+ };
+ packageRequires = [ cl-lib dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/grep-context";
+ license = lib.licenses.free;
+ };
+ }) {};
greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "greymatters-theme";
@@ -29488,22 +31202,22 @@
license = lib.licenses.free;
};
}) {};
- groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "groovy-mode";
- version = "20171024.221";
+ version = "20180305.352";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2";
- sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1";
+ rev = "7ac48be3bfd2653422de7ef696827e49f4fbf273";
+ sha256 = "0h733mn02fg4jqgaxx4f6drz1b8n2nq6ma0a4f6clw3cl8djlarn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
name = "groovy-mode";
};
- packageRequires = [ s ];
+ packageRequires = [ dash emacs s ];
meta = {
homepage = "https://melpa.org/#/groovy-mode";
license = lib.licenses.free;
@@ -29554,12 +31268,12 @@
gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
- version = "20171113.157";
+ version = "20180313.1451";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
- rev = "26d15c090be64aca07b14cc0cf69d78736973288";
- sha256 = "15pq889d3wvbz3fhf5cw3bida49qd3zl2riz3j0ia91pfb275zwm";
+ rev = "dd5e5ad109cf0b5db6c5d9ba279337a799e12b89";
+ sha256 = "17ga9qrjmvyjj7i77k6k0riy1jc3lvjvc3v631yvza4qi28492fv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -29617,12 +31331,12 @@
gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gtk-pomodoro-indicator";
- version = "20170517.900";
+ version = "20171230.840";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "gtk-pomodoro-indicator";
- rev = "0fa0e682b3bd1595f230275d73ca231e93c6d28a";
- sha256 = "1jm7kcray6qd867hacyhs5c7hhdm0fyfa1jx35sh09g5c9xa4x2f";
+ rev = "eb59b229de0dde307b20654075a9bbac69899a66";
+ sha256 = "0dmaazcscg9mdsmij26873af5jl2np4q9xf2klw1jmcl61wzggb0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator";
@@ -29701,12 +31415,12 @@
guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "guix";
- version = "20171106.1127";
+ version = "20180207.952";
src = fetchFromGitHub {
owner = "alezost";
repo = "guix.el";
- rev = "e9e9e0212005cb4c8d8772891df127312de56ccf";
- sha256 = "1m4lsmnjjd37y9g4a09snmjiq5nqnwf22ppxhx41jn63abga9jna";
+ rev = "1d400fd2f4b21e8fd834887198fe6587933a9cc7";
+ sha256 = "03q8rq74zxil5aws18wysiyk8zxyp9w0sqxcnk79d1p5hdgn09p2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -29869,12 +31583,12 @@
hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "hackernews";
- version = "20170930.1313";
+ version = "20180220.419";
src = fetchFromGitHub {
owner = "clarete";
repo = "hackernews.el";
- rev = "520e8dca91b8c2bc1de852f577af46ed1b7cabcd";
- sha256 = "0951vb08sjpxx28cpaa8njirjw6fml60m91wa146cnxpngd68w6b";
+ rev = "309c60c974eb5af4554e0675d4285baa77d89e54";
+ sha256 = "0gz5f17654bbjwydznpcy6aqzxbv2infbb4wd8zawf9dmb0wxc3q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
@@ -30267,12 +31981,12 @@
hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hasky-extensions";
- version = "20170830.625";
+ version = "20180107.2112";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-extensions";
- rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa";
- sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7";
+ rev = "6909022bccb7e5c26d1c4e5fa20cbc6b65c62d69";
+ sha256 = "0s5y84ih5hy6m5krmbgbr027xzhw0vybha0pdi0njjyggagirgxd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -30288,12 +32002,12 @@
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "hasky-stack";
- version = "20170928.359";
+ version = "20180311.24";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-stack";
- rev = "a3f890fb8570369898ee9718b128d4e7123a6585";
- sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c";
+ rev = "d162ec82f4da80f72de0d28c84a4e7ef93197a8b";
+ sha256 = "1b87i8c4i5801vsx0wwii0mk4l7z9cp5a58bj2pa3d8yy8qnwriy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -30476,12 +32190,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20171106.429";
+ version = "20180315.2354";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "42a03cc1f4da09b3a513c4175c913314856122e2";
- sha256 = "1nqj1syqv75y7hk2s8c650abxzq8cvp4dpnbmjjiwxranwsfz6zq";
+ rev = "4154fd45d8f990c063455ddf208b3b5ec93bd6be";
+ sha256 = "0wmvdiw4qp27zq92xd2p79v9xpjvriwcv2rhr5bc5grwamzqdwm3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30644,12 +32358,12 @@
helm-aws = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-aws";
- version = "20151124.133";
+ version = "20171227.132";
src = fetchFromGitHub {
owner = "istib";
repo = "helm-aws";
- rev = "512fb7edcdc6c65303b9641bfc737f836939e5e9";
- sha256 = "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af";
+ rev = "d69a0241601d170c034e3b69e8df0b1fec72bff7";
+ sha256 = "0975a0nwxlnpln7vrq4hqq4xamrhp1zc4bkwnzpw06dk95s23cb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/421182006b8af17dae8b5ad453cc11e2d990a053/recipes/helm-aws";
@@ -30665,12 +32379,12 @@
helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-backup";
- version = "20170807.1239";
+ version = "20171204.2357";
src = fetchFromGitHub {
owner = "antham";
repo = "helm-backup";
- rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb";
- sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w";
+ rev = "a2c0fa16113e628500d6822c6605280b94e24038";
+ sha256 = "0j4dkz9za2zng43dx8ph688gl5973isxr89v5bw160c65n4lbc6w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -30686,12 +32400,12 @@
helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-bbdb";
- version = "20170505.2338";
+ version = "20180314.1527";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-bbdb";
- rev = "c0e6b83911598fe334c51b12f51ff1a8252ed11d";
- sha256 = "084m23w4088njk2c8z6yxi2851dakdq71jhpazlzms85i2dlwg21";
+ rev = "f4a0e9bb882febf126ec95af65913c6c23f8e826";
+ sha256 = "06a2930mhnwzgl97salqccnfr4p6nx5rj94xf4dc844kriqhzy1w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb";
@@ -30707,12 +32421,12 @@
helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
melpaBuild {
pname = "helm-bibtex";
- version = "20171022.220";
+ version = "20180316.447";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "54de08577f9c19354cc303ee52836263aef486fb";
- sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0";
+ rev = "bff3b2e7551aa6d9b2f41cc412c40f7cf3cebfe3";
+ sha256 = "0dmnj7qcwaljjagb087dx6y6w4ciqjzwcfp4ssb0c2lsv63l4nbj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -30938,12 +32652,12 @@
helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "helm-cider";
- version = "20170708.1525";
+ version = "20180306.2058";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "helm-cider";
- rev = "9480e969d5387efdd5e66c6db089e02a296b2025";
- sha256 = "0ci0z1zaypbdnjxk6bhf83kx808j4xi5ikqwq4w5mlsbz8f5iqx1";
+ rev = "9363cc537f06233345aa3af5cd46aa5681ad607b";
+ sha256 = "0vfn4smqba1vsshz48ggkj8gs94la0sxb1sq4shrb41qj2x3dci7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
@@ -31043,12 +32757,12 @@
helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-codesearch";
- version = "20161214.548";
+ version = "20180203.2033";
src = fetchFromGitHub {
owner = "youngker";
repo = "helm-codesearch.el";
- rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116";
- sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6";
+ rev = "87a68168b7c1490769305db0df60035e47799a75";
+ sha256 = "0wiyz0kh2m2mpjhnl2mvsx2gvhkmmk0xaw432mxr48zz9jjnlha9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch";
@@ -31085,12 +32799,12 @@
helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-company";
- version = "20170608.1029";
+ version = "20180213.1405";
src = fetchFromGitHub {
owner = "Sodel-the-Vociferous";
repo = "helm-company";
- rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048";
- sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90";
+ rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d";
+ sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
@@ -31106,12 +32820,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20171103.2225";
+ version = "20180314.947";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "42a03cc1f4da09b3a513c4175c913314856122e2";
- sha256 = "1nqj1syqv75y7hk2s8c650abxzq8cvp4dpnbmjjiwxranwsfz6zq";
+ rev = "4154fd45d8f990c063455ddf208b3b5ec93bd6be";
+ sha256 = "0wmvdiw4qp27zq92xd2p79v9xpjvriwcv2rhr5bc5grwamzqdwm3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31169,12 +32883,12 @@
helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-ctest";
- version = "20171101.934";
+ version = "20180125.2058";
src = fetchFromGitHub {
owner = "danlamanna";
repo = "helm-ctest";
- rev = "6de962e355e12a69e4aeaf6484f497e28b2e8a68";
- sha256 = "0nd1ij7iqf02hni4d77mndbxi8w27vawjd9b3d7fia22vdsha040";
+ rev = "034927a922f40d9f5978786feed9bc9fe1f7655f";
+ sha256 = "0mbsxlc0isfzqlwvwqxyjkcdvpn9a6qsa29r7mqqihy0jkqi4473";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc85ff5554df10fc2066eec4d90de3b25536923/recipes/helm-ctest";
@@ -31190,12 +32904,12 @@
helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dash";
- version = "20171017.342";
+ version = "20171120.446";
src = fetchFromGitHub {
owner = "areina";
repo = "helm-dash";
- rev = "08961190b3982dcb8c359e633daba556a6d92ce3";
- sha256 = "1vdrfykhcfnmm254gd3aqypk9hfl0fcml1nc0wxmdjlimlsxadc3";
+ rev = "13dcc176556a7dd0970790e96dbbf9105dc395de";
+ sha256 = "1cxfmlf2ddx9rm5f70r1sh9vwmn5s1a6m5in41skspvpm0avc8vi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
@@ -31400,12 +33114,12 @@
helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-emms";
- version = "20170517.1010";
+ version = "20180124.1023";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-emms";
- rev = "b1c7d03e80c3012e327f0d518258508acf980c1c";
- sha256 = "18fpsr6kaw2m1bvj05i5qayq6d01v54jw98489bgwshp9wmhsy9m";
+ rev = "6e05efc4612262b39732d2d82d606c48fd6bf46b";
+ sha256 = "04iaxzx3r5f7jr42nycnvrrs3rx51nf9a20l2zpyz14i2g4pqjvn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms";
@@ -31442,12 +33156,12 @@
helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ext";
- version = "20171101.1231";
+ version = "20171218.1543";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "helm-ext";
- rev = "c8ac56918b200239b3f73a4e6a031deecc2c5646";
- sha256 = "08c6n4zr6s3h7y0kk6g51xqs6hs29hkfmn55jfjw6hpimbk3vi1j";
+ rev = "bdc0d86d43d965dda5ac94ec9c3fdcaa1e71aab1";
+ sha256 = "1qfawx9k74rhm9rxcdrx9gpxqrvpgpiv3dz8qgl06mdr0hxrcrrb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
@@ -31460,6 +33174,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-exwm = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-exwm";
+ version = "20180301.958";
+ src = fetchFromGitHub {
+ owner = "emacs-helm";
+ repo = "helm-exwm";
+ rev = "9eec927d7fa092762b467d400d996b66c1f6d9c2";
+ sha256 = "131xb40y8n3laivzbx4pjynbv0c5v09ihvq4r9c3m1d7qmq6x3kh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdf9e00cf19fabbeade12a66d66cd010561366/recipes/helm-exwm";
+ sha256 = "0g15c4bg794vqigafl9g2w85jbs1lbw9qplaf8ffx0az4qwhnvqz";
+ name = "helm-exwm";
+ };
+ packageRequires = [ emacs exwm helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-exwm";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-filesets";
@@ -31505,12 +33240,12 @@
helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-flx";
- version = "20170404.1230";
+ version = "20180102.2116";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "helm-flx";
- rev = "c8650d9b34afbc236c28aee12cbee998fda8d810";
- sha256 = "0400maq605qq631a766lzmphyaxwq0lfvb6x29j6aqd6pgxxrjs5";
+ rev = "6640fac5cb16bee73c95b8ed1248a4e5e113690e";
+ sha256 = "1fh1dy6xpc476hs87mn9fwxhxi97h7clfnnm7dxb7hg43xmgsjjs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx";
@@ -31820,12 +33555,12 @@
helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-gitlab";
- version = "20160519.303";
+ version = "20180312.947";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "emacs-gitlab";
- rev = "67567a354a1888419331b79862f151817d9747c5";
- sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
+ rev = "68318aca3206d50701039c9aae39734ca29a49f9";
+ sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab";
@@ -31859,22 +33594,22 @@
license = lib.licenses.free;
};
}) {};
- helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
+ helm-google = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-google";
- version = "20170722.710";
+ version = "20180212.240";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "helm-google";
- rev = "4530a375a46880d53e5d7e906028f71c040de946";
- sha256 = "1xj3q6hyjcqbr3dglcba4impsdgb707zi9w7prpn1m735xhsis01";
+ rev = "f9b5f0dfd51e16278eba70d8fc94a599563dab61";
+ sha256 = "1s2y4fyax4487bz7p16jhgwsjjnzqrjz7pq22p8h23jzcvgh6wzx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google";
sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32";
name = "helm-google";
};
- packageRequires = [ google helm ];
+ packageRequires = [ helm ];
meta = {
homepage = "https://melpa.org/#/helm-google";
license = lib.licenses.free;
@@ -32030,12 +33765,12 @@
helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-hunks";
- version = "20170625.1523";
+ version = "20171217.1133";
src = fetchFromGitHub {
owner = "torgeir";
repo = "helm-hunks.el";
- rev = "56731db3968a57fbb2473529227c2998b7f404b0";
- sha256 = "1kszp6jy4r39r71jjrr8p3nfpylbqyphrsfb4dghh6kl0zxic38j";
+ rev = "6392bf716f618eac23ce81140aceb0dfacb9c6d0";
+ sha256 = "1ih2pgyhshv8nl7hhchd4h0pbjgj45irp5dy1fq2gy05v4rn7wi4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks";
@@ -32237,22 +33972,22 @@
license = lib.licenses.free;
};
}) {};
- helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+ helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-lastpass";
- version = "20170914.142";
+ version = "20180114.937";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "helm-lastpass";
- rev = "ae5d1252d60450082a5c26af3ad2be43994201ec";
- sha256 = "0qlcy8g9m3mfnr6p7kax6i1bq0dsxpz22vy5zjp24farx96mj5mi";
+ rev = "65ac0a80b5908b43ecd6a89c17f22f5c9c6734b0";
+ sha256 = "18ncb6lnw06amwr1avh53gqifwg0wpwf2849z2k781dls3n5j4hr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass";
sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57";
name = "helm-lastpass";
};
- packageRequires = [ csv emacs helm-core ];
+ packageRequires = [ csv emacs helm ];
meta = {
homepage = "https://melpa.org/#/helm-lastpass";
license = lib.licenses.free;
@@ -32265,8 +34000,8 @@
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean-mode";
- rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
- sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
+ rev = "ae90bd280588c96d540892d0f42247db5a126f51";
+ sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean";
@@ -32279,6 +34014,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-lib-babel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-lib-babel";
+ version = "20180225.1322";
+ src = fetchFromGitHub {
+ owner = "dfeich";
+ repo = "helm-lib-babel";
+ rev = "69bce58c1ef109dd33cc7f7696ad02a536f1b215";
+ sha256 = "0x39ds3hziabizaa3hrqfbz2a9by4s25dndp8ymxbl8jjvqgdi3a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d6718da5d8849a8c3ec17188b89a1273cf963047/recipes/helm-lib-babel";
+ sha256 = "0ddj6xrhz4n0npplkjmblqb43jnd6fmr4i4vv1cigrgb7zj6bjx4";
+ name = "helm-lib-babel";
+ };
+ packageRequires = [ cl-lib emacs helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-lib-babel";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-lobsters";
@@ -32555,12 +34311,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "20170807.611";
+ version = "20180207.1539";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "502ea1285b8ce858a3acbc39dd4f54ff1af5b7e3";
- sha256 = "1j87fd9qv7pl7s52ksj7iy023lw76qy4mkgjc4w5rljvm5bdnrgp";
+ rev = "81a84a071c9ec9313b9b13e0c89b9e499268436a";
+ sha256 = "0ipz4r2cdvxsrzgsrcrxchj8vvgfqz7whd61smfn7h6sakljk2xm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -32594,27 +34350,6 @@
license = lib.licenses.free;
};
}) {};
- helm-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
- melpaBuild {
- pname = "helm-package";
- version = "20170216.2002";
- src = fetchFromGitHub {
- owner = "syohex";
- repo = "emacs-helm-package";
- rev = "0f3ac5623cc6220a65f3c9ec0f587225101e96d5";
- sha256 = "0z45gj2rb4n26khkk9lg445s69c1jwks0hcyqww63asch6ydizgj";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package";
- sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
- name = "helm-package";
- };
- packageRequires = [ emacs helm ];
- meta = {
- homepage = "https://melpa.org/#/helm-package";
- license = lib.licenses.free;
- };
- }) {};
helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-pages";
@@ -32639,12 +34374,12 @@
helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }:
melpaBuild {
pname = "helm-pass";
- version = "20170627.1124";
+ version = "20180311.959";
src = fetchFromGitHub {
owner = "jabranham";
repo = "helm-pass";
- rev = "bf5e1ea85ca531f07372eb8e7b9a8812ff3d3a5e";
- sha256 = "1l3dbgl65rcvw7cgqfxm3kvpfj65pj8jhkp9pg4yykli5y0wsbdx";
+ rev = "3171a90c33ea7baaf01da37ca048a538dcb58381";
+ sha256 = "01wcc5lxnym66qgnviwsdbnzdmp4c1hyw524ii2jphhm8vyvd1k1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass";
@@ -32765,12 +34500,12 @@
helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-projectile";
- version = "20170926.1123";
+ version = "20180228.1125";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "helm-projectile";
- rev = "4466adbcada8be19ec97b9dba52e12b8da3da849";
- sha256 = "1a4s3vs2vh2dz31an7jjrbyli1dsqwl7qcd1r63ak87klzpqn98b";
+ rev = "20eb422df057533c6b2728f2a0871eec4f837d53";
+ sha256 = "0iba3w6kir9ymisbv7bjsb0vmmai4m24kh34693lsh4x7m8mjyz9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -32870,12 +34605,12 @@
helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-qiita";
- version = "20170821.609";
+ version = "20180301.635";
src = fetchFromGitHub {
owner = "masutaka";
repo = "emacs-helm-qiita";
- rev = "f00a61fc802d0f6442f07e7bd1c55fedf60f3895";
- sha256 = "0z5xyb4kh3hwv8a869kgfx7hdzmja4ksvfkmc7v0xmxzjcg3nb7j";
+ rev = "3ccb85640bf54491ed3c3c8110d454ae181650dc";
+ sha256 = "03km0hm3jy6qcs8szqsmzpdmhfmyh121i5f68cf60am8y616f0kp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
@@ -32891,12 +34626,12 @@
helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-rage";
- version = "20170422.510";
+ version = "20180118.732";
src = fetchFromGitHub {
owner = "bomgar";
repo = "helm-rage";
- rev = "3cae7f309b45cc6e40507be68c0cc2e5595c1392";
- sha256 = "0j8yvxvd78lcfpss327xc6rahkqva66rrqjjx5cmdl82xncb53vz";
+ rev = "5d0aefb53d859186181d4bdcfeff7d315339c7b8";
+ sha256 = "0msj3rrv9bwhhwz7r1ayr6qvnxjsq7374j0xfhqbrx49pix4qf3q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage";
@@ -32993,6 +34728,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, pcre2el }:
+ melpaBuild {
+ pname = "helm-rg";
+ version = "20180220.731";
+ src = fetchFromGitHub {
+ owner = "cosmicexplorer";
+ repo = "helm-rg";
+ rev = "cbce7b4f1afefa1e9a505b45c1b58c688a42f3b9";
+ sha256 = "1z8ijiqih902mzfc7kbnfbdhjwfqh5yzg4w3v4mxac0ys5j4z6sg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg";
+ sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v";
+ name = "helm-rg";
+ };
+ packageRequires = [ cl-lib dash emacs helm pcre2el ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-rg";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-rhythmbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-rhythmbox";
@@ -33063,8 +34819,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "dadd74f015f89317ff77424be30a9accadeeb4a4";
- sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33161,6 +34917,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-selected = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, selected }:
+ melpaBuild {
+ pname = "helm-selected";
+ version = "20171222.1810";
+ src = fetchFromGitHub {
+ owner = "takaxp";
+ repo = "helm-selected";
+ rev = "d2609cdfce14052ab2d9c23761d4fe56966a8ed1";
+ sha256 = "0nbfs5s6lshxib6kp20dzh1qbmq079hwcqwi1n61ank22qa9qw5x";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/acc087661e614d9f30c23fe4a65c020bd3656a29/recipes/helm-selected";
+ sha256 = "0ksyh0r59y4abwls6v6v519yxmcjnaryfnxlam48fqqfrsxv1j0h";
+ name = "helm-selected";
+ };
+ packageRequires = [ emacs helm selected ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-selected";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-sheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-sheet";
@@ -33248,12 +35025,12 @@
helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }:
melpaBuild {
pname = "helm-spotify-plus";
- version = "20170320.609";
+ version = "20180107.338";
src = fetchFromGitHub {
owner = "wandersoncferreira";
repo = "helm-spotify-plus";
- rev = "847dfafbb5e5d65a44464b0ec8e2b7d88864a9aa";
- sha256 = "0i1vnaiqcs220nc1mjbx0959aa0nbjxhrqkvbrj3zy7ybsya22gq";
+ rev = "895f241f1259891d5c89cd42023f119f9fa121d6";
+ sha256 = "1sjw0bapik01f3lfnsirpayn7b0169lbjhppb2mqzr3xjxm58wbs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus";
@@ -33290,12 +35067,12 @@
helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-swoop";
- version = "20170923.2127";
+ version = "20180215.354";
src = fetchFromGitHub {
owner = "ShingoFukuyama";
repo = "helm-swoop";
- rev = "66a951700e0ef0621cc705791bdd6699488ab121";
- sha256 = "1j1qmbj4g5z891i1xyz8p34mk63ckpl1j80pznbhvb9ffl9aw976";
+ rev = "c66336b8245ddc51c4206f19c119f1081920985c";
+ sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop";
@@ -33308,15 +35085,36 @@
license = lib.licenses.free;
};
}) {};
+ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "helm-system-packages";
+ version = "20180309.833";
+ src = fetchFromGitHub {
+ owner = "emacs-helm";
+ repo = "helm-system-packages";
+ rev = "497d53a81fe989c341a24c3e4a288f8777b0c6e0";
+ sha256 = "1gil4y4n0glj5kksyh7r81ih9hlywx9rwp91a74g93zml0yf7rrp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
+ sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4";
+ name = "helm-system-packages";
+ };
+ packageRequires = [ emacs helm seq ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-system-packages";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "helm-systemd";
- version = "20160517.2333";
+ version = "20180130.2034";
src = fetchFromGitHub {
owner = "lompik";
repo = "helm-systemd";
- rev = "0892535baa405a2778be2f0f013bac768e72b1f9";
- sha256 = "1yqwq8a5pw3iaj69kqvlgn4hr18ssx39lnm4vycbmsg1bi2ygfzw";
+ rev = "96f5cd3ee3412539c2f8d145201f47c4f8e53b4f";
+ sha256 = "0wyabh76q2lighd7qxpkzp35fkblxlz8g7p4lpgfwvjid0ixmnvq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-systemd";
@@ -33353,12 +35151,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-tramp";
- version = "20170708.320";
+ version = "20180311.2157";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
- rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1";
- sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y";
+ rev = "34cc68bededd3ff6cbec8140f33c530fd3206a64";
+ sha256 = "1lway52ssh6zn6jw8157fp8d4brrkdln03vgll2r53bd69i2ipmn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -33479,12 +35277,12 @@
helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-xref";
- version = "20170822.1708";
+ version = "20171209.346";
src = fetchFromGitHub {
owner = "brotzeit";
repo = "helm-xref";
- rev = "af55df844aa65275c8f75d3a8705e13717fd3ee6";
- sha256 = "0srjmz3xm6ycx5grjl7iqrnx5qlmg7n42i9wrb3i01zrjrjbqi7x";
+ rev = "ad98c3f6e5404e44e7e87210b5827bef75e16a25";
+ sha256 = "1z1343lp9n0kn3y4z08bwnxlfvg5pchznnfqy2xhjjbm9ndlhc16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref";
@@ -33518,6 +35316,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-z = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-z";
+ version = "20171203.1925";
+ src = fetchFromGitHub {
+ owner = "yynozk";
+ repo = "helm-z";
+ rev = "37212220bebea8b9c238cb1bbacd8332b7f26c03";
+ sha256 = "1vz958yiva01yl1qj2pz84savcx8jgkvbywhcp4c3a8x3fikf0yl";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/48c9b83fff8fc428d9d1ecf0005d47f2adb8cb00/recipes/helm-z";
+ sha256 = "1m268zsr4z7a9l5wj0i8qpimv0kyl8glgm0yb3f08959538nlmd1";
+ name = "helm-z";
+ };
+ packageRequires = [ helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-z";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-zhihu-daily";
@@ -33539,22 +35358,22 @@
license = lib.licenses.free;
};
}) {};
- helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "helpful";
- version = "20171112.1321";
+ version = "20180316.1421";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "helpful";
- rev = "a703e0837756871ed333a9a40c00a625e5d61387";
- sha256 = "02672bd8ka3nrkcd0d7nfz90sin0qfavdz5yhghh5rijirg8jm0f";
+ rev = "b42bd5adcbf910bffec44022d1c99df7322d98f7";
+ sha256 = "1bmf2cw3jj5yq2ggzmh8dmsv2wq0arikn0hyfdbsxh8qzpkxc502";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
name = "helpful";
};
- packageRequires = [ dash elisp-refs emacs s ];
+ packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ];
meta = {
homepage = "https://melpa.org/#/helpful";
license = lib.licenses.free;
@@ -33647,12 +35466,12 @@
hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hexo";
- version = "20170702.1915";
+ version = "20180223.1944";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "hexo.el";
- rev = "201c795ded01d96690ceadc1dd068744aceaeda8";
- sha256 = "0rj5lcmlghxm4d1vx8jxdhw53famzjxzp1bx38zgrqlhwakyghab";
+ rev = "ff21ab2d95e13666f36a243989ffea2027842191";
+ sha256 = "1g7i4vlpac7npx8c7f7i9w3f30is7q7zsxp0sqwp7x7rsa5783nn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo";
@@ -33770,6 +35589,27 @@
license = lib.licenses.free;
};
}) {};
+ hide-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "hide-mode-line";
+ version = "20180302.1110";
+ src = fetchFromGitHub {
+ owner = "hlissner";
+ repo = "emacs-hide-mode-line";
+ rev = "86b9057391edad75467261c2e579603567e608f9";
+ sha256 = "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2af28365f9fbc6ae71043a67966490c5d18a6095/recipes/hide-mode-line";
+ sha256 = "0yl6aicpib5h1ckqi3gyilh2nwvp8gf1017n1w1755j01gw1p9hl";
+ name = "hide-mode-line";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/hide-mode-line";
+ license = lib.licenses.free;
+ };
+ }) {};
hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hideshow-org";
@@ -33794,12 +35634,12 @@
hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hierarchy";
- version = "20171017.1103";
+ version = "20171221.351";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "hierarchy";
- rev = "cd65d149b8910edfa5536eeda26988aabcfd511a";
- sha256 = "0746wn62vwgnn4hg8ag0hq80hv7lwv929pjk5cccqqz4s0kp0c80";
+ rev = "06f21d3fc16c44c1fa45dc9c91d10100b4db9355";
+ sha256 = "1sp59nc82qb40n8p08hr0j4ig7ypc2icvgz74057vs1q042asqqw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -33812,6 +35652,27 @@
license = lib.licenses.free;
};
}) {};
+ highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "highlight";
+ version = "20180131.1216";
+ src = fetchFromGitHub {
+ owner = "steckerhalter";
+ repo = "highlight.el";
+ rev = "bb8694b8e642a45f07ce8897de0785c5a776441c";
+ sha256 = "0s4fkxnd4x3j864mgaiv95iwdjmps4xj2mlaljljc8y04k9q5l9k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/89c619b90665385c8f5408935105c52b4d0290ab/recipes/highlight";
+ sha256 = "0hc515042gpwqj2wqa3lmbgmccb3im5d313nk5lma9sphqi2yx9q";
+ name = "highlight";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/highlight";
+ license = lib.licenses.free;
+ };
+ }) {};
highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-blocks";
@@ -33878,12 +35739,12 @@
highlight-escape-sequences = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-escape-sequences";
- version = "20161028.1617";
+ version = "20171117.437";
src = fetchFromGitHub {
owner = "dgutov";
repo = "highlight-escape-sequences";
- rev = "c3f28f2003638e88e5cf0b03835412af7814f3b0";
- sha256 = "052r7bxdflgvygpvc5p63kkv11l9f7vfn16b1094af7xnniv8i3i";
+ rev = "08d846a7aa748209d65fecead2b6a766c3e5cb41";
+ sha256 = "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd087f2c5a9524986b0f2c7fd7efd1f296363101/recipes/highlight-escape-sequences";
@@ -33941,12 +35802,12 @@
highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-indentation";
- version = "20170502.43";
+ version = "20171218.137";
src = fetchFromGitHub {
owner = "antonj";
repo = "Highlight-Indentation-for-Emacs";
- rev = "5c7717a2224372f7113d13640515df3650388a37";
- sha256 = "13d85qbq6q9pz3yrwpn6rjlrbrjs0fnskkbb5liczyxyk8rzj924";
+ rev = "35e2c1d4f8f368685893128f77f90454cb9c2708";
+ sha256 = "1rmqi8k8p0f3aawh2l119hsfnnd060bv9hhjx13pabid8xhhvs73";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation";
@@ -34213,12 +36074,12 @@
hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hindent";
- version = "20170609.126";
+ version = "20171215.848";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "889e1655c6eb170e0d30c3c1173f7fba87041736";
- sha256 = "012h82m1x2iva2mh3q0rr5s3y8hm1kmnybngnaakzphhshdph32p";
+ rev = "6f6db40cca1b759f78d7e4b971111e40833c3aa0";
+ sha256 = "05xlk8pq19vh61cvpbp6156pd5ynnp8zqnj09j0hp8k6kd3wq62z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -34297,12 +36158,12 @@
historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "historian";
- version = "20170722.1714";
+ version = "20180210.2119";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "historian.el";
- rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d";
- sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w";
+ rev = "ec3dfa8786473e52ffc5ca9be95dbc59a9a87ff7";
+ sha256 = "1bxigdg3pmgc0s4il1spdw0p8y98k4hwwd89m4i3y97l43asy6p1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
@@ -34507,12 +36368,12 @@
hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
melpaBuild {
pname = "hledger-mode";
- version = "20171101.1139";
+ version = "20171201.1156";
src = fetchFromGitHub {
owner = "narendraj9";
repo = "hledger-mode";
- rev = "70f4d9c44077eea13bdcb5688475e0c90578e085";
- sha256 = "0j4pk2qr93pxgg8smzhxmlpk9b0rv9w20n1dz5lw42641xx8frnf";
+ rev = "594ce27f898ba027cb7f326179ff7875072b03e0";
+ sha256 = "1jla31az52qygabd99m8ibq60f4almkbjlg1z63kz7zl98hfxnw7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -34737,11 +36598,11 @@
howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "howm";
- version = "20160928.439";
+ version = "20180225.205";
src = fetchgit {
url = "https://scm.osdn.net/gitroot/howm/howm.git";
- rev = "e0237b07f60011a1926b36848c73340ae46cdb3e";
- sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq";
+ rev = "b932fa603f074049637907d35594f73c3fba45d0";
+ sha256 = "189j3061g2s1286434x3zyh6xyjycfrd2sqxx655biicy1xxyk52";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm";
@@ -34757,12 +36618,12 @@
ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ht";
- version = "20171112.1405";
+ version = "20180129.1434";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ht.el";
- rev = "ce65ce5d535cc86698ad6012f60fb56d7d80d8db";
- sha256 = "07yd5fqh5y3bbr6capc3x562kl4ia39d55qvz521yxdnzmwsdpq7";
+ rev = "5a665d00dc8fda77bad2a43277d8809c23e46ab8";
+ sha256 = "0w0zi393ixgi154c6dq2i1kf3kraqyfw8alfxcn6fhhxy1g9p02y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht";
@@ -35072,12 +36933,12 @@
hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "hy-mode";
- version = "20171030.1023";
+ version = "20180308.2201";
src = fetchFromGitHub {
owner = "hylang";
repo = "hy-mode";
- rev = "afb1610b0f78e059ee1a034048a876ece70118f1";
- sha256 = "14b5dk7n9727dwyi9p80rcwm0f6i21y1x10rj05bal1s3lxq7frp";
+ rev = "ca874a29eace152027f982b9720e3962c57a06b1";
+ sha256 = "0s1z53v95dnygjp48gmny6a9wq4740rmsaa7p99hlvgqnksx0mzq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@@ -35097,8 +36958,8 @@
src = fetchFromGitHub {
owner = "iquiw";
repo = "hyai";
- rev = "e9a7e945fed12d8e664e898cf8b434b0376d5d80";
- sha256 = "1sbn4h74crawdy8yjdjklxh1q6js5y9ip5qxf6dfi85h82qizpa8";
+ rev = "286cece5ca187ebb9d5fba5ac86e452cc638b8d3";
+ sha256 = "1gycq2jp6540kiggv3fhmgqsyqvc36jwbyydx1i6w1brpcwvc6dx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai";
@@ -35156,12 +37017,12 @@
hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hydra";
- version = "20170924.2259";
+ version = "20180226.1116";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "hydra";
- rev = "df3025f7e3cf3899168ae8ced1e9b734df2b32a0";
- sha256 = "1sbj699956vxbzbdagw5hbx168sx9cfrc5vx6m6s89v2rkq8fw8k";
+ rev = "62e0f374623df15c1eabebe78f4100850d708227";
+ sha256 = "1ydipk4fkc7dlfjr7isadgap9mfnmi1lj6n7ckrnzia22vyi9i7r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -35214,6 +37075,27 @@
license = lib.licenses.free;
};
}) {};
+ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ialign";
+ version = "20180303.1356";
+ src = fetchFromGitHub {
+ owner = "mkcms";
+ repo = "interactive-align";
+ rev = "7ad88c8f7922adc616b8f060b65fa1add8952ea1";
+ sha256 = "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign";
+ sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j";
+ name = "ialign";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ialign";
+ license = lib.licenses.free;
+ };
+ }) {};
iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iasm-mode";
@@ -35259,12 +37141,12 @@
ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "ibuffer-projectile";
- version = "20171103.2004";
+ version = "20171222.2000";
src = fetchFromGitHub {
owner = "purcell";
repo = "ibuffer-projectile";
- rev = "6f03040a93d116b73f9fd3d6b52102b57bfaf597";
- sha256 = "0jmb4s4n8yxyavvvd4msr58708jlha7jd8hm5djl91fgf87r3ys3";
+ rev = "bfa02c76dabdc02557b67fa556969bc74e255023";
+ sha256 = "0isgy5nkcbcf56p4f7xaf0shi4ja99s23gbvan6fimf6ra7qw4i2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile";
@@ -35298,6 +37180,27 @@
license = lib.licenses.free;
};
}) {};
+ ibuffer-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ibuffer-sidebar";
+ version = "20180218.1731";
+ src = fetchFromGitHub {
+ owner = "jojojames";
+ repo = "ibuffer-sidebar";
+ rev = "7ddf1b5a158b33e9a7d3fe5dad7ea626a464d2bc";
+ sha256 = "18rl379bfilzvyi4f4kmy74l4vq2q8hhy5i8kflcgvn0ibipwqjz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/19c7c36af8e30b9a9ccc4afda2a7b7e39e8d32ff/recipes/ibuffer-sidebar";
+ sha256 = "0rzdybkqaf8r6v19isgw4wv0mwdqxvf55gq1ig4shscjc7ys22wp";
+ name = "ibuffer-sidebar";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ibuffer-sidebar";
+ license = lib.licenses.free;
+ };
+ }) {};
ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ibuffer-tramp";
@@ -35305,8 +37208,8 @@
src = fetchFromGitHub {
owner = "svend";
repo = "ibuffer-tramp";
- rev = "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4";
- sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq";
+ rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3";
+ sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp";
@@ -35511,12 +37414,12 @@
ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
melpaBuild {
pname = "ido-completing-read-plus";
- version = "20170820.3";
+ version = "20180222.1504";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
- rev = "e2ea358725f03ae623ae03ed90715efb92a61030";
- sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn";
+ rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec";
+ sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
@@ -35784,12 +37687,12 @@
ido-sort-mtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ido-sort-mtime";
- version = "20170705.712";
+ version = "20171121.59";
src = fetchFromGitHub {
owner = "pkkm";
repo = "ido-sort-mtime";
- rev = "5f4ec2c562f79b7fb2d1480c88db1fa8a812d814";
- sha256 = "1fqqkpz0x3q7fqmax90vxkpn14valkb0lprqs0w641cbq8a4wqm7";
+ rev = "f638ff0c922af862f5211779f2311a27fde428eb";
+ sha256 = "0isy3rmw69664fsypg58rs42ql43drf27l90yvplnbcqd7nnnb21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/36d2f7f1bb0d0694a25c1e83340781e08bee814b/recipes/ido-sort-mtime";
@@ -35826,12 +37729,12 @@
ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ido-ubiquitous";
- version = "20170923.842";
+ version = "20180216.949";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
- rev = "e2ea358725f03ae623ae03ed90715efb92a61030";
- sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn";
+ rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec";
+ sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
@@ -35910,12 +37813,12 @@
idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
melpaBuild {
pname = "idris-mode";
- version = "20170722.1339";
+ version = "20180210.400";
src = fetchFromGitHub {
owner = "idris-hackers";
repo = "idris-mode";
- rev = "5c01039112a8c52a0275560575f1f542f3966cf5";
- sha256 = "0r3fbp2c8qhmsnpd63r9fjz1vxjsa054x69d9716pbp1jk3qsjsv";
+ rev = "cc35d124332aba84dc3e4da94433127a12459351";
+ sha256 = "056yfgfqxzcfmlk2kj34r1dpjxi0xllcllkhrc9v8d9cib7hjqqf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -35952,12 +37855,12 @@
iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iedit";
- version = "20170916.1024";
+ version = "20180207.219";
src = fetchFromGitHub {
owner = "victorhge";
repo = "iedit";
- rev = "5b14cc9fcaef509c50f25cff872fba5d70b2c799";
- sha256 = "1vlfqh616id2kh35diwig6jswq5q5z22zwrpbdxkginag3sq8732";
+ rev = "412490db4387ad9d040bfb5854f25de4c40c2146";
+ sha256 = "1995j0yvvls5i7zfxw8zwfk05in8b0n82k05qdrap29v6nq2v4bx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
@@ -35994,12 +37897,12 @@
iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iflipb";
- version = "20171102.1336";
+ version = "20171113.1244";
src = fetchFromGitHub {
owner = "jrosdahl";
repo = "iflipb";
- rev = "3a1ec69ffe7802794fe46baeecbf11846cbdc3ed";
- sha256 = "1wamzkmndmghvsw8ffbqmllp4nd7yxamym7m62pz22blyh1sj97m";
+ rev = "a5ad1fbd1173cff5228dab265515c92c0778f86a";
+ sha256 = "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb";
@@ -36202,12 +38105,12 @@
imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imenu-list";
- version = "20170728.632";
+ version = "20171120.1255";
src = fetchFromGitHub {
owner = "bmag";
repo = "imenu-list";
- rev = "27170d27c9594989587c03c23f753a809f6a0e10";
- sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx";
+ rev = "0d3d445ce60a77a6c7bcbdbf1ae62cc20d2b5575";
+ sha256 = "0q7124qaa3kmag3p3a1wq4axj59dvcsd7ydsh6cl9np2p18illvx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
@@ -36306,16 +38209,16 @@
impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }:
melpaBuild {
pname = "impatient-mode";
- version = "20170505.1921";
+ version = "20180124.1828";
src = fetchFromGitHub {
- owner = "netguy204";
- repo = "imp.el";
- rev = "48e6c4842b1fc2657a3c6c23029f89e35fafc859";
- sha256 = "0srjgzcmdgvdi9fm127wlj7zsbq00wsmb3fkzzpy05nvmm2dgng5";
+ owner = "skeeto";
+ repo = "impatient-mode";
+ rev = "4099906914cee4991907fc501799fb80cafa3f7d";
+ sha256 = "1j9s5zpdi03qvvga59izxx3389k0g1vk2hiiivc8bph6zyr52fw0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode";
- sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode";
+ sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j";
name = "impatient-mode";
};
packageRequires = [ cl-lib htmlize simple-httpd ];
@@ -36411,12 +38314,12 @@
indent-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "indent-info";
- version = "20171105.153";
+ version = "20171216.1509";
src = fetchFromGitHub {
owner = "terlar";
repo = "indent-info.el";
- rev = "2340739dee51e6c45f04053881a2d8c4452fb5ba";
- sha256 = "0afhx8j7nrkjirq7xr3bcrjm5wcs24slkb6yzi6cw09080s5hlxc";
+ rev = "e63a918b16d6d1986dd9123670a762e49102ce2b";
+ sha256 = "0smh7x49cl8zhhjfvcgbcnr1a4n5rck7cpg797xwi3vr00b4bzv8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1274c0d871c51e358b3de577372dae8e3a04ead0/recipes/indent-info";
@@ -36432,12 +38335,12 @@
indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
melpaBuild {
pname = "indent-tools";
- version = "20171103.750";
+ version = "20180124.408";
src = fetchFromGitLab {
owner = "emacs-stuff";
repo = "indent-tools";
- rev = "6e8e9a8cf9efe4a8624e52f45cb5faa5fe8ec996";
- sha256 = "1hh4r4axnbmi12hk2d3pynvq3nldgbik8jf73v5ddmv06kqlsxya";
+ rev = "b650b2ca82ccd9ccb4f3142afa0da4737ddd364f";
+ sha256 = "01xkkrdfn3c8ivs2wc3ck2278m75gq73wv59fchb6gw1a9d6xj7d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
@@ -36474,12 +38377,12 @@
indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "indium";
- version = "20171106.916";
+ version = "20180307.1359";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Indium";
- rev = "c15f5a2b4a48fd53b446e0fa291bdb8323b80c27";
- sha256 = "07fzsjmbbq4nx2w23pbb0z88iqmclm156yd87nxsdivndmzvsgw2";
+ rev = "e9db390fa273b02d4e637ab94244358792caead9";
+ sha256 = "1cddcnmgdjdm9aqn5nr6g2p93rd4rb0xllyf7rimgf64xnqa96hm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -36516,12 +38419,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20171029.40";
+ version = "20180316.1140";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "b04f05d2c735795b68a10cc7e699b676a8acc811";
- sha256 = "16xsrny70f5lr6hr4sipyrnry813cvbhy25jxfx90kp2f9kkak53";
+ rev = "1295e58e9f7fb575149a7b9b2604547c7331b4d5";
+ sha256 = "1c0rjnhlrbl396a5gjm7pnpqmxrbymr63l2ff0v5l2wjwfjrjiny";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36534,6 +38437,27 @@
license = lib.licenses.free;
};
}) {};
+ inf-crystal = callPackage ({ crystal-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "inf-crystal";
+ version = "20180118.1811";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "inf-crystal.el";
+ rev = "02007b2a2a3bea44902d7c83c4acba1e39d278e3";
+ sha256 = "18627gvpgw2ay7zcbglw6gwpslgh69hbvynwcyqln4c17fk9h0kw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ff84c742eebb84577f362b2739f4bcf1434d58ac/recipes/inf-crystal";
+ sha256 = "09ssq7i5c2fxxbrsp3nn1f1ah1yv2nb19n5s1iqyykkk316k2q26";
+ name = "inf-crystal";
+ };
+ packageRequires = [ crystal-mode emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/inf-crystal";
+ license = lib.licenses.free;
+ };
+ }) {};
inf-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-mongo";
@@ -36558,12 +38482,12 @@
inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-ruby";
- version = "20170615.335";
+ version = "20180309.433";
src = fetchFromGitHub {
owner = "nonsequitur";
repo = "inf-ruby";
- rev = "674a2a837fccea88ada6634e981a656b41d16d8e";
- sha256 = "09am0gq1sx0wv7bvcs7pp118brjj19qr7mis7cxjvrxbryc1mxf4";
+ rev = "57710da5c8c146fef805deb7dc6a2cd8ccbc11d4";
+ sha256 = "0kwxa8mpn3drvn1rnfh4g1hvin8l2sa1gns01dshf1qqaa829jkb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -36639,6 +38563,27 @@
license = lib.licenses.free;
};
}) {};
+ info-colors = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "info-colors";
+ version = "20180205.350";
+ src = fetchFromGitHub {
+ owner = "ubolonton";
+ repo = "info-colors";
+ rev = "a8ebb7b8efa314c08ea8110d8b1876afb562bb45";
+ sha256 = "0wvyf2w5s184kwacs6lbpjryx6hziayvdrl3crxir8gmg2kcv07m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors";
+ sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x";
+ name = "info-colors";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/info-colors";
+ license = lib.licenses.free;
+ };
+ }) {};
inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inherit-local";
@@ -36768,12 +38713,12 @@
inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inkpot-theme";
- version = "20171106.640";
+ version = "20171217.144";
src = fetchFromGitHub {
owner = "ideasman42";
repo = "emacs-inkpot-theme";
- rev = "046d0bb361500e14c718b00930d31c73890929cb";
- sha256 = "02qlqh6fvk8cgf8mrl9m4bmaar45i5kpsjngkqqpl3kgxvycbsk8";
+ rev = "8d59548ff5171bf6be6acc58d111674579646124";
+ sha256 = "0r63rb99nm7fpw8yn3gkbfka12jqwzkdhv97hm89nvdrxdnbggfs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -36977,12 +38922,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20171023.1102";
+ version = "20180313.605";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "5697c86fde2b6131629e8d1c69f9b2363dadc7ae";
- sha256 = "1zwvmchk8rymxfciiip78zf69p3f8jpbr7fqqj43cxv0lq9w284s";
+ rev = "ebcf8a0935b57eb54351b78ed8c358cbef96f4bd";
+ sha256 = "11ycc0ig2asndma38jhrqsy0s22m8ws6s1mjxk7p7armxca0g0pi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37205,6 +39150,27 @@
license = lib.licenses.free;
};
}) {};
+ ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ipython-shell-send";
+ version = "20171212.318";
+ src = fetchFromGitHub {
+ owner = "jackkamm";
+ repo = "ipython-shell-send-el";
+ rev = "36523a387c15ee1652a5b0e291d4d4838da5e912";
+ sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send";
+ sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8";
+ name = "ipython-shell-send";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ipython-shell-send";
+ license = lib.licenses.free;
+ };
+ }) {};
iqa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iqa";
@@ -37271,12 +39237,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "20171110.1151";
+ version = "20180308.1256";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "1d865c71fefeab952a2f61184d7f77371706954a";
- sha256 = "0xkl9wm63dxwb1s3sd3skbzvsdhva6gfbfz27m7z1j5zdc94x64x";
+ rev = "847cf4e84f554fdcce49587747f0c18dae12b3ba";
+ sha256 = "004b9av02q9165rfr6b3c7qfbry72s9bdkfs3n40f4fp25dcwq0q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -37355,12 +39321,12 @@
isend-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "isend-mode";
- version = "20170208.110";
+ version = "20171118.745";
src = fetchFromGitHub {
owner = "ffevotte";
repo = "isend-mode.el";
- rev = "95ba9e71390858bf706b148276f37428dd2774d2";
- sha256 = "0njfglyspdl7jzybvi67wlqrdfbqhfv36fx48yz5v16018pd856h";
+ rev = "88d4576e70e5874115c305ab2767d181dfda5985";
+ sha256 = "0pnzy5000m34f20q97my8ahcsgr0fqyhmfzbmds5bc269vsnbr6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef6e4dab78a4c333647a85ed07a81da8083ec0c/recipes/isend-mode";
@@ -37397,12 +39363,12 @@
isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "isortify";
- version = "20170726.1254";
+ version = "20180312.2132";
src = fetchFromGitHub {
owner = "proofit404";
repo = "isortify";
- rev = "28699f29cfc0d9d78b636d0ecadcf9139173bc6f";
- sha256 = "0r7hbvsnn590wfydwibvpdihcah5jj6ylqhqq7w1a1nljzwk6d4h";
+ rev = "2e53c9ce3fa1ef80b08a8568cdae19a3669f3056";
+ sha256 = "1l2py65xr0m3w9lc6qp2jcc9477kjhkfnjdnkgfimz6aqlg1p9xg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify";
@@ -37481,12 +39447,12 @@
iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iter2";
- version = "20171111.1104";
+ version = "20171128.1211";
src = fetchFromGitHub {
owner = "doublep";
repo = "iter2";
- rev = "ac1b4f10203d8093ae9f897039be97fd5ec65969";
- sha256 = "098bsm5wc7nqk06awak2ar4nwd3xpqsdc9pb2n0px20ql6lxh4bh";
+ rev = "b0e8ecebe2d6807403a5eb1c75d68a4706259d4e";
+ sha256 = "038z7scy572n6cx0z59kiz59v7zqvn70wg2bwka5f3pglr67wzhp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
@@ -37565,12 +39531,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20171106.1142";
+ version = "20180315.1446";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "5009b8149a86949f9e6d7546479e998be2e14337";
- sha256 = "181bhxq2xscd9h1s0aix5lkp7gzg041q713157hrv200p2fnzb6d";
+ rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+ sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37586,12 +39552,12 @@
ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
melpaBuild {
pname = "ivy-bibtex";
- version = "20171022.220";
+ version = "20180316.447";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "54de08577f9c19354cc303ee52836263aef486fb";
- sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0";
+ rev = "bff3b2e7551aa6d9b2f41cc412c40f7cf3cebfe3";
+ sha256 = "0dmnj7qcwaljjagb087dx6y6w4ciqjzwcfp4ssb0c2lsv63l4nbj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -37628,12 +39594,12 @@
ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-erlang-complete";
- version = "20170709.2151";
+ version = "20180311.558";
src = fetchFromGitHub {
owner = "s-kostyaev";
repo = "ivy-erlang-complete";
- rev = "acd6322571cb0820868a6febdc5326782a29b729";
- sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33";
+ rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6";
+ sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -37646,15 +39612,36 @@
license = lib.licenses.free;
};
}) {};
+ ivy-feedwrangler = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ivy-feedwrangler";
+ version = "20171121.1306";
+ src = fetchFromGitHub {
+ owner = "asimpson";
+ repo = "ivy-feedwrangler";
+ rev = "ad4f94f8cc4557876ea0b0fb9b519f16ce23e96a";
+ sha256 = "1w312qh6ng4xrj3xmpm4pzfswj3kpwzjb3vbad0pig8cp0zrc39c";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1c112939545f6d157111eabcb573738b09ef7c/recipes/ivy-feedwrangler";
+ sha256 = "1mxm37biix8c0s32gfv4pidffvlgdz5i9325zk71fhgfzqwkf5vx";
+ name = "ivy-feedwrangler";
+ };
+ packageRequires = [ ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-feedwrangler";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }:
melpaBuild {
pname = "ivy-gitlab";
- version = "20160519.312";
+ version = "20180312.947";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "emacs-gitlab";
- rev = "67567a354a1888419331b79862f151817d9747c5";
- sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
+ rev = "68318aca3206d50701039c9aae39734ca29a49f9";
+ sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab";
@@ -37674,8 +39661,8 @@
src = fetchFromGitHub {
owner = "PythonNut";
repo = "historian.el";
- rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d";
- sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w";
+ rev = "ec3dfa8786473e52ffc5ca9be95dbc59a9a87ff7";
+ sha256 = "1bxigdg3pmgc0s4il1spdw0p8y98k4hwwd89m4i3y97l43asy6p1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
@@ -37691,12 +39678,12 @@
ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-hydra";
- version = "20170703.2350";
+ version = "20180208.912";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "5009b8149a86949f9e6d7546479e998be2e14337";
- sha256 = "181bhxq2xscd9h1s0aix5lkp7gzg041q713157hrv200p2fnzb6d";
+ rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+ sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37712,12 +39699,12 @@
ivy-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-lobsters";
- version = "20170903.445";
+ version = "20171202.1241";
src = fetchFromGitHub {
owner = "julienXX";
repo = "ivy-lobsters";
- rev = "49923d6b59fc8ede5d930317f63f00577fef60b9";
- sha256 = "1z593062phsxn7y408zj82w4xc8l5y4x6kj919hm8a0d3nf28kg7";
+ rev = "4364df4b3685fd1b50865ac9360fb948c0288dd1";
+ sha256 = "1cfcy2ks0kb04crwlfp02052zcwg384cgz7xjyafwqynm77d35l0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9774fbf133ce8db3ce996b1a40c586309a2fec6/recipes/ivy-lobsters";
@@ -37730,6 +39717,27 @@
license = lib.licenses.free;
};
}) {};
+ ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }:
+ melpaBuild {
+ pname = "ivy-mpdel";
+ version = "20180304.50";
+ src = fetchFromGitHub {
+ owner = "mpdel";
+ repo = "ivy-mpdel";
+ rev = "d63c7ae492a3ce3288dc9f04cbc203d6a6f7c502";
+ sha256 = "04bryyq67qi7zhkvvfymcjbz1w93xwmy8svp02293an9n67dirm2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel";
+ sha256 = "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r";
+ name = "ivy-mpdel";
+ };
+ packageRequires = [ emacs ivy libmpdel mpdel ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-mpdel";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-pages";
@@ -37772,6 +39780,48 @@
license = lib.licenses.free;
};
}) {};
+ ivy-phpunit = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, phpunit }:
+ melpaBuild {
+ pname = "ivy-phpunit";
+ version = "20180219.115";
+ src = fetchFromGitHub {
+ owner = "12pt";
+ repo = "ivy-phpunit";
+ rev = "ffedb0138d36564e8e36a28fd9bc71ea8944681f";
+ sha256 = "0kf1k3jqg2r20x985h6brg92sg7y47c5vkfjky8xp11gqyqw47bi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/93822c5588f81683e3d43f690785b80c207d331d/recipes/ivy-phpunit";
+ sha256 = "1spvcf41lvjdmiwp6058wrpp0hfg1cjld6b7zm28m2ys6mn35ycs";
+ name = "ivy-phpunit";
+ };
+ packageRequires = [ emacs ivy phpunit ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-phpunit";
+ license = lib.licenses.free;
+ };
+ }) {};
+ ivy-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, posframe }:
+ melpaBuild {
+ pname = "ivy-posframe";
+ version = "20180309.132";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "ivy-posframe";
+ rev = "b9b9a45455692d06b89d4fbf40bba6852b9a109a";
+ sha256 = "1sc8mwk5ans3l0p465wl3blvchfmkhyg06x95b0dnkjldzkk2v6a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe";
+ sha256 = "1sv4xvdvb1g8g5m4f1f159lxbxaz96drsmvhh0k43hp1dh3bhj3b";
+ name = "ivy-posframe";
+ };
+ packageRequires = [ emacs ivy posframe ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-posframe";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }:
melpaBuild {
pname = "ivy-purpose";
@@ -37796,12 +39846,12 @@
ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-rich";
- version = "20171106.2334";
+ version = "20180314.1909";
src = fetchFromGitHub {
owner = "yevgnen";
repo = "ivy-rich";
- rev = "565ea4128741f68727df9d54dee40c9a89b63885";
- sha256 = "1mqg406gs8blzsay5jmdvr894l5iy4z4q2rmv5f89fvanmnl9d0h";
+ rev = "69314197b6563b87d145eb13ea16efd5b20513a6";
+ sha256 = "1a09mf51nbjvz8i91vx09rricvnlpmnh1znwhrxi5iiwa1pd0dlh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -37821,8 +39871,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "dadd74f015f89317ff77424be30a9accadeeb4a4";
- sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -37838,12 +39888,12 @@
ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-todo";
- version = "20170315.334";
+ version = "20171208.809";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "ivy-todo";
- rev = "7c72deff0ffa15c7d9a3389bd4386aec2dec9372";
- sha256 = "1y6ilcwzz2rbsdy0fj6yjs75mxks6asha8cv5i129ylcapj9ygdy";
+ rev = "964e347cea1a6097854d7113f5b07f6c5ef81df0";
+ sha256 = "07208qdk1a77dgh9qmpn164x5mgkzvprsdvb7y35ax12r2q541b8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/97909da7899d4187e8eb6b3284f6225ebec7fa51/recipes/ivy-todo";
@@ -37877,6 +39927,27 @@
license = lib.licenses.free;
};
}) {};
+ ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ivy-xref";
+ version = "20180201.1919";
+ src = fetchFromGitHub {
+ owner = "alexmurray";
+ repo = "ivy-xref";
+ rev = "4d2c437b479733e4159a356c9909ed3e110403a1";
+ sha256 = "19gzsphcmkzyihcijb0609ykv98ak24p3z4k0ifil5r40iss1d1n";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref";
+ sha256 = "1p5a0x83b0bc7b654j1d207s7vifffgwmp26pya2mz0czd68ywy8";
+ name = "ivy-xref";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-xref";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
melpaBuild {
pname = "ivy-youtube";
@@ -37884,8 +39955,8 @@
src = fetchFromGitHub {
owner = "squiter";
repo = "ivy-youtube";
- rev = "23e1089d4c4fc32db20df14ba10078aabf117e87";
- sha256 = "0m70vxjj49kf8bzni2qchgzgx808z1fcfh02cflkhjcb77dkq8d6";
+ rev = "8168dc1f26521830dfd99466d35ab93159afd004";
+ sha256 = "1yds7ffqd9rd87vypvnpzl4i7678f6879hdj4whr9zn47hsbdfzn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
@@ -37943,12 +40014,12 @@
j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "j-mode";
- version = "20171103.845";
+ version = "20171224.1056";
src = fetchFromGitHub {
owner = "zellio";
repo = "j-mode";
- rev = "6f7f598eaa1a32ccf06b707631f2d539a2315fba";
- sha256 = "1qldmcawi94pxv62zb2qgr27kr8lwhsql6wi67g0f5dlihpzc8dq";
+ rev = "e8725ac8af95498faabb2ca3ab3bd809a8f148e6";
+ sha256 = "0icrwny3cif0iwgyf9i25sj9i5gy056cn9ic2wwwbzqjqb4xg6dd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode";
@@ -38319,12 +40390,12 @@
jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jbeans-theme";
- version = "20171108.1431";
+ version = "20180309.825";
src = fetchFromGitHub {
owner = "synic";
repo = "jbeans-emacs";
- rev = "9a5095d65de8355c88b102831b81a525d507612a";
- sha256 = "0fm7sl6i5i65y82qsg2s7bdarc6r28qbyffdl43c55bjzxs4xk19";
+ rev = "3caa95998d8492a2ca6c17971de499ca15609871";
+ sha256 = "0k8bd5j09753czl55dcwijs4j1vxir4zwcwlgsxli4b4f8sl2z8r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -38361,12 +40432,12 @@
jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }:
melpaBuild {
pname = "jdee";
- version = "20171007.835";
+ version = "20180218.919";
src = fetchFromGitHub {
owner = "jdee-emacs";
repo = "jdee";
- rev = "ebe5d2e36a6a367376ed6cde590d5f805830ec9e";
- sha256 = "0rq8vp3pmnyabqzzplc91dk2ka48k809is9v4q486xv7y43013jh";
+ rev = "07afc434bb502d85fc8b882f62fc4d237d23f34e";
+ sha256 = "0pnf80l5v0sn24p64pb36lrajs9b7p4y9m984hm52k2ah8kjg2n5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38529,12 +40600,12 @@
jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jetbrains";
- version = "20171107.847";
+ version = "20180228.2102";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "jetbrains.el";
- rev = "8d0851793d0658cc39bca455dc14c89f78ab8335";
- sha256 = "1k3zb3c5h8bqa7yxl3by4vxlzabh3wl5sz6ynpi01pmqf75qxa4s";
+ rev = "56f71a17d455581c10d48f6dbb31d9e2126227bf";
+ sha256 = "0v948k7xjm66px20ad331pskc7svpcrcffh3hbkjsksd4k0pggds";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
@@ -38697,12 +40768,12 @@
jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jq-mode";
- version = "20161128.748";
+ version = "20180213.755";
src = fetchFromGitHub {
owner = "ljos";
repo = "jq-mode";
- rev = "5c081859def7510dafc6b14449f5285916898f15";
- sha256 = "14421p9k6b02syb8irprz527dcqbh1r4i2m86pi94sv6ffzbs0gg";
+ rev = "d1fca4613ec90c2c0b8241f4603eba733dd1ac73";
+ sha256 = "0sgpl03dqm4lv081l3ff3xp38c39q5i2miyvpsqdjmgnixg3nm8c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode";
@@ -38760,12 +40831,12 @@
js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-auto-format-mode";
- version = "20171031.1819";
+ version = "20180123.830";
src = fetchFromGitHub {
owner = "ybiquitous";
repo = "js-auto-format-mode";
- rev = "5ba81cd7cdd09d41a8e9c9d53d370497bf64edbd";
- sha256 = "113ppyfvly6i03j8kmyd3i6218v0r2f449wk3zbx9vf2d6plzc8v";
+ rev = "6bd44162ac422304803f606278bb0c08ab940a5d";
+ sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@@ -38799,22 +40870,22 @@
license = lib.licenses.free;
};
}) {};
- js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
- version = "20170808.527";
+ version = "20171129.2056";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "js-comint";
- rev = "eb4744122724b24e492c2171fff438e3ee2045a8";
- sha256 = "1bbzbv1dasqxkljq06qngb4l22x7gpgncz7jmn0pqixnhqj5k66y";
+ rev = "83e932e4a83d1a69098ee87e0ab911d299368e60";
+ sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
name = "js-comint";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/js-comint";
license = lib.licenses.free;
@@ -38928,12 +40999,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20171107.333";
+ version = "20180305.1647";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "eba9797444b7549c1ed210f8fa59903917df151c";
- sha256 = "0jk2jxmh96sgpb01fpa2xp9z70a52cpi8arxcbvyrkfs7ccrx2cs";
+ rev = "4125b49a6982a3eb36674962160118250daf665e";
+ sha256 = "0783l752jxca5mb7y44fbx366zkrnninzy06yahidsmhzxpw5bhj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -38949,12 +41020,12 @@
js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
melpaBuild {
pname = "js2-refactor";
- version = "20171109.921";
+ version = "20180316.552";
src = fetchFromGitHub {
owner = "magnars";
repo = "js2-refactor.el";
- rev = "35db9111d49536f41e005560e8e90fd93836e8e4";
- sha256 = "059ib04l6ycar7bz515x3nkxbgvr781isba632fvz0a87vdcbqsm";
+ rev = "4bc2ff3b89c734ba7dfd9824d4ef5271ed09fb96";
+ sha256 = "103kvzkvwc6g3jdwz1hin61b070zhd8q32h7v1qzgbnn1zczlplf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -39054,12 +41125,12 @@
json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }:
melpaBuild {
pname = "json-navigator";
- version = "20170606.34";
+ version = "20171220.19";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "json-navigator";
- rev = "d005a253fa73ed2c6c0b3ebbc7dc41be9270c304";
- sha256 = "1dklr166p5gx5y3nzkh758wwr6jvw50c3si05m71247kirhs0f89";
+ rev = "7a1fec93500c46ccba4086d10115d8188607d0d0";
+ sha256 = "03gjvzlyf90sh2q735qfbbjyqx4z9c3yc8jjp2sjpmp5fjvdm9yf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator";
@@ -39096,12 +41167,12 @@
json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "json-rpc";
- version = "20170402.955";
+ version = "20180104.728";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elisp-json-rpc";
- rev = "e77a62012e4d6c946666eed3a17454d5c6f83367";
- sha256 = "1pwa1ifz0c83lwwpj75h10wj7jyghsxg6wpdlfy4dp8102wr8nhg";
+ rev = "0992ae71964055230aa5d4d934a1b93b5dfd7eb4";
+ sha256 = "0nfccwxss3dz1ig6i3dig703xpsy90m7i96bm3pysrw2jfp4by9s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82c6b97cdfe2970f028a00146b01e5734710291b/recipes/json-rpc";
@@ -39138,12 +41209,12 @@
jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jsonnet-mode";
- version = "20171005.24";
+ version = "20180310.2256";
src = fetchFromGitHub {
owner = "mgyucht";
repo = "jsonnet-mode";
- rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1";
- sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29";
+ rev = "4eb52cff8ce6020f5a6309a1c0465b5cdd6c698e";
+ sha256 = "0l9q6g00yxz5j1hchd2vim33n39zshv7qmmga1zf8qcn20yxz7mm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode";
@@ -39241,12 +41312,12 @@
julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "julia-mode";
- version = "20170916.628";
+ version = "20171116.642";
src = fetchFromGitHub {
owner = "JuliaLang";
repo = "julia-emacs";
- rev = "115d4dc8a07445301772da8376b232fa8c7168f4";
- sha256 = "1is4dcv6blslpzbjcg8l2jpxi8xj96q4cm0nxjxsyswpm8bw8ki0";
+ rev = "2ef6992125a85674532a1e37dacd5c60bee4feeb";
+ sha256 = "0vjsaws0rqrkv1mqxwf9lp8qmaq92piippybsf4ncizxwbnh8x6d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
@@ -39262,12 +41333,12 @@
julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "julia-repl";
- version = "20171101.424";
+ version = "20171116.46";
src = fetchFromGitHub {
owner = "tpapp";
repo = "julia-repl";
- rev = "ec1ea3296acea3721ac0f371c6b955135d75bb1d";
- sha256 = "0xvm7filzmjmg88if1yjsyifkkji4bkm073x79w05sph35c8d8a2";
+ rev = "f808a12e7ebe403f82036899c2dace640be73154";
+ sha256 = "1lh4pbxrnld205ga58036jwnxkmgabdd8hyr6g7fahw94llq2cpa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl";
@@ -39617,12 +41688,12 @@
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-themes";
- version = "20171113.209";
+ version = "20180314.1046";
src = fetchFromGitHub {
owner = "ogdenwebb";
repo = "emacs-kaolin-themes";
- rev = "08e13adfab07c9cf7b0df313c77eac8fb393b284";
- sha256 = "0wijf5493wmp219ypbvhp0c4q76igrxijzdalbgkyp2gf8xvq6b4";
+ rev = "1576b4daca7c7504f7c91e63670d8026e9a3c927";
+ sha256 = "1ycwpj3ciwahjinwq7mnb8fhph954bv11yfxjdhhfv3yhbyd2rng";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -39638,12 +41709,12 @@
kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "kaomoji";
- version = "20170311.2151";
+ version = "20171226.2040";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "kaomoji.el";
- rev = "91ab93cc7455486182d5e7f88e03d0de44c9953e";
- sha256 = "19l3r2fbp895c46cklrjfwwa5d7i959nd6jc3gk14jyi35gjypyy";
+ rev = "90a1490743b2a30762f5454c9d9309018eff83dd";
+ sha256 = "1jc796nyrck3k50x6jb1wsaawk396y4gk87gkwb8yd5qks7ci35q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/140c65cb3cdf6c197b085ccf8ba079e1efd15f38/recipes/kaomoji";
@@ -39680,12 +41751,12 @@
kdeconnect = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kdeconnect";
- version = "20161022.700";
+ version = "20180126.1540";
src = fetchFromGitHub {
owner = "carldotac";
repo = "kdeconnect.el";
- rev = "a91a045cd4aabd671b689361efa10f2e01ad8e8e";
- sha256 = "0j9j3mlzkr8zw03fghpmvkb3i8r1ar0rarjcmvh9k6m4dk7l0g2d";
+ rev = "ca0cbf9a628ba7b519b43fa85e0d988ca26bf853";
+ sha256 = "07aqzfg2nn35bkikrmk1lszqkc6h8vn2551m22mwc19lmdx94p2i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c363866d30fb86ae636d30def8c3847711ada762/recipes/kdeconnect";
@@ -39824,6 +41895,27 @@
license = lib.licenses.free;
};
}) {};
+ keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "keycast";
+ version = "20180226.542";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "keycast";
+ rev = "c64742ee21cdfb816d33ad0574249982e5fb10e2";
+ sha256 = "0pa87l92y2yvyghjvindvdaqy4dgzwxdg87ywzv043fl1s610c2z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast";
+ sha256 = "19qq5y1zjp3029kfq0c59xl9xnxqmdn2pd04sblznchcr9jdy5id";
+ name = "keycast";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/keycast";
+ license = lib.licenses.free;
+ };
+ }) {};
keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "keychain-environment";
@@ -40016,12 +42108,12 @@
kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kill-or-bury-alive";
- version = "20170518.2358";
+ version = "20171231.2218";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "kill-or-bury-alive";
- rev = "415de48695efd30163a015063873b03f4ca5b743";
- sha256 = "1jsgvwi3zy22wirxgzkbbjzk4q6f6mxf3223cf5pkk7x2prv6fcn";
+ rev = "0ba8f44efe60058ef66b10a059fd30489b42546f";
+ sha256 = "09y6905ig6qphfwjk1xn79sv4qxx75gnrmnwd9i80ig3lfp8ps2r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
@@ -40104,8 +42196,8 @@
src = fetchFromGitHub {
owner = "tungd";
repo = "kite-mini.el";
- rev = "48734092e735033ad7664a9933acd4556e095f79";
- sha256 = "0ralsdjzj09g6nsa04jvyyzr6cgsi0d7gi1ji77f52m31dl0b8cw";
+ rev = "a68619dbc109c7989f3448426d8c1ee9e797c11f";
+ sha256 = "1qmg5mdf3zhmpa4kdvkh62y6if6mj4ag885dg7y6461dg2y6ymlh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b76d0ee09efc6652d0541cf72c9623760dda66/recipes/kite-mini";
@@ -40125,8 +42217,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "b242c7053e2a1dd7d963fcacd6a428143f09f5a6";
- sha256 = "06gzspzqxiqsfpa0zyhrgizcxghn6al73dhj5vn5j219cmpiyy7a";
+ rev = "002e46f7db78c02cd1c12114bd9c15815cd97d83";
+ sha256 = "0h6vs7nbdi7pnh1399r2brizcnyyp7r5wlwsqss5wvm6vscyyqdm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40205,12 +42297,12 @@
kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
melpaBuild {
pname = "kodi-remote";
- version = "20171008.2226";
+ version = "20180223.1905";
src = fetchFromGitHub {
owner = "spiderbit";
repo = "kodi-remote.el";
- rev = "479075d96857696cf029cd1f482b9f2f31d82452";
- sha256 = "0kvx43ny49j115kj6zpy1i5g87bjgiimfgj9xp2fn9830adymc24";
+ rev = "aa8c8bb8e64f1f61fadeb4e93973b14dfe19e4a9";
+ sha256 = "1gsaw4yfv68ilf0z130rf13300lnz1fdgi2x8rm8hc0q0dlsp1a6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -40310,12 +42402,12 @@
kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kotlin-mode";
- version = "20171009.1301";
+ version = "20180219.853";
src = fetchFromGitHub {
owner = "Emacs-Kotlin-Mode-Maintainers";
repo = "kotlin-mode";
- rev = "ebcf6f3730f455894ebb7ed8e42950f66e8e1c1d";
- sha256 = "1345ahc8i69sl2d9v03gdgrdcj7qkbzrl0pl957hjn3vbvmhrz00";
+ rev = "a2c2628d55c4e8b018ffe9f55ca38d89302a1bbc";
+ sha256 = "12zng3rq134f0d49fr2rsf0jgmxl3qc7kkhziy7r27hx6ny9h8z2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode";
@@ -40394,12 +42486,12 @@
kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "kubernetes";
- version = "20170523.1517";
+ version = "20171122.1819";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
- rev = "560b65baef1c4f2bedffd8e767774b55dfc35594";
- sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw";
+ rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c";
+ sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -40415,12 +42507,12 @@
kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
melpaBuild {
pname = "kubernetes-evil";
- version = "20170523.1517";
+ version = "20171122.1819";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
- rev = "560b65baef1c4f2bedffd8e767774b55dfc35594";
- sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw";
+ rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c";
+ sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -40457,12 +42549,12 @@
kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "kurecolor";
- version = "20170808.602";
+ version = "20180313.1719";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "kurecolor";
- rev = "3e8b63e89e294179e42a14a4a357c29a72669a22";
- sha256 = "0pj8252x5s61bwsfrhi5qvwk8jia3kc67r82v5m4a900zpmx3a7k";
+ rev = "28521a8738943d7e3ceafbf4a54ac676b3ba5f3c";
+ sha256 = "0nwflkrys84ik7abnr9pswk9qks4gyjd8ashbisqd82r2iljcqni";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
@@ -40625,12 +42717,12 @@
lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "lastpass";
- version = "20170801.1214";
+ version = "20171208.216";
src = fetchFromGitHub {
owner = "storvik";
repo = "emacs-lastpass";
- rev = "264250725b3ba23412919ec10cfa7390473b534c";
- sha256 = "1qqmg59vbwb31nx3vi88d53484gy3sg8wnq45xrra45drpjka3ry";
+ rev = "a4529ce70b8187ed9ac4972997df152af58ef2eb";
+ sha256 = "1h4h7swww2is7qblqi5r1vh26a9lfl52c0yq7rgwd1pqclffgc8m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
@@ -40708,12 +42800,12 @@
latex-preview-pane = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "latex-preview-pane";
- version = "20151023.1303";
+ version = "20180222.951";
src = fetchFromGitHub {
owner = "jsinglet";
repo = "latex-preview-pane";
- rev = "1a0539ab70eaf5dd31c2c94773dddd6f437fed41";
- sha256 = "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa";
+ rev = "e7dbe0df3ca938128ab394cdf04f3e40eb5b139e";
+ sha256 = "1i8mc2qdyyg04rm946vqmmw021c4v8aq7yvxsgl53mfbx9snm3dv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3227f2e35d701915a8d3479d20581dcbe3a778/recipes/latex-preview-pane";
@@ -40747,6 +42839,27 @@
license = lib.licenses.free;
};
}) {};
+ latexdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "latexdiff";
+ version = "20171225.1623";
+ src = fetchFromGitHub {
+ owner = "galaunay";
+ repo = "latexdiff.el";
+ rev = "665aa65707d0e8c5778de70f38a42be4ba1def5d";
+ sha256 = "1ppxmcbkscsdsnm5vf7lmhzq1y0vkkg8dpp4gh0hmsvqvh7d67bp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d164cf118a2c928c04e4d5cbfd47ac732e626fe0/recipes/latexdiff";
+ sha256 = "002frvk31q3plrqa6lldadchck51bch4n126y5l33fyfs0ipspfa";
+ name = "latexdiff";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/latexdiff";
+ license = lib.licenses.free;
+ };
+ }) {};
launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "launch";
@@ -40852,6 +42965,27 @@
license = lib.licenses.free;
};
}) {};
+ lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "lcr";
+ version = "20180224.1243";
+ src = fetchFromGitHub {
+ owner = "jyp";
+ repo = "lcr";
+ rev = "6caa2bac7056dcf42c4cb88a1d5fbe1c9d71a9b4";
+ sha256 = "0xvl0dqxwim6nmm6f9ddyp0r6j1n719zlgm2a3f49dskhnkn798z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr";
+ sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k";
+ name = "lcr";
+ };
+ packageRequires = [ dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/lcr";
+ license = lib.licenses.free;
+ };
+ }) {};
ldap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ldap-mode";
@@ -40876,12 +43010,12 @@
lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
melpaBuild {
pname = "lean-mode";
- version = "20171102.754";
+ version = "20180123.413";
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean-mode";
- rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
- sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
+ rev = "ae90bd280588c96d540892d0f42247db5a126f51";
+ sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode";
@@ -40918,12 +43052,12 @@
ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ledger-mode";
- version = "20170901.2039";
+ version = "20180224.1936";
src = fetchFromGitHub {
owner = "ledger";
repo = "ledger-mode";
- rev = "24b43e34dd34de23e54d7ddaa2a147efda6af03d";
- sha256 = "0cdcd2hpv34yhpplgqljiyncs2q0i321f4xwfkb2inqbv9q4byhk";
+ rev = "3a10229bc1c12f36c9432ec3b459069a07f05498";
+ sha256 = "1x0jg0vysab8592882pgbszrshr85ss66s8fsa6mhh61plxd0fw6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -41195,8 +43329,8 @@
src = fetchFromGitHub {
owner = "rvirding";
repo = "lfe";
- rev = "2880c8a2a7fe998238b6490fe3e3c484b5c5985e";
- sha256 = "1xcnh1hk815wizhp7h1mik3npm7zpbvg4554nwbj072gnbb9j1nx";
+ rev = "5faa7106419263689bfc0bc08a7451ccb1fba718";
+ sha256 = "010l1xz9wa6wm7fnajxcdxjl1nmbkwxxwszd4h14xmhj830560ph";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -41230,6 +43364,27 @@
license = lib.licenses.free;
};
}) {};
+ libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "libmpdel";
+ version = "20180316.122";
+ src = fetchFromGitHub {
+ owner = "mpdel";
+ repo = "libmpdel";
+ rev = "60239978403a802c09d52f4638d9533dac275f25";
+ sha256 = "07y2mqz443n6wim1dq6wv22axkq4vv7y58ncm6cahl7jivkvkk4c";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel";
+ sha256 = "0qi9g3czwzi9hhp7gjczpzjx9vgzz52xi91332l0sxcxmwbawjp1";
+ name = "libmpdel";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/libmpdel";
+ license = lib.licenses.free;
+ };
+ }) {};
lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lice";
@@ -41272,6 +43427,27 @@
license = lib.licenses.free;
};
}) {};
+ line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "line-up-words";
+ version = "20180219.224";
+ src = fetchFromGitHub {
+ owner = "janestreet";
+ repo = "line-up-words";
+ rev = "91f5f7e38fa87bda437091f6480acfb420be808c";
+ sha256 = "07vmv8m7aip8xfjcv9plcxz9q9q4wdqx6smmc57z77zlnf27k9x8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words";
+ sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79";
+ name = "line-up-words";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/line-up-words";
+ license = lib.licenses.free;
+ };
+ }) {};
lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lingr";
@@ -41380,12 +43556,12 @@
linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "linum-relative";
- version = "20160510.118";
+ version = "20180124.247";
src = fetchFromGitHub {
owner = "coldnew";
repo = "linum-relative";
- rev = "b8a99dcfe38a491172a8193053fb7849634b43c0";
- sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s";
+ rev = "c74a6981b688a5e1e6b8e0809363963ff558ce4d";
+ sha256 = "0svxi1l3s4rg1k1apfw25gzi127rsks56b5yfg79a48b5rf1xmkh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative";
@@ -41469,15 +43645,36 @@
license = lib.licenses.free;
};
}) {};
+ lispxmp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "lispxmp";
+ version = "20170925.1723";
+ src = fetchFromGitHub {
+ owner = "rubikitch";
+ repo = "lispxmp";
+ rev = "7ad077b4ee91ce8a42f84eeddb9fc7ea4eac7814";
+ sha256 = "1156jynii783v9sjj3a7s20ysa26mqaq22zk5nbia949hwbibx16";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/lispxmp";
+ sha256 = "1a641v5cx4wy2v8a2swxzn1y9cz4g2bp4mn9q290n3ifpn5356dl";
+ name = "lispxmp";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/lispxmp";
+ license = lib.licenses.free;
+ };
+ }) {};
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20171112.44";
+ version = "20180315.1216";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "1d3684a2ff211d81b080bab2cfcffc6dfc911dfb";
- sha256 = "1dcqr6zcfk48yna99kp2zzkm29n2ilwg1bkrjwp7i7pid3zz41i2";
+ rev = "0fdc50b703bb4ee41ba76df169382d1bec93668c";
+ sha256 = "127frm285hblpcp1cbjfvfzbszf9b0ik72hhlvnzw7arqns611r4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41514,12 +43711,12 @@
lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }:
melpaBuild {
pname = "lispyville";
- version = "20170907.926";
+ version = "20180228.1154";
src = fetchFromGitHub {
owner = "noctuid";
repo = "lispyville";
- rev = "522fd8dcce23b2719c758e64f99b64591406f2f5";
- sha256 = "0sbqw585lv5j3w13zq2adrcqybw88y36qnnd2vp8nk9kgzvl4p62";
+ rev = "b4291857ed6a49a67c4ea77522889ce51fb171ab";
+ sha256 = "095zibzc3naknahdrnb59g9rbljy8wz9rkc7rf8avb3wxlwvxhm3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville";
@@ -41787,12 +43984,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "20171109.2007";
+ version = "20180311.2027";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "f5da8df21ae2aa704ddca4473b6f9400ba12d30c";
- sha256 = "1w0xc0bc5jl0q9yi9jhvy4xgdyrz9l402v9qv8mmrp2iqf5cdblm";
+ rev = "0c9f7a09a5c58d82bad706afd2e6e236e0cf42b8";
+ sha256 = "0ii724lvcfs9jnlpd6kgrxjwlfmg41chywcp8j85m49al8b6pipa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -41889,26 +44086,6 @@
license = lib.licenses.free;
};
}) {};
- llvm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "llvm-mode";
- version = "20150910.644";
- src = fetchgit {
- url = "https://llvm.org/git/llvm";
- rev = "377a566dcea87ba5b29ce196a677aaac7b738d64";
- sha256 = "0g3v6z3s471wiqszshy9xl0lzyyn1vi304a3awkh8d7lyx9qw10m";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode";
- sha256 = "0jxwa7gaxv9kkgjp87ggzlfqbf6xs19z0s9ycnv2h5hlxpnzrlnb";
- name = "llvm-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/llvm-mode";
- license = lib.licenses.free;
- };
- }) {};
lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lms";
@@ -42138,6 +44315,26 @@
license = lib.licenses.free;
};
}) {};
+ lognav-mode = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "lognav-mode";
+ version = "20171230.1052";
+ src = fetchhg {
+ url = "https://bitbucket.com/ellisvelo/lognav-mode";
+ rev = "a9b53f2da040";
+ sha256 = "0ka92x63zfgraby5ycypn3ri2s3s2b1m2j7fpb4r37bk9xkf90v4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ad86b93f4982a0c6291c771e12c8f42ace3b88f9/recipes/lognav-mode";
+ sha256 = "1941scifg3nn7gmnki3sa9zvwsbb84w5lw2xjmdx0sh8rbxaw8gb";
+ name = "lognav-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/lognav-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
logstash-conf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logstash-conf";
@@ -42162,12 +44359,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "20170928.820";
+ version = "20180216.1445";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f";
- sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63";
+ rev = "9ec279d933923dab2d8d1f140adc43073dab6433";
+ sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -42330,12 +44527,12 @@
lsp-hack = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-hack";
- version = "20171108.1813";
+ version = "20171128.1238";
src = fetchFromGitHub {
owner = "jra3";
repo = "lsp-hack";
- rev = "a69bd0340039570d55fdea326a1086b958647ea1";
- sha256 = "19rsjyklhd2lgll4204l5rzqbv4jvsh1yd3mcv5g4p3s3xpfp9is";
+ rev = "f299555ad5206f13d7cfe75a3c76607b1f0d6da5";
+ sha256 = "1z3cca395v5kv7h1w7vnb7c42sq2aczv7sznx9nc2gjjabmrd8vy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a70d8442c653554d28dc87425913424ab42ab5c8/recipes/lsp-hack";
@@ -42351,12 +44548,12 @@
lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-haskell";
- version = "20171021.330";
+ version = "20180131.459";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-haskell";
- rev = "16ca9fa975e64e840e062485ed30e4b297d72424";
- sha256 = "03zrk3h76hpacrqw7lchjbslh0lg081jqkgf9n5nhxj2jg60v3vd";
+ rev = "aa421f9702056a89cd4e63c0dcf5543acb62840f";
+ sha256 = "1m0diap909jn9w54j9462zg972xhwxivcda59jmb6isgjpyi1yyb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
@@ -42393,12 +44590,12 @@
lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
melpaBuild {
pname = "lsp-javacomp";
- version = "20171024.1547";
+ version = "20180218.2334";
src = fetchFromGitHub {
owner = "tigersoldier";
repo = "lsp-javacomp";
- rev = "ed23aaeee27e6253bed5752fb8fbb7a5fa61967c";
- sha256 = "096rbyv0qwa454p1ns7g0py9lni5r6h1gw85wm5mwr00shjzq23n";
+ rev = "cb080824e1fc08e2724d6ecde7034f1acfd565f0";
+ sha256 = "0ihb4bld8pzw2mxfwygxldsv2hclvmzkr7cp8nimzjam1nlgjhic";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp";
@@ -42414,12 +44611,12 @@
lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-javascript-typescript";
- version = "20171027.1005";
+ version = "20180203.52";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-javascript";
- rev = "8a565260906f90bb39f2da54cdb6179ec27005a6";
- sha256 = "1dx0b7sq6wn309l1iy8s3ccn21hkv0xs061jbm53hz40pn30sjqc";
+ rev = "8df90bc27852da2cf05951870d94ce7920d8c09f";
+ sha256 = "0pqk8p0z30p0j7lc5i2mvy7vmg8k5hphgwp4djhgm1ickm9pcx20";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript";
@@ -42432,22 +44629,22 @@
license = lib.licenses.free;
};
}) {};
- lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lsp-mode";
- version = "20171111.1203";
+ version = "20180314.634";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-mode";
- rev = "27b78dfbf117035f4b276f716e16dfb37d5fb7d4";
- sha256 = "0l37ss2mp4byxs3h2wln3kg4w094mbc0cjf838cj5z57y8ar141z";
+ rev = "6383fb9e414dc92eca41aed6e1b643accd4271d8";
+ sha256 = "0xfg3dwi06z45y1hiff42lgyv5diz69hrrlsssar47vlprscmdxr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9";
name = "lsp-mode";
};
- packageRequires = [ emacs flycheck ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/lsp-mode";
license = lib.licenses.free;
@@ -42474,6 +44671,27 @@
license = lib.licenses.free;
};
}) {};
+ lsp-php = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+ melpaBuild {
+ pname = "lsp-php";
+ version = "20180214.624";
+ src = fetchFromGitHub {
+ owner = "tszg";
+ repo = "lsp-php";
+ rev = "ff5f5ba417342aa05869a1a9c6a0fc2d42c8acc3";
+ sha256 = "05rq7sqb6chymzfqvk5xk9bgi7nsdf1ldimams8df9ml6242zjsg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/be00893ec6db70624acf1b4527cca05486d6b090/recipes/lsp-php";
+ sha256 = "1fpmg8mbp0r8krlbp4j0bk6kslmm88lrpki0w961s4gqrqxw287c";
+ name = "lsp-php";
+ };
+ packageRequires = [ emacs lsp-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-php";
+ license = lib.licenses.free;
+ };
+ }) {};
lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-python";
@@ -42481,8 +44699,8 @@
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-python";
- rev = "5acea5f921dc396ea092ee253ec01b45dee3cbfd";
- sha256 = "0nz0n7k0i0h77fn8w0d49b4pkljw7l15hzvjym16jh4gr1n098ar";
+ rev = "035fed681ef18a774dcb82e361bd6b5b8778623f";
+ sha256 = "0mhs7v1mc23h0rlcyinl3pf1qavjl4s6j5vrf9vc65sggsnw0x1d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python";
@@ -42495,36 +44713,85 @@
license = lib.licenses.free;
};
}) {};
- lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+ lsp-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, markdown-mode, melpaBuild, rust-mode }:
melpaBuild {
pname = "lsp-rust";
- version = "20171021.241";
+ version = "20180305.508";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-rust";
- rev = "239e0cb8912749266a6226b68c6bc3b4362876c1";
- sha256 = "0ki66lcdc67hxx3llzw5x8vrsfi1p5m509jpcvkhrrxs1sqr4bqn";
+ rev = "ecc889cc8735b280e0e6e84d2f4526b0048148b3";
+ sha256 = "0wmci5lij5721xpfsj3mnvr3z1j8b9s0w76dhzd0lnyaknvyv1rs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28";
name = "lsp-rust";
};
- packageRequires = [ lsp-mode ];
+ packageRequires = [ dash emacs lsp-mode markdown-mode rust-mode ];
meta = {
homepage = "https://melpa.org/#/lsp-rust";
license = lib.licenses.free;
};
}) {};
+ lsp-ui = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }:
+ melpaBuild {
+ pname = "lsp-ui";
+ version = "20180314.556";
+ src = fetchFromGitHub {
+ owner = "emacs-lsp";
+ repo = "lsp-ui";
+ rev = "6ba9d3fe2d9c0f239ebd8a124e10bc038c76fdb3";
+ sha256 = "071bdnn1hs31bd479xs6dpyb98gf20q4z2k9sv0wfxmbjzm241s3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui";
+ sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j";
+ name = "lsp-ui";
+ };
+ packageRequires = [
+ dash
+ dash-functional
+ emacs
+ flycheck
+ lsp-mode
+ markdown-mode
+ ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-ui";
+ license = lib.licenses.free;
+ };
+ }) {};
+ lsp-vue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+ melpaBuild {
+ pname = "lsp-vue";
+ version = "20180129.1805";
+ src = fetchFromGitHub {
+ owner = "emacs-lsp";
+ repo = "lsp-vue";
+ rev = "faf976ee9b333919653b4b98e2886b488707e866";
+ sha256 = "1d6sw5jsjhwd5bbl2p8k6hdwpg1pmnsmvbq8g33h80qlg05fwj60";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9eb7699630fd7e11f38b4ba278a497633c9733/recipes/lsp-vue";
+ sha256 = "1df3dva31livffy9bzassgqpps3bf9nbqmhngzh8bnhjvvrbj5ic";
+ name = "lsp-vue";
+ };
+ packageRequires = [ emacs lsp-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-vue";
+ license = lib.licenses.free;
+ };
+ }) {};
lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lua-mode";
- version = "20170130.435";
+ version = "20180207.1216";
src = fetchFromGitHub {
owner = "immerrr";
repo = "lua-mode";
- rev = "652e299cb967fccca827dda381d61a9c144d97de";
- sha256 = "1k64cjzylmfw89pyfjza8s9sxijraknwg573vh619wvnggflc7lb";
+ rev = "7909513c056ac85fd637aece6d3773ffa3b9b6cd";
+ sha256 = "0bmsvggmrvcaq6yw856dk9484w5pjpfkkgia0p4w0f5rvvnfr8j3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode";
@@ -42582,12 +44849,12 @@
lusty-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lusty-explorer";
- version = "20150508.1557";
+ version = "20180127.1443";
src = fetchFromGitHub {
owner = "sjbach";
repo = "lusty-emacs";
- rev = "a6e78cafc193050a493d16d07eae107a2436c293";
- sha256 = "1r1xfn0dyc4m49064g9n6hpwn4r763kpbg3dgprsv30i5ska61qa";
+ rev = "3df794ed4829e353ee3c1e3c6686440f9e868ef6";
+ sha256 = "1z2nzjlmmcnin3h0713kqaaikyc0h4iiazv50lsvrp0agjbmhcqp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/efedaa3b1de5f6406c7dcd842eee42eefaf8ab50/recipes/lusty-explorer";
@@ -42624,12 +44891,12 @@
lyrics = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "lyrics";
- version = "20160920.1945";
+ version = "20180123.2004";
src = fetchFromGitHub {
owner = "emacs-pe";
repo = "lyrics.el";
- rev = "1378d534614793a51ebbed661c59eb8818299182";
- sha256 = "10mp9vavmbkhgb133n490kjfbk63j2b0plvaf57w432nalxcwf5n";
+ rev = "fb35b387796f64f48b4daa5a163f4a576210f200";
+ sha256 = "17al49f633h3fsa6aq9v5c1r8dp2gj97f46z1fhmgxbijmpfzs0w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b04c8f3dfa9fc07cc0ff3df5c4069f864b6db92e/recipes/lyrics";
@@ -42792,12 +45059,12 @@
magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "magic-filetype";
- version = "20161214.1017";
+ version = "20180219.752";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "magic-filetype.el";
- rev = "9a20137474697063898902b43a40423daa4eb64d";
- sha256 = "1r16qlm2pqcph0zwy3fhzdjywdrfcwvldqk809vbhw71qkq4a54i";
+ rev = "019494add5ff02dd36cb3f500142fc51125522cc";
+ sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype";
@@ -42831,26 +45098,28 @@
license = lib.licenses.free;
};
}) {};
- magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
+ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20171112.348";
+ version = "20180315.1731";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "1c69e9e9107ac9c881c763f69d11a3686d201a74";
- sha256 = "1qi32vplmjwnqpcrxgvf1qgzrkbgqi3wgngixwl67dm8xv7di799";
+ rev = "242ea1d84b3ae2489caa68acd3070e24d08aa00a";
+ sha256 = "1vx3c0r4ci1f967whzjk6hdn11yh7k778s22fa8n522a1mj3gh7n";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
- sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit";
+ sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga";
name = "magit";
};
packageRequires = [
async
dash
emacs
+ ghub
git-commit
+ let-alist
magit-popup
with-editor
];
@@ -42862,12 +45131,12 @@
magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-annex";
- version = "20170913.659";
+ version = "20180120.1534";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-annex";
- rev = "895c229c2b0d822a4debb302d8638105ecb4ee20";
- sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh";
+ rev = "44eaef7d55647d5d4bd466742b738d7a9563d07f";
+ sha256 = "1wka4aj9jv4i8a8aj1wffg8aba23qgg02636fx7ky919jr97f3za";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -42946,12 +45215,12 @@
magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
melpaBuild {
pname = "magit-gh-pulls";
- version = "20161020.249";
+ version = "20171117.226";
src = fetchFromGitHub {
owner = "sigma";
repo = "magit-gh-pulls";
- rev = "7eb4491d889c4de2e3169b91d34e7d863edf94b7";
- sha256 = "180vqxyxv6jvp14qa0ks692c42rkf8wj0vk8nqx5j211f9gkh7vl";
+ rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7";
+ sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls";
@@ -42988,12 +45257,12 @@
magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-imerge";
- version = "20170805.819";
+ version = "20180212.1648";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-imerge";
- rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c";
- sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg";
+ rev = "79a2fccc460695df5547204ad6c05529868ba1fd";
+ sha256 = "1ks17wl0h4a5rhwfzq47rf60192rxyvkwqhnp3fg9sa85b0nqc3i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
@@ -43051,16 +45320,16 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
- version = "20171109.1438";
+ version = "20180217.910";
src = fetchFromGitHub {
owner = "magit";
- repo = "magit";
- rev = "1c69e9e9107ac9c881c763f69d11a3686d201a74";
- sha256 = "1qi32vplmjwnqpcrxgvf1qgzrkbgqi3wgngixwl67dm8xv7di799";
+ repo = "magit-popup";
+ rev = "48cf02b8e4d7d4a83bc22cacd64cbf4e6a266aa2";
+ sha256 = "0dnfa3djgnfgig279v46xl4gz3lzjmc48nq27gdlksnkp1mwnn3j";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
- sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup";
+ sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv";
name = "magit-popup";
};
packageRequires = [ async dash emacs ];
@@ -43069,36 +45338,15 @@
license = lib.licenses.free;
};
}) {};
- magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
- melpaBuild {
- pname = "magit-rockstar";
- version = "20170703.704";
- src = fetchFromGitHub {
- owner = "tarsius";
- repo = "magit-rockstar";
- rev = "a65042e3445008b55190f1258ae54bd78e12174b";
- sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
- sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
- name = "magit-rockstar";
- };
- packageRequires = [ dash magit ];
- meta = {
- homepage = "https://melpa.org/#/magit-rockstar";
- license = lib.licenses.free;
- };
- }) {};
magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-stgit";
- version = "20160224.703";
+ version = "20171115.754";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-stgit";
- rev = "1b064485d512ab547d606dcea9ad4298f355095c";
- sha256 = "01mgnm5nr2yg377pk4bwlzzgbabsx611wrpx2vzsbiwd97yppdqf";
+ rev = "0e44df69d7c0c793808a5278bed35b2c6ec39f7f";
+ sha256 = "1zr3ir9426yg5vrsi3k56vzdhajddn5c0p2ygw587gscnr7fgv5b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit";
@@ -43135,12 +45383,12 @@
magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-tbdiff";
- version = "20170725.1850";
+ version = "20180120.1553";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-tbdiff";
- rev = "1d1333af9d76b9e832212e9da152397df65f7205";
- sha256 = "1rhjqvdg43n0qa9qdq9rlq4v8msy48y912m9dcjdvsaw45hh8062";
+ rev = "aaa040037c38f13c0e6bbce83e38959ef30c1925";
+ sha256 = "1hc2mkmd4cni0sgkypp32xlsn749c6i2lz8l3crmgk48q6qx2i18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
@@ -43177,12 +45425,12 @@
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "20171111.623";
+ version = "20180307.446";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "098209b84a1204d7014aa061294e223a40030248";
- sha256 = "0jlclxyahcl0dl1yl83a34kr0xlfzdyplkabjzz1p29xj94ivw9y";
+ rev = "d3fc59ddf4f3a6179386e967ad9dfcd1facb6759";
+ sha256 = "1x7ql95qf8ldzf4p9zd79qmvqh1zin96xair9rhlab0zmvk3vzca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -43237,27 +45485,6 @@
license = lib.licenses.free;
};
}) {};
- main-line = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "main-line";
- version = "20151120.1806";
- src = fetchFromGitHub {
- owner = "emacsfodder";
- repo = "emacs-mainline";
- rev = "2ef3175854f5b6c85f2e1bed26507cdca2f6ad16";
- sha256 = "1zkm51gp1lkaz6n8ixf31rwjqms49mi8qdq10a7nibdzivpj8mg7";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/main-line";
- sha256 = "06rihx9h2h8ayrirbx74d9qdf26laz9yxffvxyldzm9hymlbzadd";
- name = "main-line";
- };
- packageRequires = [ cl-lib ];
- meta = {
- homepage = "https://melpa.org/#/main-line";
- license = lib.licenses.free;
- };
- }) {};
majapahit-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "majapahit-theme";
@@ -43324,12 +45551,12 @@
make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "make-it-so";
- version = "20170328.216";
+ version = "20180128.1307";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "make-it-so";
- rev = "1f2015cb131d69ffd7994dcc153abef969999027";
- sha256 = "0brqh1dis4ahxxa4q8zsqr039l6k7arxkji4bx9yh65aimp8ckcd";
+ rev = "bc3b01d6b9ed6ff66ebbd524234f9d6df60dd4be";
+ sha256 = "0833bzlscpnkvjnrg3g54yr246afbjwri8n5wxk8drnsq6acvd8z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -43345,12 +45572,12 @@
makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "makefile-executor";
- version = "20171017.438";
+ version = "20180315.632";
src = fetchFromGitHub {
owner = "thiderman";
repo = "makefile-executor.el";
- rev = "a950438c93dc2fdcb867ac25174c773deda95aff";
- sha256 = "1vpa24k8gm9zr8mpam76k1wbzc1zama5s5ch1f8c1h539l8i8cl9";
+ rev = "06b2efa4539c319ab36806b0bd8ea87e214aaa74";
+ sha256 = "08rjj3bdnvmaxiwnys4cjd19wkkk06wv0l58hpn3c7vi077ps3cc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
@@ -43387,12 +45614,12 @@
malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
melpaBuild {
pname = "malinka";
- version = "20170723.1635";
+ version = "20171202.221";
src = fetchFromGitHub {
owner = "LefterisJP";
repo = "malinka";
- rev = "8072d159dae04f0f1a87b117ff03f9f1eb33f6cb";
- sha256 = "0s5dcm11nw88j1n4asqpm92z0csjv3jvh06f4qqghfvcym8qv44h";
+ rev = "d4aa517c7a9022eae16c758c7efdb3a0403542d7";
+ sha256 = "1rnzvx1nc01sw9fklm36lyllqm6dizj64gnlqbs4nammx7z0spi1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
@@ -43534,12 +45761,12 @@
mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "mandoku";
- version = "20171002.12";
+ version = "20180223.2121";
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku";
- rev = "77647573331c602847b06b9e21de69f72cd7bad5";
- sha256 = "0yqxsls9phvd4dgzb908xds4x437rqpm3ddy07pq3qq7ghri1cnv";
+ rev = "90b828f94872f6bdb9eb3c06bbc2a9c20e017f22";
+ sha256 = "0n5kd7fngxs3zc7scv34mfr7ppl5nkg8mnvgxwsnkghlv5a76wwp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -43555,12 +45782,12 @@
mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }:
melpaBuild {
pname = "mandoku-tls";
- version = "20170822.1138";
+ version = "20171117.1840";
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku-tls";
- rev = "82b1b39305da3259b53a2200260713500d7a9ec5";
- sha256 = "0xkycqwv5bczz111zlfai2y3m9shwv237dhgyjmhd1j6blpp59jw";
+ rev = "ffeebf5bd451ac1806ddfe1744fbbd036a56f902";
+ sha256 = "16399qifjj4hnfw4a62jwxfwnc7k8lmiy3bz8iwzlc91jjic7zdc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/mandoku-tls";
@@ -43686,36 +45913,15 @@
license = lib.licenses.free;
};
}) {};
- markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
- melpaBuild {
- pname = "markdown-edit-indirect";
- version = "20170607.1244";
- src = fetchFromGitHub {
- owner = "emacs-pe";
- repo = "markdown-edit-indirect.el";
- rev = "a789320354eab2b2275a308c38b1390e6d2cc41b";
- sha256 = "067rp6h2wax242zmykz5iv2v30cj327dh9vz6c69im02lsn65ib3";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fa4da9d5c63da3bd777101098168696f5c4d3fbc/recipes/markdown-edit-indirect";
- sha256 = "19038vb6ph7l9w1yv8pszyd13ac38l44vb46l9jmgyby773m7644";
- name = "markdown-edit-indirect";
- };
- packageRequires = [ edit-indirect emacs markdown-mode ];
- meta = {
- homepage = "https://melpa.org/#/markdown-edit-indirect";
- license = lib.licenses.free;
- };
- }) {};
markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markdown-mode";
- version = "20171112.1835";
+ version = "20180124.138";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "markdown-mode";
- rev = "e3e7069e340ba18965d4b58d913efd3ea6e3ab38";
- sha256 = "123ixjar4zk6hsjclz5rgm82gz5a1v0jwbb3x0l17gnbbkmcvym7";
+ rev = "668de4a965980d618637a3b5754e721b54c51e83";
+ sha256 = "00biiz0s5mwq092qxdh9943f6qf6k6n7dhrrj7nvj2b8iciid9as";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -43773,12 +45979,12 @@
markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }:
melpaBuild {
pname = "markdown-preview-mode";
- version = "20170820.459";
+ version = "20171121.2323";
src = fetchFromGitHub {
owner = "ancane";
repo = "markdown-preview-mode";
- rev = "134fd336750b8b3165bc906f0a7161c25eb6f589";
- sha256 = "0j1jdvmn8psarjdl1j4d3rsjmnb3gcissh2l78xj2c8vckmp2g24";
+ rev = "4ec15183fc9fadb9368902c9b77a2d0e1196d1c6";
+ sha256 = "1zvpcnn0lafd6pvp5d42rid20dqi7zrpyai1q0kagpv3grbbyzc8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
@@ -43906,12 +46112,12 @@
marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "marshal";
- version = "20171018.932";
+ version = "20180124.439";
src = fetchFromGitHub {
owner = "sigma";
repo = "marshal.el";
- rev = "406ea2f60c7e4aeafd384b8d6696d726b3d8f611";
- sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s";
+ rev = "f038689cbd5b3680b80b44edd0c7a63ca3038e26";
+ sha256 = "1n79im1r7h1ilvppn9alqwl96zhyxbm5hk7kbmqh022dggw0cx15";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal";
@@ -43948,12 +46154,12 @@
mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mastodon";
- version = "20170619.1050";
+ version = "20180305.1909";
src = fetchFromGitHub {
owner = "jdenen";
repo = "mastodon.el";
- rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318";
- sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp";
+ rev = "ae8dabda04e377a6ac22cb854e4844f68073f533";
+ sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -43969,12 +46175,12 @@
material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "material-theme";
- version = "20160908.1538";
+ version = "20171123.1040";
src = fetchFromGitHub {
owner = "cpaulik";
repo = "emacs-material-theme";
- rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40";
- sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0";
+ rev = "b66838d220ad380a16da1d8878936974b26f815d";
+ sha256 = "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme";
@@ -44032,15 +46238,15 @@
matlab-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "matlab-mode";
- version = "20160902.459";
+ version = "20180125.1010";
src = fetchgit {
url = "https://git.code.sf.net/p/matlab-emacs/src";
- rev = "3b3c48ac0c27039e0bef89c643f0ee4c0b53d3d0";
- sha256 = "0kizmzpmc8iw15n6xkrf7m5kbjcs5rwdrxyrfij6cj43szlnkf1z";
+ rev = "50266ff812607e55bddacd71a46d1b96e36fb0bd";
+ sha256 = "1spyfnkw6j0v947m6yj6mv6ni1za0a9m9iycpjycpcb42q7d9rlg";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/matlab-mode";
- sha256 = "128v4rwc99dwyfgi5crbr5649fz4l7dwh4lid8w2mwpknyxaxy28";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6f78cff288077e04f8c9e4c2e5be9f3c33d8ff49/recipes/matlab-mode";
+ sha256 = "1q3sdmahf915ix4lrv65cxsfh6hrs91c8pmyixbqmbhifqi33d0q";
name = "matlab-mode";
};
packageRequires = [];
@@ -44178,12 +46384,12 @@
mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mbsync";
- version = "20170320.503";
+ version = "20171130.335";
src = fetchFromGitHub {
owner = "dimitri";
repo = "mbsync-el";
- rev = "046a745ea1ea85152e27efd4c83fd3487aacffaa";
- sha256 = "1s5zxv4qvy2lqh090lb2bc61y4y67mr22j0b02y69wd61s1w3ppx";
+ rev = "911d9ac255e8f7fb4bd21c0e816e44abfeb59128";
+ sha256 = "05qqb7399bmjdkfr5gdkf7fpg6xziyd9345x00vz5cbq859p128p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync";
@@ -44238,6 +46444,27 @@
license = lib.licenses.free;
};
}) {};
+ md4rd = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild, request, s, tree-mode }:
+ melpaBuild {
+ pname = "md4rd";
+ version = "20180123.1244";
+ src = fetchFromGitHub {
+ owner = "ahungry";
+ repo = "md4rd";
+ rev = "be0fc4951b2d1f5194ffa1fcaac706dbac560500";
+ sha256 = "1i93shx5x192gd7cl2r6gvcvhhwyi1k08abi5w3izv1hn3pmksgq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/48d4a3b3337e16e68631409d1de0ce67ae22b837/recipes/md4rd";
+ sha256 = "0ayr5qw0cz7bd46djfhm8slr2kfgssi5bsnzqcasr8n4lyg9jvfc";
+ name = "md4rd";
+ };
+ packageRequires = [ cl-lib dash emacs hierarchy request s tree-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/md4rd";
+ license = lib.licenses.free;
+ };
+ }) {};
mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mediawiki";
@@ -44262,12 +46489,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "20170723.1724";
+ version = "20180218.538";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5";
- sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8";
+ rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0";
+ sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44476,8 +46703,8 @@
src = fetchFromGitHub {
owner = "myTerminal";
repo = "meta-presenter";
- rev = "e882ac7f7658dd9507aca0ff88c88fcf74618252";
- sha256 = "0h8zg2nvb0yn0z8xv1101r8rjxgs05k08j3n71inr7n118sa98bj";
+ rev = "4e7aae56e5abf6deaadbda84fd5ec4e3e19c22be";
+ sha256 = "0nb64i9ikkcbb6s21rzc2d5i84dpy0zvqk7f3zynlprzaqy11b7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter";
@@ -44535,12 +46762,12 @@
metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "metaweblog";
- version = "20170626.750";
+ version = "20171216.1840";
src = fetchFromGitHub {
owner = "punchagan";
repo = "metaweblog";
- rev = "c039d1ffb618d19d160bde835fab389e9a7433a3";
- sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k";
+ rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a";
+ sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
@@ -44595,15 +46822,36 @@
license = lib.licenses.free;
};
}) {};
+ mgmtconfig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mgmtconfig-mode";
+ version = "20180222.1257";
+ src = fetchFromGitHub {
+ owner = "purpleidea";
+ repo = "mgmt";
+ rev = "ddefb4e98778d4568a96754df52e3a6a494f2ad3";
+ sha256 = "17kzi4jyjbmqkkadaz0h46cjw3dxv5qcy27rpfrajhbny72x9j1h";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode";
+ sha256 = "0bdjaqfk68av4lfc4cpacrl2mxvimplfkbadi9l6wb65vlqz6sil";
+ name = "mgmtconfig-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/mgmtconfig-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mhc";
- version = "20171016.335";
+ version = "20180314.3";
src = fetchFromGitHub {
owner = "yoshinari-nomura";
repo = "mhc";
- rev = "03a50a7dd5f90fb981b72e4b9e9385e4d1fe3be3";
- sha256 = "17p6gkf6xmx6sflzd3pyc3p3x7ma8p497hmj1yc7w863kqm8jclk";
+ rev = "f7bce7f5504093737071e2fc79ae6bc95dd37af5";
+ sha256 = "0sash77j2k1gpi35miyaf96g0zfx3d5hjqag8vcwc692lx1sf06c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -44744,12 +46992,12 @@
mingus = callPackage ({ fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild }:
melpaBuild {
pname = "mingus";
- version = "20171112.115";
+ version = "20171124.238";
src = fetchFromGitHub {
owner = "pft";
repo = "mingus";
- rev = "9ebe7a2a0fee1f0e39fffc5c67a260bc596fb27e";
- sha256 = "15c7l9sbmxmxcwihq54mfwh0n8lx89zkwy6yaydpgd7a1knqka5p";
+ rev = "93827f564145a598838d3c3232202a60d681bd49";
+ sha256 = "09aj6h2zfww95h9ym5pw2p6p7hz57l7zlx4v492ga2vkcsjis7gy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6699927f1ded5c97f2ce1861f8e54a5453264cca/recipes/mingus";
@@ -44909,6 +47157,27 @@
license = lib.licenses.free;
};
}) {};
+ minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "minions";
+ version = "20180306.5";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "minions";
+ rev = "360e433fb8a0c62a3661434241ba29d2ba7bf95c";
+ sha256 = "1az01ragbqwqipp1mah963l8vvyhcm003fa6rw24mfg6wv9pq58c";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions";
+ sha256 = "0ximlj93yp6646bh99r2vnayk15ky26sibrmrqqysfw1pzs4a940";
+ name = "minions";
+ };
+ packageRequires = [ dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/minions";
+ license = lib.licenses.free;
+ };
+ }) {};
minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "minitest";
@@ -44933,12 +47202,12 @@
minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "minizinc-mode";
- version = "20170708.358";
+ version = "20180201.650";
src = fetchFromGitHub {
owner = "m00nlight";
repo = "minizinc-mode";
- rev = "b621b9e106edbe094bcc8e609d9398a60c2ac8b5";
- sha256 = "15d90fsrpc7qcnblgwjcqrqyyphbfjvdnkwj6dnv79d0m4n58m1c";
+ rev = "2512521ba7f8e263a06db88df663fc6b3cca7e16";
+ sha256 = "1yrawvvn3ndzzrllh408v4a5n0y0n5p1jczdm9r8pbxqgyknbk1n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode";
@@ -44951,6 +47220,27 @@
license = lib.licenses.free;
};
}) {};
+ minor-mode-hack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "minor-mode-hack";
+ version = "20170925.1734";
+ src = fetchFromGitHub {
+ owner = "rubikitch";
+ repo = "minor-mode-hack";
+ rev = "9688994e23ccb2de568225ef125b41c46e5667c3";
+ sha256 = "0f6kafr7zqgdlw914bxh2390a1bjz5zy3h30yrfpavz283ycvrrw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/minor-mode-hack";
+ sha256 = "07ga48xvbi641i053bykv9v4wxhka6jhhg76b1ll24rys02az526";
+ name = "minor-mode-hack";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/minor-mode-hack";
+ license = lib.licenses.free;
+ };
+ }) {};
mip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mip-mode";
@@ -44996,12 +47286,12 @@
mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mixed-pitch";
- version = "20170723.955";
+ version = "20180314.1441";
src = fetchFromGitHub {
owner = "jabranham";
repo = "mixed-pitch";
- rev = "6a4fbb9c48fc345d4d40228e8b686f6f2e585f8a";
- sha256 = "14hpcx75rb41fya8i8qk6cg388wgkhhxnj64ywar3pycngm8jwl9";
+ rev = "b76567bd0c55f72942e686b7de97a222d333b333";
+ sha256 = "186s9ligb1b3hh54pdhfkvpzva5dkj87ydslyi3jjf7yrhvxgw9k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch";
@@ -45076,22 +47366,22 @@
license = lib.licenses.free;
};
}) {};
- mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ mmm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mmm-mode";
- version = "20171004.336";
+ version = "20180314.729";
src = fetchFromGitHub {
owner = "purcell";
repo = "mmm-mode";
- rev = "7661968fa6974996e58dfa28da33bca0cbde777d";
- sha256 = "066qp884qw0bqcglncxvag89i1z5rmqjc73y7ksr7ll3309y1969";
+ rev = "cb905bdc728fb3b5f9fdff8836d71b62bd717eab";
+ sha256 = "1vyvp20g2dppnywa2clpvsvn5yac4pczj4f316dx63xp4zh7193l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode";
sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
name = "mmm-mode";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/mmm-mode";
license = lib.licenses.free;
@@ -45100,12 +47390,12 @@
mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mmt";
- version = "20170519.4";
+ version = "20171231.2219";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "mmt";
- rev = "5cc5d1ee3efe675fa49d62fe0ae6b483d7ad9392";
- sha256 = "1vkj28351si30l3szjpkdgjlmp2vfjp6jxk3dvlbxicfqd1k823p";
+ rev = "e860009ce531ee05d2902309db5f804326596b45";
+ sha256 = "1l0jh657ndypi9n7dxac8hqc61fxp9c10li3w23c1r9pad4zisy5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
@@ -45184,12 +47474,12 @@
mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "mocha";
- version = "20171016.903";
+ version = "20171217.835";
src = fetchFromGitHub {
owner = "scottaj";
repo = "mocha.el";
- rev = "0f74ecf500f833f7f959187a375dacdd33d4d569";
- sha256 = "03ixygw28hzn00136747mv2r3vii3n0gif1wqgg3k7ajh7c45f5b";
+ rev = "29376477b63e319875ad0969a8103f3864efb2a0";
+ sha256 = "1j36ac827llm5ch58hs3yni4jfg0x5fypv5p1i30ffvb7dhn4mmc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -45230,8 +47520,8 @@
src = fetchFromGitHub {
owner = "sigma";
repo = "mocker.el";
- rev = "a1ddf87150f67306ae8da927117063c75588be30";
- sha256 = "1jjp3sllm41hszfj7gs90zx16ww8791dvvsfck4flxcm12bmi1c1";
+ rev = "6a1d7c9189bd721debd1a60707526e43a733f537";
+ sha256 = "0i96fn5ji1z78in4nr316sgfp2mc8lmxijslw3k9q1v50j91bcya";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16a4fe34a6f354d396c24ff13e15157510202259/recipes/mocker";
@@ -45247,12 +47537,12 @@
modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "modalka";
- version = "20170519.32";
+ version = "20171231.2213";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "modalka";
- rev = "88935a26318a574adeeb2301ae8d010f0102b1d3";
- sha256 = "1zibawwflf2wx7hzg2ld7qvmlpljfd6nb86998ckzbx75s5yb20a";
+ rev = "297d5e66628bbd788f8673656ab5f2da29f7c40b";
+ sha256 = "1agb500fc3cmhfq423bii7mz83hwnfas5xs6c1qjv3d89v7wxp69";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -45286,6 +47576,27 @@
license = lib.licenses.free;
};
}) {};
+ mode-line-bell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mode-line-bell";
+ version = "20171231.1939";
+ src = fetchFromGitHub {
+ owner = "purcell";
+ repo = "mode-line-bell";
+ rev = "dcfad0929a606af0e836d93e78be989a8ac16f87";
+ sha256 = "0vpi3x60izvwwcck6scdm4386bc67693nqwwll0mbzf8n9args4v";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/26f19808655b0242a1e9e5e5d41f7f794542e243/recipes/mode-line-bell";
+ sha256 = "1ri771hb91b7hd203f8zp83h5hcndh8ccc1y8shhqmak6a6l04wk";
+ name = "mode-line-bell";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/mode-line-bell";
+ license = lib.licenses.free;
+ };
+ }) {};
mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mode-line-debug";
@@ -45310,12 +47621,12 @@
modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "modern-cpp-font-lock";
- version = "20170625.1306";
+ version = "20180110.1231";
src = fetchFromGitHub {
owner = "ludwigpacifici";
repo = "modern-cpp-font-lock";
- rev = "b0a45dc1d7c49854988103c2570c783f46f44566";
- sha256 = "1gh7l6c4xznpjialbmswhfm1cmmbzkl2s6acjcway0nb52rshgr6";
+ rev = "9b10e1831bac34685be89e32e83ed969c4bac683";
+ sha256 = "0csaky9k24hd3qjhb3kyraycvlsdkjhmw6bbd36z0q0ac56sd2sg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock";
@@ -45352,12 +47663,12 @@
moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "moe-theme";
- version = "20170914.2111";
+ version = "20180314.2108";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "moe-theme.el";
- rev = "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e";
- sha256 = "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2";
+ rev = "c3ec67b02d55b5072ef4d32ff412019e5940d988";
+ sha256 = "1kjyv8mypcpqhhrmbnzjfrf4i40zws9sysaar8f7i08cr79idjj1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme";
@@ -45370,6 +47681,26 @@
license = lib.licenses.free;
};
}) {};
+ molecule = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "molecule";
+ version = "20180120.1514";
+ src = fetchgit {
+ url = "https://git.daemons.it/drymer/molecule.el/";
+ rev = "758dad6f5701c3a2e1146ba5895c08ef734a93d2";
+ sha256 = "0syirvzjgbf1yvcvp00a19m4gi49yh1g95ba896mh741wrkilhb4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7421b67dc51abf13bb028e467bb4c83f857a342e/recipes/molecule";
+ sha256 = "0kdwmn4gb382igy979y7x2fdqcnfxlb4dvqvm6w7ghs564grzgj4";
+ name = "molecule";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/molecule";
+ license = lib.licenses.free;
+ };
+ }) {};
molokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "molokai-theme";
@@ -45499,12 +47830,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "20171013.236";
+ version = "20180314.501";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "019e07947426f0192fc3458f3f72c19031b607de";
- sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz";
+ rev = "da23ef64d4848636e47a026259526575381bd164";
+ sha256 = "08py8dmwlqhc16fjcjf24dmpfbv2xpq8b0l43cx8f44f6791r2qf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -45517,15 +47848,36 @@
license = lib.licenses.free;
};
}) {};
+ monotropic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "monotropic-theme";
+ version = "20180218.357";
+ src = fetchFromGitHub {
+ owner = "caffo";
+ repo = "monotropic-theme";
+ rev = "b46e94a712e01cebe69a6f7d950e91d7c7dd1b66";
+ sha256 = "0lmyfqi6c5f2cr9ha1l2qnc4ayigb1zj9gz8xi5xxadhad3zymwh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/38222d109ece0030b0bfafb242aa100694b2bfcf/recipes/monotropic-theme";
+ sha256 = "129yqjh4gaab1kjijzkzbw50alzdiwmpv9cl3lsy04m8zk02shl8";
+ name = "monotropic-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/monotropic-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monroe";
- version = "20170623.103";
+ version = "20180116.817";
src = fetchFromGitHub {
owner = "sanel";
repo = "monroe";
- rev = "2bb59ac84e030f7047e7443e2df25185b397a5d3";
- sha256 = "0jcyidk62djd47dv4m53k7wky92982pzz87n8zq1fijqic63iib9";
+ rev = "609dfd82897c14324a99206ebf450377e5c6257e";
+ sha256 = "07qyxc7mjly0j2x7aqbpnn7nd5fp2pck02ks25m62gn4a1sq4v3z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -45538,6 +47890,27 @@
license = lib.licenses.free;
};
}) {};
+ moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "moody";
+ version = "20180316.340";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "moody";
+ rev = "890218c6c175f6f3efbf584dd27b8702a16b8272";
+ sha256 = "05q8l32mwz6sb40lflh6vwhnqj41sfmw7dp7lw3qlhg2skwjvc29";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody";
+ sha256 = "095241sjw330fb5lk48aa4zx8xbzk8s4ml22n6a8bzr99nkhn5jy";
+ name = "moody";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/moody";
+ license = lib.licenses.free;
+ };
+ }) {};
moonscript = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "moonscript";
@@ -45713,8 +48086,8 @@
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "move-text";
- rev = "bdaf3e3a0d33cd528cad1d10facbdf0635232e4d";
- sha256 = "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1";
+ rev = "7cbc941a9150468609010a93c429117da2523903";
+ sha256 = "1irrcbqi1m6pcsjkbd3nqri158qhl0bcynciwwxdfqb45i67a1m9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text";
@@ -45734,8 +48107,8 @@
src = fetchFromGitHub {
owner = "retroj";
repo = "mowedline";
- rev = "bca452544b5e200034d0505a767090a975a21a28";
- sha256 = "07bjkcgy2qvnkrlb5ypgbf969ka0pchz305326r7vfswlvkvihdg";
+ rev = "6121b7d4aacd18f7b24da226e61dbae054e50a7c";
+ sha256 = "16j3y4hffnv2rg97p49hqz3x1icp7qkpcjxhalny5l4gysx9mfqg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -45793,12 +48166,12 @@
mozc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mozc";
- version = "20160102.1506";
+ version = "20180101.0";
src = fetchFromGitHub {
owner = "google";
repo = "mozc";
- rev = "4767ce2f2b6a63f1f139daea6e98bc7a564d5e4e";
- sha256 = "1azx128zsr7mlg2k538483c3qi1zmm8cc4z8sk06534wnx7wxs88";
+ rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8";
+ sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc";
@@ -45895,6 +48268,48 @@
license = lib.licenses.free;
};
}) {};
+ mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }:
+ melpaBuild {
+ pname = "mpdel";
+ version = "20180316.115";
+ src = fetchFromGitHub {
+ owner = "mpdel";
+ repo = "mpdel";
+ rev = "78bcaadd5471740a6c61a7e338086bf7a6ebfe54";
+ sha256 = "1zgv6z3mp6bjw8akqhx6add00w9qclqf94mmqmfhbg3mqaky6zgh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel";
+ sha256 = "1py6zk16yl7pyql2qxzd770clzszw7c769hw70n963kns1qmpif8";
+ name = "mpdel";
+ };
+ packageRequires = [ emacs libmpdel ];
+ meta = {
+ homepage = "https://melpa.org/#/mpdel";
+ license = lib.licenses.free;
+ };
+ }) {};
+ mpmc-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }:
+ melpaBuild {
+ pname = "mpmc-queue";
+ version = "20180303.1229";
+ src = fetchFromGitHub {
+ owner = "smizoe";
+ repo = "mpmc-queue";
+ rev = "df07d6bef7468edb1d73ef73b8331b94d0e5d0ca";
+ sha256 = "17817l3afghg9z8jxkj61yg85plmr74ki3wf4hz685llx8fr69w0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c/recipes/mpmc-queue";
+ sha256 = "08jcmhfl87nsg6zgv582yfs152bqihbcssh085gxxqn2x99li354";
+ name = "mpmc-queue";
+ };
+ packageRequires = [ emacs queue ];
+ meta = {
+ homepage = "https://melpa.org/#/mpmc-queue";
+ license = lib.licenses.free;
+ };
+ }) {};
mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }:
melpaBuild {
pname = "mpv";
@@ -45919,12 +48334,12 @@
msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "msvc";
- version = "20170610.1044";
+ version = "20171225.738";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "msvc";
- rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577";
- sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk";
+ rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3";
+ sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -45940,12 +48355,12 @@
mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mtg-deck-mode";
- version = "20170925.1338";
+ version = "20180129.1637";
src = fetchFromGitHub {
owner = "mattiasb";
repo = "mtg-deck-mode";
- rev = "546a62ada70aa89d325cc3941c8c9379a4c21553";
- sha256 = "1gbgsfd04jdw6jrsp13h13jkkac5ndrn684pl18q0wjgx9kk11b6";
+ rev = "4eeb1a5115d60d064dcd79b9e0dd48619cd2ee4c";
+ sha256 = "16qmqqq7297idr2x4fr22ihhx6z91484x0hpmskbh6fn05bvls2y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -45982,12 +48397,12 @@
mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "mu4e-alert";
- version = "20170901.1027";
+ version = "20180304.2246";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "mu4e-alert";
- rev = "ef90cd0f0fb6c841f326db5cad276567eb5f96b5";
- sha256 = "0sym7mp1via65h883f5h45cbfxq58qck7ypcvcfdmnmn9jnl3j9d";
+ rev = "96a293b28646f4620e257f24748becc4a06843cd";
+ sha256 = "01rgsd958shph01ialk0lp3snxqydvjkiik170jshfls1jric1di";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
@@ -46024,12 +48439,12 @@
mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mu4e-maildirs-extension";
- version = "20170217.40";
+ version = "20171119.1125";
src = fetchFromGitHub {
owner = "agpchil";
repo = "mu4e-maildirs-extension";
- rev = "485438c466464fd4fe0c4b3305cd3110455f0f05";
- sha256 = "1rj5vcb5f2xs5wvb3z5wd4866cjdzn8lmkbk6xflqq9wrakzl1kh";
+ rev = "c3ebeedd5c12e190949aed53c3040d51d21de58f";
+ sha256 = "19a95f0sp5psq00mgnbw3azn9c3db3gafax3svih1qk1ff4yf3hp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-maildirs-extension";
@@ -46126,26 +48541,47 @@
license = lib.licenses.free;
};
}) {};
- multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+ multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi-project";
- version = "20170604.1514";
+ version = "20171217.1211";
src = fetchhg {
url = "https://bitbucket.com/ellisvelo/multi-project";
- rev = "04eeab45d19b";
- sha256 = "11mn36m40i93wig79kj1jp2i3ggck1qsfw2z9q24a1zxj2gns12i";
+ rev = "a6e7c1542c0b";
+ sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
name = "multi-project";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/multi-project";
license = lib.licenses.free;
};
}) {};
+ multi-run = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }:
+ melpaBuild {
+ pname = "multi-run";
+ version = "20180122.709";
+ src = fetchFromGitHub {
+ owner = "sagarjha";
+ repo = "multi-run";
+ rev = "87d9eed414999fd94685148d39e5308c099e65ca";
+ sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run";
+ sha256 = "1iv4a49czdjl0slp8590f1ya0vm8g2ycnkwrdpqi3b55haaqp91h";
+ name = "multi-run";
+ };
+ packageRequires = [ emacs window-layout ];
+ meta = {
+ homepage = "https://melpa.org/#/multi-run";
+ license = lib.licenses.free;
+ };
+ }) {};
multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi-term";
@@ -46401,12 +48837,12 @@
mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mwim";
- version = "20161004.647";
+ version = "20180227.852";
src = fetchFromGitHub {
owner = "alezost";
repo = "mwim.el";
- rev = "e53da113b88a7e0693fd8f91862ce5948ad80a5b";
- sha256 = "0vm6iynkx328zc4ww6zjibj7impiz53g2cqzxfa8bjfs2src2sw3";
+ rev = "462207227b98a6a4356d51419f5ad5ba9356e5cf";
+ sha256 = "06lw6064i82daasgm87gm58d142pypqc1q3cnx1cm35hyj4skd32";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim";
@@ -46485,12 +48921,12 @@
mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "mysql-to-org";
- version = "20170205.1306";
+ version = "20180123.714";
src = fetchFromGitHub {
owner = "mallt";
repo = "mysql-to-org-mode";
- rev = "d87e9b6117fc0db4b156e8a12550cf9ee4bd692a";
- sha256 = "10wz20842j6yj4k9kg7pd93pzppsc31klbfzlvlkfywqv6j311cz";
+ rev = "2526205ad484ad3fa38d41e7d537ace38c27645c";
+ sha256 = "1yinix08mzr7v2jm3yx1j3h15cw7i202wi100nmnmvqrylpd9zr2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org";
@@ -46531,8 +48967,8 @@
src = fetchFromGitHub {
owner = "myTerminal";
repo = "myterminal-controls";
- rev = "3edcef051f882342ca769b84527bf92dfb755e14";
- sha256 = "0g9vyy639aqnk0g9rmrlszc7i0rl2f2ygnzfs4pwakgfiwig5r0c";
+ rev = "aae4f50f9f22d374eaaac2ce95e522f13dcc8fc0";
+ sha256 = "08xgzrpp5l5d43j1b8ai3d41jzk9i70r2pqdcj53h79ml56bicgp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls";
@@ -46653,12 +49089,12 @@
nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nameless";
- version = "20161012.1214";
+ version = "20180215.1421";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "Nameless";
- rev = "108f16e743aecd35401c0e914c896572cf1d5082";
- sha256 = "110bxdn2sqxlxqffaxp0yc6g2hglbv91az00mmgc01n6hjxcrc3h";
+ rev = "79d7ba8e9b8f3093e93172bdb4c5a4d31b0fa3e0";
+ sha256 = "11xghz03csj5w3qfbjyr48liaxr08gl6gy73hmmrq2bl57six5n0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
@@ -46716,12 +49152,12 @@
nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nand2tetris";
- version = "20170306.1827";
+ version = "20171201.1013";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e";
- sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z";
+ rev = "33acee34d24b1c6a87db833b7d23449cf858f64f";
+ sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris";
@@ -46737,12 +49173,12 @@
nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
melpaBuild {
pname = "nand2tetris-assembler";
- version = "20161109.1637";
+ version = "20171201.1013";
src = fetchFromGitHub {
owner = "CestDiego";
repo = "nand2tetris.el";
- rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e";
- sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z";
+ rev = "33acee34d24b1c6a87db833b7d23449cf858f64f";
+ sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler";
@@ -46778,12 +49214,12 @@
naquadah-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "naquadah-theme";
- version = "20160819.121";
+ version = "20180212.440";
src = fetchFromGitHub {
owner = "jd";
repo = "naquadah-theme";
- rev = "37e822ccea0ff4a6eb79ea6615a1fd6dc6c72d51";
- sha256 = "1z6fy97x9753fprvrmnmplnqwr6xl8hgvwkpi6fp6awcb0wrza3d";
+ rev = "999056526db5095ce600c83672fc80cb744bd93e";
+ sha256 = "1f10598m4vcpr4md6hpdvv46zi6159rajxyzrrlkiz0g94v8y6rl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/naquadah-theme";
@@ -46988,12 +49424,12 @@
ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ncl-mode";
- version = "20170903.2355";
+ version = "20180128.2303";
src = fetchFromGitHub {
owner = "yyr";
repo = "ncl-mode";
- rev = "84599a730169b9b19f9dcc532e20dcdc9648bbaa";
- sha256 = "0sqbrvlx9n7abn71r4hb5fgps7nm6cfyg84hjwdbkrw0cgy2w1hc";
+ rev = "602292712a9e6b7e7c25155978999e77d06b7338";
+ sha256 = "0a1pwhnllyb1q45gjfhply0q2p4bk208a19z9gaf635d7ck9qhny";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode";
@@ -47030,12 +49466,12 @@
neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "neato-graph-bar";
- version = "20170731.2341";
+ version = "20171230.1753";
src = fetchFromGitLab {
owner = "RobertCochran";
repo = "neato-graph-bar";
- rev = "3ebd5168c9b8cc56cc4163206c03864b9b802f27";
- sha256 = "133k1lwmb7ky91ij03nd4vipkivvx4bz56m4waf1pdmaynsidy6j";
+ rev = "c59f15ed9a40aecc174aa22c4bbfa7978e182705";
+ sha256 = "0bdgsxdlwpkd3hjnw1jmj30slakzmj2pinj3pyr5qqba9apxnvri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar";
@@ -47055,8 +49491,8 @@
src = fetchFromGitHub {
owner = "rsdn";
repo = "nemerle";
- rev = "847d1343e63c0a2d25a43f8432c4d750e4e9e7d0";
- sha256 = "0wriamdich72h1m0rmhx1s38ph6q8ak0rfd39kyycw7v8bvwgv08";
+ rev = "59b28607968a9bee060b42eac55c69c37d1c0e69";
+ sha256 = "1qba0zg37irnk35pgiasyslp9l0lfiysms1bw3znscay5s20lm8m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
@@ -47153,6 +49589,27 @@
license = lib.licenses.free;
};
}) {};
+ network-watch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "network-watch";
+ version = "20171123.346";
+ src = fetchFromGitHub {
+ owner = "jamiguet";
+ repo = "network-watch";
+ rev = "958dd0d419e4f9402648a86b754091ba346e01b8";
+ sha256 = "1xqp7aghc8xd1733azl27mjf57qvm0036qbkqmaks2ip8s8c6arj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e129679b3e2074af3e3de1b2ccce53a2fa5e9f65/recipes/network-watch";
+ sha256 = "0y3vjrh9vlfg44c01ylkszisliwfy5zb8c5z3qrmf3yj4q096f42";
+ name = "network-watch";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/network-watch";
+ license = lib.licenses.free;
+ };
+ }) {};
never-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "never-comment";
@@ -47219,12 +49676,12 @@
ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }:
melpaBuild {
pname = "ng2-mode";
- version = "20170504.2007";
+ version = "20180216.743";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "ng2-mode";
- rev = "adbfe16a47cf26edeb1b508cbedae5307b4efbf6";
- sha256 = "0ll850wpr4dyh25mq41afwbz17mqz82i53hfn970n9vw2icf36py";
+ rev = "d41ed14f276f1f08fb7eaacc863f471654e2c2fa";
+ sha256 = "0rys2gnbw9d32i1gqqf46mbf36x2s9lz7v144yw901b2i8p6c5ja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode";
@@ -47300,15 +49757,35 @@
license = lib.licenses.free;
};
}) {};
+ nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nikola";
+ version = "20170703.1321";
+ src = fetchgit {
+ url = "https://git.daemons.it/drymer/nikola.el/";
+ rev = "964715ac30943c9d6976999cad208dc60d09def0";
+ sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef4f7c2f1c48edd7b4a6fdcda51908d216c631c/recipes/nikola";
+ sha256 = "1d0a80y910klayb9jf0ahn5lj9l6xdhwcp2in3ridmqislavrcnv";
+ name = "nikola";
+ };
+ packageRequires = [ async emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/nikola";
+ license = lib.licenses.free;
+ };
+ }) {};
nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "nim-mode";
- version = "20171028.2219";
+ version = "20180212.1040";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nim-mode";
- rev = "10296ac3d9ee70bf31180b5158ac3b4a58f45d22";
- sha256 = "0mswc1f141xif3h4zshza0ar64s99fp6j3l795c67a3yvmc7l50v";
+ rev = "bff7065f6d2419ec517d247f0f3aaf935820064e";
+ sha256 = "0iqsm843msw41jxhfi7dbsj6x4qanvd84xhg2j6wl6ncabdmwnjm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -47324,12 +49801,12 @@
nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nimbus-theme";
- version = "20171110.1011";
+ version = "20180309.430";
src = fetchFromGitHub {
owner = "m-cat";
repo = "nimbus-theme";
- rev = "d10740a6b9e787e7d56dc1d58b11b768cc4f79bc";
- sha256 = "1h5myqvlrniylgcrpxrsih7qkmjhh8y74ysda89p0r7ky61977r8";
+ rev = "0527060cc8b27dc26496a3a9b20ee6a8526e9efe";
+ sha256 = "0iyj61870g84m6pr0vib3dj5dcrhrnwdiad6xzp8j2anf0gc23ii";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -47366,12 +49843,12 @@
nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-buffer";
- version = "20170809.1128";
+ version = "20180212.718";
src = fetchFromGitHub {
owner = "shlevy";
repo = "nix-buffer";
- rev = "b922497ea0af39fdf1a7e856d0cd2ce81d98d76f";
- sha256 = "1db0cjsq99b1z6786g3j8y39vj3gga7x6yzkilxdp7z6scs1qdwr";
+ rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099";
+ sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -47387,12 +49864,12 @@
nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-mode";
- version = "20170831.1721";
+ version = "20180215.1331";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix-mode";
- rev = "3294f8a2f83ace2d71f16c274a262ff76be412dc";
- sha256 = "1p1dka9v8fm6rklspkscj5rs5f21dwi3bq44d3hjqw6xva4q7bx4";
+ rev = "0ac0271f6c8acdbfddfdbb1211a1972ae562ec17";
+ sha256 = "157vy4xkvaqd76km47sh41wykbjmfrzvg40jxgppnalq9pjxfinp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
@@ -47531,15 +50008,36 @@
license = lib.licenses.free;
};
}) {};
+ no-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "no-emoji";
+ version = "20171214.2310";
+ src = fetchFromGitHub {
+ owner = "ecraven";
+ repo = "no-emoji";
+ rev = "329b4093bf38f3f4b0e4760c70270d3b45ee554e";
+ sha256 = "1799wh6qy2yaadkdvnvp37320wxkhal8vlnj47d32a1bv8l8s91q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/af6b04c1f95468254f2cf361964df9fd25d23586/recipes/no-emoji";
+ sha256 = "1lr6bzjxwn3yzw0mq36h2k2h8bqb1ngin42swhv022yx6a022zn2";
+ name = "no-emoji";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/no-emoji";
+ license = lib.licenses.free;
+ };
+ }) {};
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "20171015.2358";
+ version = "20180125.1539";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "no-littering";
- rev = "79c18c7efffd80446d81201b4c7dd92dde6cac3a";
- sha256 = "1xganpzb7sy5dlazjzrx9cif1r1n8lf3za0jwlq806w7601g5nym";
+ rev = "5156e005d59453f2608b9c38e9fe92ba8df550db";
+ sha256 = "086y8y5309hhmhiq9c5yqvya0fm6j3vxba47861ckwjqyp7d3ygk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -47699,15 +50197,36 @@
license = lib.licenses.free;
};
}) {};
+ nofrils-acme-theme = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nofrils-acme-theme";
+ version = "20180227.1353";
+ src = fetchFromGitLab {
+ owner = "esessoms";
+ repo = "nofrils-theme";
+ rev = "0bb6f199ace1488613884075fe588f02000bb0ab";
+ sha256 = "1aslhxk5mp6khf66ac4c441vywhiqpb4kyajagb8b1p10z8hrqva";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme";
+ sha256 = "01xqsn8whczv34lfa9vbm5rpvrvsrlpav8pzng10jvax1a9wdp3a";
+ name = "nofrils-acme-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/nofrils-acme-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nord-theme";
- version = "20171005.1039";
+ version = "20180102.1001";
src = fetchFromGitHub {
owner = "arcticicestudio";
repo = "nord-emacs";
- rev = "be32879416bbed1d6524f7c30ac53fbfa5a0e024";
- sha256 = "0q347f9bjayfl8y8vz83kjamf1lp58386nhy0iacjxsq4riwpric";
+ rev = "b5c1dc762fe3acaa88a0ce9640085d45d0109c43";
+ sha256 = "0j1cbwlh646gkjp70maqbq7izchgc23wdax50ykgkw3mxhjrlsf2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -47720,6 +50239,27 @@
license = lib.licenses.free;
};
}) {};
+ nordless-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nordless-theme";
+ version = "20180215.454";
+ src = fetchFromGitHub {
+ owner = "lthms";
+ repo = "nordless-theme.el";
+ rev = "aeecad74c19121fa2f68dfd85efb9a4f34e8a911";
+ sha256 = "1ypwh4kz9kjxikmhgh8aac8ihnyinijsvsjwa8s4lc1j4nfzffih";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3de9da6cb8c1a75ff1d41a69e156c21be00713b6/recipes/nordless-theme";
+ sha256 = "1ylvqh5hf7asdx2mn57fsaa7ncfgfzq1ss50k9665k32zvv3zksx";
+ name = "nordless-theme";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/nordless-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "nose";
version = "20140520.948";
@@ -47741,15 +50281,15 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "20170927.415";
+ version = "20180104.1635";
src = fetchgit {
- url = "git://git.notmuchmail.org/git/notmuch";
- rev = "cf08295c503a2cefc4c51c5398f3fc1159521ff1";
- sha256 = "1vc49c5n5jdkhvy436avklcvpw6nhdk9kw9gybd6izjbrcjgy62c";
+ url = "https://git.notmuchmail.org/git/notmuch";
+ rev = "a9f1c7c294526afb2a2ac18003a654ea4c780b7b";
+ sha256 = "0pv6rpymhf1m10011hw5plsfz18d7gm10w396dc2rm05c9szffjr";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
- sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch";
+ sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7";
name = "notmuch";
};
packageRequires = [];
@@ -47782,12 +50322,12 @@
nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nov";
- version = "20171104.1641";
+ version = "20180215.1206";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "nov.el";
- rev = "7d14b6a2aa649e2213348883893a24a6a6083cb9";
- sha256 = "0l8b4847rig76d974akpkbb43i7pnhx75wmlgczqscmripspdxyb";
+ rev = "b0eab94b84464aa4508ccfee59af5b8df49666a2";
+ sha256 = "0r4wy99kpdzs0c8b6ini8k0xixjrb48bbml3nz3sfxy3w7kb4kyb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov";
@@ -47908,12 +50448,12 @@
nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }:
melpaBuild {
pname = "nu-mode";
- version = "20171112.1324";
+ version = "20180220.1315";
src = fetchFromGitHub {
owner = "pyluyten";
repo = "emacs-nu";
- rev = "110f6382ca8f4a1742aa42bc1caf8eb7841b49d2";
- sha256 = "03znxrmqya446qqjp8c7fr6dx6gkx9v6v984hdp1jbki5i9i2h8j";
+ rev = "9c9fcb1395a3bd317cb5433c6c4defaa9bb3c7dd";
+ sha256 = "0snynh8mk1ivdphrrpznh16szw2jcagxl7w056wv7j2zmb17agcx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode";
@@ -48061,12 +50601,12 @@
nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "nvm";
- version = "20170513.1501";
+ version = "20171217.836";
src = fetchFromGitHub {
owner = "rejeep";
repo = "nvm.el";
- rev = "61590e7fdeb19b1d866d26e48aef1af4767e5709";
- sha256 = "04z8zkgp0km575ijijpvmrqs0aa2f0878c5n4rl91hs1grq93mjf";
+ rev = "bc0a33257ec16e9f575bb6914b5949199897ada9";
+ sha256 = "07fb6xxnij3nyhvf1yfv58zglawijfr0apmgx22qgaray53rp3nw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm";
@@ -48187,12 +50727,12 @@
ob-async = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-async";
- version = "20170705.2131";
+ version = "20171114.1936";
src = fetchFromGitHub {
owner = "astahlman";
repo = "ob-async";
- rev = "fce7355a7982089c11e264ca29ab320a7e792dd1";
- sha256 = "03lgi83ym0509q1y4ar7s0d7yi80m85m1sb1rsmsv5awbsw2cym8";
+ rev = "99a6f24191cacb343d6090ecc8c1c67f768b2e22";
+ sha256 = "1cw62nsdnmllpkn4mqi80vp6s17yf6an418gvr06z8cxqndw07h1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async";
@@ -48210,13 +50750,13 @@
pname = "ob-axiom";
version = "20171103.1548";
src = fetchgit {
- url = "https://bitbucket.org/pdo/axiom-environment.git";
+ url = "https://bitbucket.org/pdo/axiom-environment";
rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5";
sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/ob-axiom";
- sha256 = "0ks0q4ych3770gqds7kmccvx27fay7gfygi3a9n7c01p4snfai8l";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/ob-axiom";
+ sha256 = "17qh4hsr3aw4d0p81px3qcbax6dv2zjhyn5n9pxqwcp2skm5vff5";
name = "ob-axiom";
};
packageRequires = [ axiom-environment emacs ];
@@ -48270,12 +50810,12 @@
ob-cfengine3 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-cfengine3";
- version = "20170915.634";
+ version = "20180102.1012";
src = fetchFromGitHub {
owner = "nickanderson";
repo = "ob-cfengine3";
- rev = "f38f87256efcb2b02f5c7042900087be941c1ddc";
- sha256 = "09xn84d2vy3kxk2xihjml8zzrhv2cz2jy20dg7w6ll9wn38gs33h";
+ rev = "93ebcfceec3734f4bd187ae123686187d66fd401";
+ sha256 = "0cyjdg8vzaf31gqsgmz5znw7v2p36jiz3sj1jvw7vhr8s4iar81i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3";
@@ -48309,22 +50849,22 @@
license = lib.licenses.free;
};
}) {};
- ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ob-coffeescript = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-coffeescript";
- version = "20170719.121";
+ version = "20180125.2319";
src = fetchFromGitHub {
owner = "brantou";
repo = "ob-coffeescript";
- rev = "b70f3d822c707cb02333fcb739ba4874614cad2a";
- sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd";
+ rev = "5a5bb04aea9c2a6eab5b05f90f5c7cb6de7b4261";
+ sha256 = "0yy20w1127xmz0mx2swbr294vg0jh8g0ibj5bpdf55xwdnv6im2l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p";
name = "ob-coffeescript";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/ob-coffeescript";
license = lib.licenses.free;
@@ -48333,12 +50873,12 @@
ob-crystal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-crystal";
- version = "20171101.347";
+ version = "20180125.2318";
src = fetchFromGitHub {
owner = "brantou";
repo = "ob-crystal";
- rev = "9d58b880b74e0ad83b37596bb44635e5d7ae5c3f";
- sha256 = "11qly91h6cm0qdj2dx8lvmfgp7bakrvvwf106rqh4f98y1qv22xh";
+ rev = "d84c1adee4b269cdba06a97caedb8071561a09af";
+ sha256 = "1fny4fj4407lcp4k3379gbixk3wd171snw49p1kny2mvxrliz22h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal";
@@ -48400,8 +50940,8 @@
src = fetchFromGitHub {
owner = "mzimmerm";
repo = "ob-dart";
- rev = "2e463d83a3fe1c9c86f2040e0d22c06dfa49ecbf";
- sha256 = "0qkyyrrgs0yyqzq6ks1xcb8iwm1qfxwan1n8ichmrsbhwsc05jd3";
+ rev = "04d63b922a5469506560ca0c00678e57131e0269";
+ sha256 = "1r0r0dqsr44kcbj2w96rbx8alvkkfzc98ac35zb4ncy1bf71jhfb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3219b9623587365f56e9eeb4bd97f3dc449a11/recipes/ob-dart";
@@ -48463,8 +51003,8 @@
src = fetchFromGitHub {
owner = "juergenhoetzel";
repo = "ob-fsharp";
- rev = "65ec2b626ac55313d8a04e746940370f615fed1e";
- sha256 = "12k6z3zsh8av3avhl2a62v475bpxpcdy56v8i248bv1wgd3ma2mi";
+ rev = "0b2fdd9bb4f38af8b5cf4914627af52f5b43d9f7";
+ sha256 = "1z1m2dqnvyyv9ff289p8x1hajnz9n0mmfkrkyl1zvipaqd9mgljw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/89bc8c5fe6db0573109e82b3d1350d33d6d8aff5/recipes/ob-fsharp";
@@ -48522,12 +51062,12 @@
ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-hy";
- version = "20171101.344";
+ version = "20180125.2316";
src = fetchFromGitHub {
owner = "brantou";
repo = "ob-hy";
- rev = "a3512f274709dc4ab6c18d7955d361f8715505f0";
- sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw";
+ rev = "44b1afb42c8a72febdbe68b6816134bc5957e5ba";
+ sha256 = "0j34fsyqz28qjpggibbaqfwja10f06d9gh3pndlj6ghfx8i0plrh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy";
@@ -48543,12 +51083,12 @@
ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-ipython";
- version = "20171111.740";
+ version = "20180224.153";
src = fetchFromGitHub {
owner = "gregsexton";
repo = "ob-ipython";
- rev = "0cd6f75657df904637fbef7b540344ef5c559c3f";
- sha256 = "1rmlc6xnj6nh39rscz9963k5wlppiysibby32r314lxk6n03gj0l";
+ rev = "7147455230841744fb5b95dcbe03320313a77124";
+ sha256 = "1a10fc2jk37ni5sjjvf87s5nyaz2a6h2mlj5dxh4dhv5sd3bb85p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython";
@@ -48666,27 +51206,6 @@
license = lib.licenses.free;
};
}) {};
- ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
- melpaBuild {
- pname = "ob-php";
- version = "20171017.2206";
- src = fetchFromGitHub {
- owner = "stardiviner";
- repo = "ob-php";
- rev = "c281c1e17f0fd7de4adb6c3e6029dc2bd76beca1";
- sha256 = "1c0967cpimmr5j7ymr4654y62f615dfrv1h3385i7n57jsvqr6bs";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php";
- sha256 = "0n6m6rpd0rsk6idhxs9qf5pb6p9ch2immczj5br7h5xf1bc7x2fp";
- name = "ob-php";
- };
- packageRequires = [ org ];
- meta = {
- homepage = "https://melpa.org/#/ob-php";
- license = lib.licenses.free;
- };
- }) {};
ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-prolog";
@@ -48708,27 +51227,6 @@
license = lib.licenses.free;
};
}) {};
- ob-redis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
- melpaBuild {
- pname = "ob-redis";
- version = "20160411.2013";
- src = fetchFromGitHub {
- owner = "stardiviner";
- repo = "ob-redis";
- rev = "244a21569499a3d8cb39f651fbf00ce26accf983";
- sha256 = "1f8qz5bwz5yd3clvjc0zw3yf9m9fh5vn2gil69ay1a2n00qwkq78";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/26477b37952bc050d8904929b3a5b027a59842e6/recipes/ob-redis";
- sha256 = "1xsz4cc8cqx03ckpcwi7dc3l6v4c5mdbby37a9i0n5q6wd4r92mm";
- name = "ob-redis";
- };
- packageRequires = [ org ];
- meta = {
- homepage = "https://melpa.org/#/ob-redis";
- license = lib.licenses.free;
- };
- }) {};
ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }:
melpaBuild {
pname = "ob-restclient";
@@ -48792,27 +51290,6 @@
license = lib.licenses.free;
};
}) {};
- ob-smiles = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, smiles-mode }:
- melpaBuild {
- pname = "ob-smiles";
- version = "20160717.421";
- src = fetchFromGitHub {
- owner = "stardiviner";
- repo = "ob-smiles";
- rev = "c23c318bf8bbe2e266967388221893fbecdd2fd5";
- sha256 = "1iz8dli9i027wcg39rfabr6fx2b45waplx9mzkk1ri787rmapkpn";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e377955c0c36459698aae429df0a78e84793798f/recipes/ob-smiles";
- sha256 = "0d07ph6mlbcwmw0rd18yfd35bx9w3f5mb3nifczjg7xwlm8gd7jb";
- name = "ob-smiles";
- };
- packageRequires = [ org smiles-mode ];
- meta = {
- homepage = "https://melpa.org/#/ob-smiles";
- license = lib.licenses.free;
- };
- }) {};
ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }:
melpaBuild {
pname = "ob-sml";
@@ -48834,27 +51311,6 @@
license = lib.licenses.free;
};
}) {};
- ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }:
- melpaBuild {
- pname = "ob-spice";
- version = "20170801.2222";
- src = fetchFromGitHub {
- owner = "stardiviner";
- repo = "ob-spice";
- rev = "b296232e28f61366265084fafb2f47876d987069";
- sha256 = "1s2jyx75xkqbkm9g4i3h1f0rz9ms5dbs7zqavdiswq9mr8qx1kwq";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice";
- sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2";
- name = "ob-spice";
- };
- packageRequires = [ org spice-mode ];
- meta = {
- homepage = "https://melpa.org/#/ob-spice";
- license = lib.licenses.free;
- };
- }) {};
ob-sql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-sql-mode";
@@ -49156,8 +51612,8 @@
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-indent";
- rev = "002e047d848beb0e0b77538f0674dd171efc9d66";
- sha256 = "1al44f7nrh4jbx4vdpbps92pk6px0my43b24brinck186j8d7vc4";
+ rev = "9bbd079199ef7308d4fa3cf0fafd2d7d8b4bf2d4";
+ sha256 = "117xwqxnmg2f2np1zqyc8hhnxmrrd2gcixqclb5lkwk68kisjmi5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -49299,12 +51755,12 @@
olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "20171102.1906";
+ version = "20180308.638";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "cd2fdca25935a47a5d3b0417a206f886579f8c45";
- sha256 = "0cm630yvsdib868xl9x1ng3i64dcyzvq8pzhhaz99b7zc7wfayvh";
+ rev = "b1759abbb2be27107c0c09beae10ca5e4c556b56";
+ sha256 = "0zdxvd3xh5p9j8si2kfmavzdjwpz9352nr6i0c550m10lrnixnv4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -49443,36 +51899,15 @@
license = lib.licenses.free;
};
}) {};
- omniref = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "omniref";
- version = "20160225.1424";
- src = fetchFromGitHub {
- owner = "dotemacs";
- repo = "omniref.el";
- rev = "3ab7a8b10f611f8e9e7922e7e2b42d1c73e93594";
- sha256 = "03x150c60fsw65n22ajpvjnb2w9jisds9xbxl2pwgcmvfdnxmhw9";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/163d77d2b0d7759f3747239089d8761a7db13a9e/recipes/omniref";
- sha256 = "0lgw1knqppdg046zqx4m7nbzvsasr89wa9i4594hf46w1094dabj";
- name = "omniref";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/omniref";
- license = lib.licenses.free;
- };
- }) {};
omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
melpaBuild {
pname = "omnisharp";
- version = "20171105.912";
+ version = "20180121.702";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "ad4a19c60f7dc3d52a5b11febdcc9b78930a1e7d";
- sha256 = "0jc2ap9l0cc636kssld1bqalbriib57sw1rzz45s8r19jqa8w5gm";
+ rev = "c00a3a9157432c578fffb79169232e4a81d4ad31";
+ sha256 = "0ghwqf1wbiywzdx0qlgs4y94z4ivlgac8rpg1bimlb8xfx62sia0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -49520,12 +51955,12 @@
on-parens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
melpaBuild {
pname = "on-parens";
- version = "20150702.1506";
+ version = "20180202.1441";
src = fetchFromGitHub {
owner = "willghatch";
repo = "emacs-on-parens";
- rev = "16a145bf73550d5000ffbc2725c541a8458d0d3c";
- sha256 = "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y";
+ rev = "7a41bc02bcffd265f8a69ed4b4e0df3c3009aaa4";
+ sha256 = "0pkc05plbjqfxrw54amlm6pzg9gcsz0nvqzprplr6rhh7ss419zn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2ea1eb5eb5a40e95ba06b0a4ac89ad8843c9cc2c/recipes/on-parens";
@@ -49959,12 +52394,12 @@
org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-board";
- version = "20170507.858";
+ version = "20180226.1136";
src = fetchFromGitHub {
owner = "scallywag";
repo = "org-board";
- rev = "2978aee8981a2ff5c09104b2d8b055957b277078";
- sha256 = "1vbpwzzrl5vq0vwkwn0cr1w9wkfbjd9rmxbpsddm0sbx7k4m3am9";
+ rev = "eef4cd47ea221dcdc352b5af578007bcde5f3e6a";
+ sha256 = "1sj5n2gynwc14kl6cjmdg8mvs0nc187nfj4czd3rbz4yqq818l3b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -50001,12 +52436,12 @@
org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-brain";
- version = "20171004.1305";
+ version = "20180223.1455";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "org-brain";
- rev = "35d46695ceffff4069e66fa2a4f039509f1a3c7e";
- sha256 = "0c0jps0gxsk3m8s78yp8141wh7g2nx8acd1jc0v4ffmlr8qi2csj";
+ rev = "22eacef9fd0e66508888016b5d33b6ce85727573";
+ sha256 = "16mz2vv3p4x1x400ylx5321svpczsydzkkb93j21cmk3b6a1jibg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -50022,12 +52457,12 @@
org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-bullets";
- version = "20140918.1137";
+ version = "20171127.526";
src = fetchFromGitHub {
owner = "emacsorphanage";
repo = "org-bullets";
- rev = "b70ac2ec805bcb626a6e39ea696354577c681b36";
- sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
+ rev = "5b096148bc37306f73b27da838dca751d5b1936f";
+ sha256 = "1yxikvbsbrqv9kjh1dc55w3xm44x4s7gamxq4f6jm045p8abfqrr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6/recipes/org-bullets";
@@ -50103,6 +52538,27 @@
license = lib.licenses.free;
};
}) {};
+ org-chef = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "org-chef";
+ version = "20180304.1104";
+ src = fetchFromGitHub {
+ owner = "Chobbes";
+ repo = "org-chef";
+ rev = "94427d5e48cadce45a906de16fff42676903fd9f";
+ sha256 = "10hwbfhjz2bwiralgsqwzhjgjzfil51gs8qhig8vkbxq9brhcgd4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/23b9e64887a290fca7c7ab2718f627f8d728575f/recipes/org-chef";
+ sha256 = "1xzbdrv5z31lxnzzgbp50l10lzlvx6j7kc7ssg76fma49wfpnra5";
+ name = "org-chef";
+ };
+ packageRequires = [ emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/org-chef";
+ license = lib.licenses.free;
+ };
+ }) {};
org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-cliplink";
@@ -50148,12 +52604,12 @@
org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-clock-csv";
- version = "20170904.1745";
+ version = "20180313.1957";
src = fetchFromGitHub {
owner = "atheriel";
repo = "org-clock-csv";
- rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6";
- sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm";
+ rev = "4a6e9e4895799afa0b994f4a908c1e3c2043451f";
+ sha256 = "1f7xvarimv82xwiw5cavnak7av0yi4afn94nhhp60pyfh8azls50";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
@@ -50253,12 +52709,12 @@
org-dashboard = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-dashboard";
- version = "20160929.941";
+ version = "20171223.1124";
src = fetchFromGitHub {
owner = "bard";
repo = "org-dashboard";
- rev = "f9cd3b979166a3713aea48b1a1e6aaea2e7c7a05";
- sha256 = "1n78775h5mvqki2idkbwais37g2alblz1fzrsrgr3vvcd83g3i98";
+ rev = "02c0699771d199075a286e4502340ca6e7c9e831";
+ sha256 = "0zi23xgv5fq827dljhzp6m2v7ggr3pdw3fpgq8515gs9q4f12v1r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11ce0ba772672d9cbae5713ebaf3798eec5fdb3c/recipes/org-dashboard";
@@ -50316,12 +52772,12 @@
org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-download";
- version = "20171107.1115";
+ version = "20180315.1220";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "org-download";
- rev = "c75095778c02e70fc7efa2aac5c77936b56d04db";
- sha256 = "0c38npgy17v93yw4zixvwyx89mpy4j86rk7911bjwivn8xp3vjk2";
+ rev = "3f568b163a8a26f22a9b2d9a90b85fcea89c67f2";
+ sha256 = "1whp3cpdyxrip5id9ddajy0k04b81hrq12j9w5ir8244m1k5kkf4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -50355,22 +52811,22 @@
license = lib.licenses.free;
};
}) {};
- org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }:
+ org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-drill-table";
- version = "20170408.1205";
+ version = "20180115.209";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "org-drill-table";
- rev = "5662511e98697e086149a223a64f9f01fabf7330";
- sha256 = "1bd9wifw57v31bihqrq5305a5xmjq980crlnqak0l9pksjkbw2bx";
+ rev = "096387d929bcf3eb479e0a9d5da9cf32c756a759";
+ sha256 = "1a8ygrcag8i9hdpy2vsn0sh8lwhl9b56rv91j3rddy1jv5qx1ipb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3347da186765877826b224e1f5d1b585ebd3692c/recipes/org-drill-table";
sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69";
name = "org-drill-table";
};
- packageRequires = [ cl-lib dash emacs org-plus-contrib s ];
+ packageRequires = [ cl-lib dash emacs org s ];
meta = {
homepage = "https://melpa.org/#/org-drill-table";
license = lib.licenses.free;
@@ -50502,6 +52958,27 @@
license = lib.licenses.free;
};
}) {};
+ org-fancy-priorities = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-fancy-priorities";
+ version = "20180221.1545";
+ src = fetchFromGitHub {
+ owner = "harrybournis";
+ repo = "org-fancy-priorities";
+ rev = "0998b27c02e81bc554e76fde3b7cac4aced2210e";
+ sha256 = "0nlazpgfrv67vbb5w2pcwhsxf296f62xgw1zajrkp16gvj63hry6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/712902ae1cf967ceb2052266ed3244e92998f8a7/recipes/org-fancy-priorities";
+ sha256 = "13rljgi5fbzlc16cxqj49yg47a5qpyxzj0lswhdyhgzncp1fyq7p";
+ name = "org-fancy-priorities";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/org-fancy-priorities";
+ license = lib.licenses.free;
+ };
+ }) {};
org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-fstree";
@@ -50627,22 +53104,22 @@
license = lib.licenses.free;
};
}) {};
- org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
melpaBuild {
pname = "org-jira";
- version = "20171105.2011";
+ version = "20180103.1813";
src = fetchFromGitHub {
owner = "ahungry";
repo = "org-jira";
- rev = "acad51a1efbdab58975aebe7cb69bdd6556bc44f";
- sha256 = "1y183bsjdxlfi22xd7kd1w5xa3qnmgf7063083f977sf5z9afsyy";
+ rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7";
+ sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
name = "org-jira";
};
- packageRequires = [ cl-lib emacs request ];
+ packageRequires = [ cl-lib emacs request s ];
meta = {
homepage = "https://melpa.org/#/org-jira";
license = lib.licenses.free;
@@ -50651,12 +53128,12 @@
org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-journal";
- version = "20171113.53";
+ version = "20180118.31";
src = fetchFromGitHub {
owner = "bastibe";
repo = "org-journal";
- rev = "44a52a20a154d5c1a78684ef720972c4fe36b64a";
- sha256 = "0c4jwh53mgy4qpv7aiwbsbvjjhchyfjb0ca5ny5875ljvkq59qz6";
+ rev = "1d6f7ddf3baa296bf7ca7ed008f0d86c10397021";
+ sha256 = "02r4h7l8mj5blxwsiv0zyfiwagmxckxdsi39vbx2kxjvxasv4zw3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -50669,6 +53146,27 @@
license = lib.licenses.free;
};
}) {};
+ org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-kanban";
+ version = "20180313.1339";
+ src = fetchFromGitHub {
+ owner = "gizmomogwai";
+ repo = "org-kanban";
+ rev = "c240a1894b7ae4ed292657b4d3cf03db8274f451";
+ sha256 = "12l9yb5dzhv9fgcl8nba5dh403bafx1klq2sw0n1v7zv82dic57i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban";
+ sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41";
+ name = "org-kanban";
+ };
+ packageRequires = [ dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org-kanban";
+ license = lib.licenses.free;
+ };
+ }) {};
org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-link-minor-mode";
@@ -50735,12 +53233,12 @@
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mime";
- version = "20171105.1440";
+ version = "20180309.2241";
src = fetchFromGitHub {
owner = "org-mime";
repo = "org-mime";
- rev = "64a3f56651369b2a8b0a601abea1cf1216db2ded";
- sha256 = "0jvknbiilik3dwkz1kpjf7ac1fqkdh74pljzpyxxyg3slqha0d50";
+ rev = "e35c367e7dc1449e63916e424d4e7349c91f8c1d";
+ sha256 = "0yyxji50cvpbrmwwqmsv48556yzd7537zzlbpng6fgsq93iq62v5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -50756,12 +53254,12 @@
org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-mind-map";
- version = "20171109.1238";
+ version = "20171206.645";
src = fetchFromGitHub {
owner = "theodorewiles";
repo = "org-mind-map";
- rev = "9d6e262bedd94daf9de269f4d56de277275677cb";
- sha256 = "0jgkkgq7g64zckrmjib0hvz0qy3ynz5vz13qbmlpf096l3bb65wn";
+ rev = "d7854dbd30d565d3087d2810d6a77cc882988eae";
+ sha256 = "0jkm6ar07m399hqanjpw6y7bxdr59j72skmi9ncgjyb81ch70g36";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map";
@@ -50798,12 +53296,12 @@
org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mru-clock";
- version = "20171101.506";
+ version = "20180219.359";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-mru-clock";
- rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832";
- sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q";
+ rev = "18301b6ffe1149e373dc07d5047b67b9e1faec64";
+ sha256 = "13x25fk2wnddzgx11rmkrhpvaava0knaqhlhk36c6pyldbhbhbxy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -50844,8 +53342,8 @@
src = fetchFromGitHub {
owner = "Rahi374";
repo = "org-notebook";
- rev = "d90c4aeca2442161e6dd89de175561af85aace03";
- sha256 = "15hf0x0v4fz6gxj8qx9pfm6xic7qni33nn4ga6cxbdgpwgyr61wz";
+ rev = "86042d866bf441e2c9bb51f995e5994141b78517";
+ sha256 = "0znxn6zzc9645m3wmkryf4xwjskf7gwylrg6z2kmr1wpjlpfwb01";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook";
@@ -50858,6 +53356,27 @@
license = lib.licenses.free;
};
}) {};
+ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "org-noter";
+ version = "20180307.1029";
+ src = fetchFromGitHub {
+ owner = "weirdNox";
+ repo = "org-noter";
+ rev = "abeb48573a62b62c57f63fc89fff31c4d47141e9";
+ sha256 = "17pdx7kc3zk5yx4i10lv421zqv6a9xn37gzyd1h4vljjgs81j4yz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter";
+ sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf";
+ name = "org-noter";
+ };
+ packageRequires = [ cl-lib emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/org-noter";
+ license = lib.licenses.free;
+ };
+ }) {};
org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }:
melpaBuild {
pname = "org-octopress";
@@ -50974,11 +53493,11 @@
org-password-manager = callPackage ({ dash, fetchgit, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-password-manager";
- version = "20170701.919";
+ version = "20180227.1010";
src = fetchgit {
url = "https://git.leafac.com/org-password-manager";
- rev = "3e7058586b2ab96b12e9b1195b1db1e66e704f20";
- sha256 = "0ac0nd84y8lckapyckbdvc1wdflwz5nxm7isxcc8cp92pgqy49r2";
+ rev = "4b30a36e71182553a02e4dd415369290d98ec03a";
+ sha256 = "1a6i3g032c5xzsnaf7rprn22kk68y1ay3w21p3q52p3lvlzhnfis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
@@ -50994,12 +53513,12 @@
org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
melpaBuild {
pname = "org-pdfview";
- version = "20161130.1053";
+ version = "20180225.206";
src = fetchFromGitHub {
owner = "markus1189";
repo = "org-pdfview";
- rev = "9de96eef6f187a10cd910e3bc3eb274d38856819";
- sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq";
+ rev = "09ef4bf8ff8319c1ac78046c7e6b89f6a0beb82c";
+ sha256 = "15zxdq6f6w3l8pzg3b58cj37z61dx106jwslpqni71m8wczdqkz1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview";
@@ -51036,12 +53555,12 @@
org-present = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-present";
- version = "20141109.1756";
+ version = "20180303.1530";
src = fetchFromGitHub {
owner = "rlister";
repo = "org-present";
- rev = "1b519cfd5abf44bed307cac576dc9fd61eb2c35f";
- sha256 = "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm";
+ rev = "d13acd70eff6a1608bc991920232146a0de76b21";
+ sha256 = "0jz8xiny3rv9ql0p623byz32pip1b82j2c2nyfz2wd114kiabb6q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aba18f15fbaab115456e6afc9433074558a379f5/recipes/org-present";
@@ -51141,12 +53660,12 @@
org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-random-todo";
- version = "20170404.318";
+ version = "20180312.104";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-random-todo";
- rev = "8b784ff0419fcaa2467991bc670e0e8e31be62c0";
- sha256 = "14lsc6a9ddfd69x06z3ia9mlvac2p8iwvxbfnbmn2m49lijs8724";
+ rev = "8357350a66bbc4e0e5cb590acc104d39870cf736";
+ sha256 = "1cl1abgflbnnmvakb1z69rpr2gsm3hyg20iggwl6pn2fl0pf5wf5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -51159,6 +53678,27 @@
license = lib.licenses.free;
};
}) {};
+ org-randomnote = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-randomnote";
+ version = "20171210.557";
+ src = fetchFromGitHub {
+ owner = "mwfogleman";
+ repo = "org-randomnote";
+ rev = "c89eb4cf625ea7e7624b6a2d3d5676ce25ab03d7";
+ sha256 = "05ap1kbq5cwak70jlm3m0pvbax75kg3281qxs5flz3qbkfsbg3h2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d92cb392b23701948176ba12516df5ae6608e950/recipes/org-randomnote";
+ sha256 = "06i42ig7icap1i1mqzv5cqwhnmsrzpjmjbjjn49nv26ljr3mjw0b";
+ name = "org-randomnote";
+ };
+ packageRequires = [ dash f ];
+ meta = {
+ homepage = "https://melpa.org/#/org-randomnote";
+ license = lib.licenses.free;
+ };
+ }) {};
org-readme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }:
melpaBuild {
pname = "org-readme";
@@ -51231,12 +53771,12 @@
org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
melpaBuild {
pname = "org-ref";
- version = "20171019.724";
+ version = "20180310.1908";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "8fb1275b4c0e2dd46593754e497940c49fd9da6b";
- sha256 = "0jha5qlab3gsyl8iysf1kqn2f15afvqjvnl2nyzh47llqng8yskj";
+ rev = "b4bbc9774c741c299a3a232036342f89905910c8";
+ sha256 = "1ddksbznxq7cpksiqm4cx2k2c442vrm8dsb1ii6xqvnm32wsx4bf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -51263,12 +53803,12 @@
org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-repo-todo";
- version = "20160307.1029";
+ version = "20171227.1719";
src = fetchFromGitHub {
owner = "waymondo";
repo = "org-repo-todo";
- rev = "b164bacefcd3c55dd40cd1a9e91ffefd315b400d";
- sha256 = "0as82hf81czks9fcmhy9wjwl8d4mbylrm13c02y8abp0am41r28f";
+ rev = "f73ebd91399c5760ad52c6ad9033de1066042003";
+ sha256 = "0c74zwmac8x1y8jimdx473v0falpky2kfig8pnaxavz415gb315q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo";
@@ -51302,6 +53842,27 @@
license = lib.licenses.free;
};
}) {};
+ org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-rich-yank";
+ version = "20180301.401";
+ src = fetchFromGitHub {
+ owner = "unhammer";
+ repo = "org-rich-yank";
+ rev = "5d9bc7f474187013a8e1cdc5fc3dc86c41385873";
+ sha256 = "144cyi5k0fjnzdrp9hvhnlxshxhf6jhagiinzaw5aklswz0qs1w5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank";
+ sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y";
+ name = "org-rich-yank";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org-rich-yank";
+ license = lib.licenses.free;
+ };
+ }) {};
org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }:
melpaBuild {
pname = "org-rtm";
@@ -51344,6 +53905,27 @@
license = lib.licenses.free;
};
}) {};
+ org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "org-send-ebook";
+ version = "20180314.14";
+ src = fetchFromGitHub {
+ owner = "stardiviner";
+ repo = "org-send-ebook";
+ rev = "c41b6a69a16e73dd64ff1c7353d402e03a2003e2";
+ sha256 = "0j962vyvgavs9h6grayy4c6frba3ksv5n8rklgicwj4zx53b0blf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook";
+ sha256 = "0gvnrl4rfqn3zd0wmj4bhd63zkjk68lwwcgmsqrfw7af22wlfv3d";
+ name = "org-send-ebook";
+ };
+ packageRequires = [ cl-lib emacs seq ];
+ meta = {
+ homepage = "https://melpa.org/#/org-send-ebook";
+ license = lib.licenses.free;
+ };
+ }) {};
org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-static-blog";
@@ -51410,12 +53992,12 @@
org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-sync";
- version = "20150817.754";
+ version = "20180221.1127";
src = fetchFromGitHub {
owner = "arbox";
repo = "org-sync";
- rev = "7f02167ef805cd76def274be4d3bd0c6e41d9af8";
- sha256 = "18v56lrscpzxq5prigd1pjkx990xf57pzf1d2yj6r1grqfz235yy";
+ rev = "095335063b306871970f981898a220f62ad0ae4e";
+ sha256 = "0p4xmlhv9xsa111yrgmfl5laznmj9ijpsifqcxmplrf5ckzqbdkn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync";
@@ -51620,12 +54202,12 @@
org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-tree-slide";
- version = "20160513.2325";
+ version = "20171129.2238";
src = fetchFromGitHub {
owner = "takaxp";
repo = "org-tree-slide";
- rev = "fed7ec7e6df59cffcdb4c13a9345f4d828404dd8";
- sha256 = "0b97jqskn5c2cbah3qj9bi5was31sijrp01dca36g5y53lpz7n79";
+ rev = "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134";
+ sha256 = "153bg0x7ypla11pq51jmsgzfjklwwnrq56xgpbfhk1j16xwz9hyf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6160c259bc4bbcf3b98c220222430f798ee6463f/recipes/org-tree-slide";
@@ -51641,12 +54223,12 @@
org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
melpaBuild {
pname = "org-trello";
- version = "20170225.1247";
+ version = "20180310.2352";
src = fetchFromGitHub {
owner = "org-trello";
repo = "org-trello";
- rev = "d7885038d7e160a64f561f8abc942206d582faa6";
- sha256 = "091hznr9pznm26p5vm0kav69qkji6hihf6bil0a314d8k0kaj5bc";
+ rev = "c38c36159cdeb2348c4e9ca75246aa9cc1dfd76c";
+ sha256 = "02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello";
@@ -51683,12 +54265,12 @@
org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-wc";
- version = "20170727.1911";
+ version = "20180124.229";
src = fetchFromGitHub {
owner = "tesujimath";
repo = "org-wc";
- rev = "d294ad7117c150445e6166fc0d88c14a8386f34e";
- sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl";
+ rev = "6ff202a4612fe65b4e96bd551893fe8df67b0f51";
+ sha256 = "1yqiqscj7cmnqd4s1lgbf7jbhcqlf3bwr52sabz7mqfs4iwdryhl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc";
@@ -51701,27 +54283,48 @@
license = lib.licenses.free;
};
}) {};
- org-web-tools = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+ org-web-tools = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-web-tools";
- version = "20171014.804";
+ version = "20180117.1915";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "org-web-tools";
- rev = "e9583248e838806271643770102e786671fabaf5";
- sha256 = "07kdgkkl3f7w1nxdw1j7vcm2f05sdpd06dlw7vpdd77pdbwafp3h";
+ rev = "8d2e7556947f6647f55e41ed3ad3710878631fb3";
+ sha256 = "1wx85ah89x2fg69kn2ilk950dnz5asmq205kar95c3rrxymf4yia";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools";
sha256 = "19zpspap85fjqg5a20ps34rcigb0ws986pj6dzd7xik8s6ia29s7";
name = "org-web-tools";
};
- packageRequires = [ dash emacs org s ];
+ packageRequires = [ dash emacs esxml org s ];
meta = {
homepage = "https://melpa.org/#/org-web-tools";
license = lib.licenses.free;
};
}) {};
+ org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-wild-notifier";
+ version = "20180221.2025";
+ src = fetchFromGitHub {
+ owner = "akhramov";
+ repo = "org-wild-notifier.el";
+ rev = "d0df145d9bbb72b2c315b7d8007cb6a59fea2095";
+ sha256 = "1xcnb5x539776b6ljd9qyl9jadp2r4qg805m4m8yfz9sk00dv7yl";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier";
+ sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp";
+ name = "org-wild-notifier";
+ };
+ packageRequires = [ alert dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org-wild-notifier";
+ license = lib.licenses.free;
+ };
+ }) {};
org-wunderlist = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred, s }:
melpaBuild {
pname = "org-wunderlist";
@@ -51746,12 +54349,12 @@
org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }:
melpaBuild {
pname = "org2blog";
- version = "20170826.1843";
+ version = "20171218.1911";
src = fetchFromGitHub {
owner = "punchagan";
repo = "org2blog";
- rev = "62a6400746847f246e12493271f0bb52f7465a92";
- sha256 = "1xnb6yd5ny5i6hvzxfsnga5m75si5y8vc1j3vfs42r99s2ns8yid";
+ rev = "aa7a5730f4a58a53c41370dcde7bec43d5c1a2cd";
+ sha256 = "1ivf156186myr84rqbd8rn6wa8qjrip7la6sgc8k6ggg6lzvkqac";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -51923,12 +54526,12 @@
orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "orgit";
- version = "20170731.1003";
+ version = "20180217.1320";
src = fetchFromGitHub {
owner = "magit";
repo = "orgit";
- rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663";
- sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf";
+ rev = "976f3c7d25ad92c57341b52dad9af89b49c37f0c";
+ sha256 = "0m8mghh0iydbvlsrg0zd2xajfhdxgxk79dm4gwircrh6zv8194ax";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
@@ -51962,22 +54565,22 @@
license = lib.licenses.free;
};
}) {};
- orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org, org-mac-link }:
+ orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "orglue";
- version = "20150503.114";
+ version = "20171220.426";
src = fetchFromGitHub {
owner = "yoshinari-nomura";
repo = "orglue";
- rev = "1274652d527cb6afe45d1acb79f41be5a2886ee4";
- sha256 = "0qf2k89nldfm3njcnygh8ak8fz5m9ykmpzfx1cnfffxcyi139s9f";
+ rev = "ae2a45c19b52e45db7891093a3ff17ba2e51c507";
+ sha256 = "0h3b37wz4hlk022c0sq7c9p5z3v4n6cljhy8g1qjhnxac8y7mkr0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue";
sha256 = "1kj62y3cf3as2d5s207s6kg5alm09jmw0aag1z6lblrjlzbi1p2j";
name = "orglue";
};
- packageRequires = [ epic org org-mac-link ];
+ packageRequires = [ epic org ];
meta = {
homepage = "https://melpa.org/#/orglue";
license = lib.licenses.free;
@@ -52088,22 +54691,22 @@
license = lib.licenses.free;
};
}) {};
- origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ origami = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "origami";
- version = "20170129.805";
+ version = "20180101.753";
src = fetchFromGitHub {
owner = "gregsexton";
repo = "origami.el";
- rev = "5630536d04613476e13b413fe05fd0bbff4107ca";
- sha256 = "1w6cyyvjw6x4x0a7mbybw37f70cdnwajv8snvmnrqd73vggm70fd";
+ rev = "1f38085c8f9af7842765ed63f7d6dfe4dab59366";
+ sha256 = "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami";
sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr";
name = "origami";
};
- packageRequires = [ dash emacs s ];
+ packageRequires = [ cl-lib dash emacs s ];
meta = {
homepage = "https://melpa.org/#/origami";
license = lib.licenses.free;
@@ -52406,12 +55009,12 @@
outrespace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "outrespace";
- version = "20170904.511";
+ version = "20180126.857";
src = fetchFromGitHub {
owner = "articuluxe";
repo = "outrespace";
- rev = "cf2a397971f82c87dcfbe3400e3e7c2de79fa68e";
- sha256 = "1rxyyvax3f0fh3k8majkhpdrnlqg4pg7hl68q61csiccayx04213";
+ rev = "5c3e036e0d72889b5084c67eeac317e88b1bf2f6";
+ sha256 = "025lgvy8m70m72zxzdsdxgsayi3hr0hfp076mf0b97zfcw6h87c3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace";
@@ -52466,15 +55069,36 @@
license = lib.licenses.free;
};
}) {};
+ overcast-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "overcast-theme";
+ version = "20180315.1243";
+ src = fetchFromGitHub {
+ owner = "myTerminal";
+ repo = "overcast-theme";
+ rev = "009257956522dedf07d9e136ee41ac0b1b0b3518";
+ sha256 = "1g3s44n839s7fw3spkph31m0a5walilj151v0jyp302mjfn396nh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme";
+ sha256 = "1v8hdnvc4pfmadkvdm6b8z0cy20pminvhjdlr13q5m9immr88a4r";
+ name = "overcast-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/overcast-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "overseer";
- version = "20170207.2241";
+ version = "20180225.2219";
src = fetchFromGitHub {
owner = "tonini";
repo = "overseer.el";
- rev = "6be1f2a4df1b7a20298865b85502ee89e327898d";
- sha256 = "0ipq5gflymvznb8xzfl524l09sj90787bzga9ymjjpc4rn9zmqlb";
+ rev = "02d49f582e80e36b4334c9187801c5ecfb027789";
+ sha256 = "0q4ai7ividy8xv09s342y49s97ismhfdfsjk70zif60fp0ajfzfn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer";
@@ -52553,12 +55177,12 @@
ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-clip";
- version = "20170805.505";
+ version = "20180305.1940";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "ox-clip";
- rev = "b596760aec2ab4e10b18807c01839047aa209d6e";
- sha256 = "0bd5vbbz0p0dg5v7s54a88ba7aca53xwr8niirshfkm916lc8mpy";
+ rev = "594c90953a91948505bb394350adf110e041f19a";
+ sha256 = "1alm6hh7qg8sv50cm5p03icx47za2g7b2nvbwzx6kxkrgmgqfq6c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip";
@@ -52574,12 +55198,12 @@
ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-epub";
- version = "20171105.0";
+ version = "20171202.1713";
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
- rev = "31ed40ad3f0b3166cb3e772f8689b12d7f2cfe1b";
- sha256 = "1p9pdm3mhwf5ldl0g4c8kf8iqwzqg0f88qd0nmw33mm8mvikvv1h";
+ rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d";
+ sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -52637,12 +55261,12 @@
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-hugo";
- version = "20171111.2310";
+ version = "20180314.2012";
src = fetchFromGitHub {
owner = "kaushalmodi";
repo = "ox-hugo";
- rev = "f770883072e80c619204e586218b6543cda5e24b";
- sha256 = "1az3ivzs5x6d49kqc1l6d2g3ypp3x2rc5dq5ys5bw6mcl26ykq0k";
+ rev = "8c792bd2c4899fae6753689198599c8c730fc116";
+ sha256 = "1d6ni4i36srnh4b8f2v1279z67k1rd877ha8rw6a44vjyanzxcvd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -52718,36 +55342,15 @@
license = lib.licenses.free;
};
}) {};
- ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "ox-latex-chinese";
- version = "20171014.1532";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "ox-latex-chinese";
- rev = "3af3872c5435b6d4feccd0fd2bac32cd156724dd";
- sha256 = "06b3k3c407dvj0gx73w8wspy2mndl1q2s9wlq4g6hs2v4i2pd9dd";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese";
- sha256 = "138yprik36jxhm6dnj42gaynqd84w7ya3s0kbnxhbizrfl4n4ck7";
- name = "ox-latex-chinese";
- };
- packageRequires = [ cl-lib emacs ];
- meta = {
- homepage = "https://melpa.org/#/ox-latex-chinese";
- license = lib.licenses.free;
- };
- }) {};
ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ox-mediawiki";
- version = "20161228.850";
+ version = "20180105.1354";
src = fetchFromGitHub {
owner = "tomalexander";
repo = "orgmode-mediawiki";
- rev = "9e13392fe88817564f46a7a9f1eadebf54a2c346";
- sha256 = "1x584gbwr1jhbxgzmjr6z801lqzqcaqzypkz25zz2spmh4n8fz9f";
+ rev = "a9327150293e370e500ba55bddfe5fc435c6bf9b";
+ sha256 = "0dsq86hli24imdkgsf45asx23kriw9di3d0cf5z8axfpkcbkn770";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/24244d146306ce965df382c8958c7574c74313f2/recipes/ox-mediawiki";
@@ -52763,12 +55366,12 @@
ox-minutes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ox-minutes";
- version = "20170323.835";
+ version = "20180202.934";
src = fetchFromGitHub {
owner = "kaushalmodi";
repo = "ox-minutes";
- rev = "ad9632f35524ac546c6d55dfa827e8597669e1e1";
- sha256 = "07knwl6d85sygqyvc7pm23y7v4nraiq1wl1b7szkzi2knd8wzi0s";
+ rev = "27c29f3fdb9181322ae56f8bace8d95e621230e5";
+ sha256 = "10rw12gmg3d6fvkqijmjnk5bdpigvm8fy34435mwg7raw0gmlq75";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/162d0dacbb7252508147edb52fe33b1927a6bd69/recipes/ox-minutes";
@@ -52809,8 +55412,8 @@
src = fetchFromGitHub {
owner = "kawabata";
repo = "ox-pandoc";
- rev = "55861adfceeae436deeae8402f545b771ad3484b";
- sha256 = "1pvijswwx3a4bb1z32kk9x70ba07zr2wjr913ri8gp81kj84zb0x";
+ rev = "cd3c59f6c0ea49e0cac31d8392a5bbac02886d8f";
+ sha256 = "04wppfxjm43bc5c8i5l5kbpln7rhifgqrmbjbxdbqd3vl4lpcnzh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc";
@@ -52889,12 +55492,12 @@
ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-rst";
- version = "20171004.1553";
+ version = "20180314.1713";
src = fetchFromGitHub {
owner = "msnoigrs";
repo = "ox-rst";
- rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928";
- sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj";
+ rev = "a74b60883b0d844c80efb364dac1560b85f2548f";
+ sha256 = "0smgz2q7bjj2svx1gdr187m58yxq1hs878bciz9h6jcp03a9sb61";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst";
@@ -52910,12 +55513,12 @@
ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-textile";
- version = "20170907.351";
+ version = "20180110.516";
src = fetchFromGitHub {
owner = "yashi";
repo = "org-textile";
- rev = "04bcaa64a0c5a099bd7adae5e6584cfa685b2b67";
- sha256 = "1z1574n6br5rabv9g5qcwk49lx05a4j1gzl3hc2axkxdrrm4m6kk";
+ rev = "0af57d17c93049bf7533061863f711d13fbed891";
+ sha256 = "17jgb5bn3c4q4gasb2xas5bs3mrd1drnizgbqpnc50c8jfmcr4kd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02a68a7a99ecce8f1afa03e72ff1f636edaf5868/recipes/ox-textile";
@@ -53078,12 +55681,12 @@
package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-build";
- version = "20171020.1419";
+ version = "20180205.1521";
src = fetchFromGitHub {
owner = "melpa";
repo = "package-build";
- rev = "e4d174870ea40275a8bc35996416326cf28051f9";
- sha256 = "00p7hrcb2ivk6sjxqccbpswjsk5rj02nyd29d2nd6b8r3fskskzp";
+ rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00";
+ sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -53120,12 +55723,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-lint";
- version = "20171006.1846";
+ version = "20171201.1903";
src = fetchFromGitHub {
owner = "purcell";
repo = "package-lint";
- rev = "ff64e1171e8330972c26bf547042429927aed7c7";
- sha256 = "11hsxvla2vq944zfd8kr0wynvkr7n90jv714ll6f7yhn10nrraks";
+ rev = "9abfb14d9ad903ef73895a27b9964b5e6023d752";
+ sha256 = "0brd8zhiyn9kpbc0za455vjbb5v49i2pj3hhj1lbdcghzwq39jvi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -53267,12 +55870,12 @@
page-break-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "page-break-lines";
- version = "20171020.108";
+ version = "20171210.31";
src = fetchFromGitHub {
owner = "purcell";
repo = "page-break-lines";
- rev = "ae1c0065984429c7364a667abb9180e80134c4c0";
- sha256 = "1j2fw5p5cwyxpb3clym59jbma06r7la83n62xmz0q1z41llmwx4j";
+ rev = "fd3b7e38ad8747cd009ead7ef1bb150849ccc693";
+ sha256 = "0ik5v2kd0l5a6sznld5ncdb4lsyqbbw7axs0qwxc968b540k9zq5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
@@ -53372,12 +55975,12 @@
pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
melpaBuild {
pname = "pamparam";
- version = "20170927.1048";
+ version = "20180122.1325";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "pamparam";
- rev = "c840a8f941940bb8e694c635995566faee995c7b";
- sha256 = "0wqnzgkcwhrgxdkrlk6i469gcas9477pbkv878cqq9ifsjwvf42n";
+ rev = "f531518bd9952d39af8605f461fc43aa6b6fa5f4";
+ sha256 = "110jnj7yp6j2qj5ar72c5kgkpj43b4b82ipq725xivk6zsvrhicr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
@@ -53390,6 +55993,27 @@
license = lib.licenses.free;
};
}) {};
+ panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "panda-theme";
+ version = "20180203.2318";
+ src = fetchFromGitHub {
+ owner = "jamiecollinson";
+ repo = "emacs-panda-theme";
+ rev = "f93ad6ded20d71cab9bf29a0c7040e07e1ba4f05";
+ sha256 = "1y9yppkprbnqf59p94kkpxsma2s7z8cp195na05mdgcs0pmbs6l7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme";
+ sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7";
+ name = "panda-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/panda-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pandoc";
@@ -53414,12 +56038,12 @@
pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "pandoc-mode";
- version = "20170720.127";
+ version = "20180122.108";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "pandoc-mode";
- rev = "58f893d54c0916ad832097a579288ef8ce405da5";
- sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i";
+ rev = "883e131c53a6351a239c422f05027aa526181ddb";
+ sha256 = "1qb50m4zyk57hs8siwiz21q5qymhl585crmhgqnvkspk6dg0063s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -53453,22 +56077,22 @@
license = lib.licenses.free;
};
}) {};
- paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }:
+ paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "paper-theme";
- version = "20170924.1231";
+ version = "20180125.926";
src = fetchFromGitHub {
owner = "cadadr";
repo = "elisp";
- rev = "02829f582d03c149d0aace9a0bdf2bd405b2e4a2";
- sha256 = "0rvwhvmv9b6ma6jf5gbmmy9ahrsli4qflc8z2n2whl743rbcfpk6";
+ rev = "3059378379a6fbd0363cd14fe6227c27739af4e1";
+ sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme";
sha256 = "1ph6c6g907cnxzl74byc754119qia8rs8y7wvaj8i6q3fz2658zr";
name = "paper-theme";
};
- packageRequires = [ emacs hexrgb ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/paper-theme";
license = lib.licenses.free;
@@ -53477,16 +56101,16 @@
paperless = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "paperless";
- version = "20170213.503";
+ version = "20180224.445";
src = fetchFromGitHub {
owner = "atgreen";
repo = "paperless";
- rev = "4e8c5d147db5c8ef0a3914e95b4030b28d29c6bb";
- sha256 = "1lnxbn6mwbpfsn8qf8rdn1v7f00jjsk0h1bn4syvzik37x51f2hh";
+ rev = "b3b6c05da393f6b1292a3d5937bc4499baabd0b6";
+ sha256 = "1b2gm823qd6bllgp9qg2vgskzg4rpdvh8bgic8708hkq6lwpdv70";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/921ba9059183a57e08f9c79af2b28bb77a210508/recipes/paperless";
- sha256 = "02jbqdhbq4b3yb9lrqkwaxmyymvcqrjswhzp4sbccw6arla4q7wg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/500be17952ffb6b8d1e524b5b3d316878202fabc/recipes/paperless";
+ sha256 = "182arnx2fz0dww6bvg6m70a1picqd3czmzwv92x0rb4ghwrnq2dq";
name = "paperless";
};
packageRequires = [ cl-lib emacs f s ];
@@ -53498,12 +56122,12 @@
paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
melpaBuild {
pname = "paradox";
- version = "20161117.502";
+ version = "20180216.334";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "paradox";
- rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245";
- sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r";
+ rev = "e5dd26f67ba8fa8ab1631a00ddea4117805b3fd0";
+ sha256 = "09x8glw949hivbzikki5blgjkzyws69hck501ym99663k4irdir1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -53518,11 +56142,11 @@
}) {};
paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "paredit";
- version = "20170405.1149";
+ version = "20171126.1805";
src = fetchgit {
url = "https://mumble.net/~campbell/git/paredit.git";
- rev = "99829aa423c9e8dd1be8d64c4b68982cf4c1559b";
- sha256 = "13h5gd9s1ajgqzq6ylzcmz4irb071wyhh9qj195ld177irkxi9wd";
+ rev = "acbe10fdd85d2e91831adf70b6a828bc7e900da0";
+ sha256 = "1c7ag0cvd6rl5fsj3dpfcjpyb8xjd26d864z98a74cirn8pc8f7l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit";
@@ -53601,12 +56225,12 @@
paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "paren-face";
- version = "20161028.1127";
+ version = "20180124.352";
src = fetchFromGitHub {
owner = "tarsius";
repo = "paren-face";
- rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf";
- sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7";
+ rev = "166975683225367c866e6ae6f6acb88d24e21a35";
+ sha256 = "02mh8w2na6qa94p3bh6pvdvmg36p2vrbp5hpjnwjcayrb92dskgy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face";
@@ -53643,12 +56267,12 @@
parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parinfer";
- version = "20170710.821";
+ version = "20180226.2134";
src = fetchFromGitHub {
owner = "DogLooksGood";
repo = "parinfer-mode";
- rev = "23ac701e2a1a1364ca96d267437c3413986a4497";
- sha256 = "1kbwmdhv8fpw613yk8sgh3yz4rcrh2aygqkv3c46d5fr0xm04a80";
+ rev = "5bfc915c4a91da740f3216798327b5676d227569";
+ sha256 = "0zz4l7k2blbxcg1ni3amfys58szw51fvrjk7dbjxp7vsgpp7x3ji";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -53685,12 +56309,12 @@
parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parsebib";
- version = "20170501.347";
+ version = "20180116.627";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "parsebib";
- rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3";
- sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh";
+ rev = "683c970a6fb51591bc88ee80e295fedee876e044";
+ sha256 = "0mpgyy9qfb5x4fvlmb274hgayjbwf0bgk65dxyx31zikjwpcd56p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
@@ -53706,12 +56330,12 @@
parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parsec";
- version = "20170508.1500";
+ version = "20171202.2031";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "parsec.el";
- rev = "8755c60826efaa8603b0d4300bfba9abaa072584";
- sha256 = "03yzs4l53j4fvviqfhdn3cxc710yrg4wdbnl7r69yn69r4di9bfj";
+ rev = "72c1897a42b3b0b59505b3562e8f46c6354faec1";
+ sha256 = "0yg35fs9gr07j6x7xi4f3v11xdanmkhr5sr9lqim0m10aglv7vwf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
@@ -53724,6 +56348,27 @@
license = lib.licenses.free;
};
}) {};
+ parseclj = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "parseclj";
+ version = "20180225.2233";
+ src = fetchFromGitHub {
+ owner = "clojure-emacs";
+ repo = "parseclj";
+ rev = "af6102c4a80693cc3b40c4eb5c340358ab4b9696";
+ sha256 = "1m1yvskgvm4np6r36c5gjg5whi1dyg6c1xd0nfqgc0cw9awwxp6b";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj";
+ sha256 = "077qigx0qyjyvm3437ffnv05rmnpqxvpxf69yyfdgnay1xclv172";
+ name = "parseclj";
+ };
+ packageRequires = [ a emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/parseclj";
+ license = lib.licenses.free;
+ };
+ }) {};
pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pasp-mode";
@@ -53748,12 +56393,12 @@
pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }:
melpaBuild {
pname = "pass";
- version = "20171010.410";
+ version = "20180201.451";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "pass";
- rev = "0f4ff034fb31b18f387e67f1de4029826db6cd0b";
- sha256 = "084497na8qql638qjhgad02rvhwyzz81xwh70p6rxxwfzj0i1p17";
+ rev = "da08fed8dbe1bac980088d47b01f90154dbb8d8b";
+ sha256 = "1j5fdcqmqw62zvmwd80bjvkrr5vg59l5k6673hvvhjx77c8nvidv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -53857,8 +56502,8 @@
src = fetchFromGitHub {
owner = "zx2c4";
repo = "password-store";
- rev = "7252e8b3cf829e908179913daad16ff2b8bdefdd";
- sha256 = "1wmayp7wjlfxdjb0wlmjqyxqa95ssrhhxhkiy0ip3bgip77s7rbw";
+ rev = "fab65bda88ea979dbbc49f3d856a1d14ee4f1296";
+ sha256 = "0yicj227h21lqa97kcaa1pw4xyaakjqh9ynr2pynixkafalfkxhl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store";
@@ -54000,12 +56645,12 @@
pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "pastery";
- version = "20171112.851";
+ version = "20171113.1949";
src = fetchFromGitHub {
owner = "diasbruno";
repo = "pastery.el";
- rev = "245779100e7d1c1a10b67fe7b9055343d3a8229c";
- sha256 = "1wn53ncs0nivmdqlryvidqkksky8w4ymmfsqm1ha62jkxcwqf26h";
+ rev = "4493be98b743b4d062cb4e00760125e394a55022";
+ sha256 = "0bmm18d84lrkclg4md46k1ma03w7a97s10hrvjcm9yj8xbrjqqsc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery";
@@ -54105,12 +56750,12 @@
pc-bufsw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pc-bufsw";
- version = "20150923.13";
+ version = "20180107.1040";
src = fetchFromGitHub {
owner = "ibukanov";
repo = "pc-bufsw";
- rev = "a76120bca9821c355069f135b4e6978351b66bc2";
- sha256 = "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m";
+ rev = "b99ba484e18ebf2b88654704146746490bb7625f";
+ sha256 = "184nnkfh7n6vbbmvykvklr1dn3dcwjj3w800irdg55bbnkxxzkj4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2bbd34d673935846c286e73a1e2efaa00ab01a/recipes/pc-bufsw";
@@ -54130,8 +56775,8 @@
src = fetchFromGitHub {
owner = "sigma";
repo = "pcache";
- rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740";
- sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248";
+ rev = "1f8086077d770e524492e6fa59b07856e85a6fea";
+ sha256 = "09z5295f8051ag13ndq8rhxgg2m0gim45yfpjv4xkbmdcfkfinc2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcache";
@@ -54228,22 +56873,22 @@
license = lib.licenses.free;
};
}) {};
- pcmpl-pip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ pcmpl-pip = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "pcmpl-pip";
- version = "20171109.1932";
+ version = "20171201.33";
src = fetchFromGitHub {
owner = "hiddenlotus";
repo = "pcmpl-pip";
- rev = "50345753df4420f1ca4d1b8cb56b0f8d29d2969c";
- sha256 = "0svl0xxh3amc52kj73m3mi732gm3907l2gk7i91iy0ynp6v3f0rz";
+ rev = "8b001b579fc015f80ee0e4f3211058b830bf7c47";
+ sha256 = "0f8s2gn82dhyrnv0j688697xy0ig2yhn5m94gwhcllxq5a3yhbdg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-pip";
sha256 = "19a3np5swpqvrx133yvziqnr2pvj8zi0b725j8kxhp2bj1g1c6hr";
name = "pcmpl-pip";
};
- packageRequires = [];
+ packageRequires = [ f s seq ];
meta = {
homepage = "https://melpa.org/#/pcmpl-pip";
license = lib.licenses.free;
@@ -54336,12 +56981,12 @@
pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
melpaBuild {
pname = "pdf-tools";
- version = "20171012.2226";
+ version = "20180109.1234";
src = fetchFromGitHub {
owner = "politza";
repo = "pdf-tools";
- rev = "0f99f0c06514acf51445e7e4cb0f638fa0c75ee5";
- sha256 = "1gc7n5r60ib65bnkgpac3bn71pxnm58sxajnwjfkwi9xzgw72acv";
+ rev = "9241a79bbf159ba0b079ebdbfa8ad1b3e69cf8c0";
+ sha256 = "00v2rqrh3z93s651j1i1z9i6chr0lxw1kbnkpr56pqrh5rbvy0q5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -54441,11 +57086,11 @@
pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pelican-mode";
- version = "20171001.503";
+ version = "20180217.317";
src = fetchgit {
url = "https://git.korewanetadesu.com/pelican-mode.git";
- rev = "64d41f0ee5970b2d875880994eb287b97cad24a1";
- sha256 = "0xivc8sdp6h3fajyj7g73xnyfqlkhfpm2cs9x3mpyr42502lmn2c";
+ rev = "524c001eed50ceee40095d6680787e435b9d3624";
+ sha256 = "1559x7wxmflgzjykkbdsgw61zayswpil940n71979qkgqzcc5ggq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
@@ -54478,6 +57123,27 @@
license = lib.licenses.free;
};
}) {};
+ perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+ melpaBuild {
+ pname = "perl6-mode";
+ version = "20161228.430";
+ src = fetchFromGitHub {
+ owner = "perl6";
+ repo = "perl6-mode";
+ rev = "4867c6d268545f5356111d72c4ae77917d34cb21";
+ sha256 = "1bpq2wa27rlmyx13vg0ig2nzzivzxzh9hdmhyw285dcn8agashnp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4e912dccdee12f745272d26ea10d5f106a27cabc/recipes/perl6-mode";
+ sha256 = "0r5q2nggb9kbjcdfv81d7sm41jqz040j9z52fnck4b9mlz2dy6d0";
+ name = "perl6-mode";
+ };
+ packageRequires = [ emacs pkg-info ];
+ meta = {
+ homepage = "https://melpa.org/#/perl6-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "perlbrew";
@@ -54562,22 +57228,22 @@
license = lib.licenses.free;
};
}) {};
- persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }:
+ persp-fr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }:
melpaBuild {
pname = "persp-fr";
- version = "20170908.44";
+ version = "20180103.642";
src = fetchFromGitHub {
owner = "rocher";
repo = "persp-fr";
- rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0";
- sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8";
+ rev = "aeb3b5de6135269091bb9aa0396973766c27fc88";
+ sha256 = "0l6hlgn54iw2f6ry0gw79rsbz1r4svxf2xwffi580vi68wrcnvf2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr";
sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2";
name = "persp-fr";
};
- packageRequires = [ emacs persp-mode ];
+ packageRequires = [ dash emacs persp-mode ];
meta = {
homepage = "https://melpa.org/#/persp-fr";
license = lib.licenses.free;
@@ -54586,12 +57252,12 @@
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
- version = "20171014.111";
+ version = "20180104.843";
src = fetchFromGitHub {
owner = "Bad-ptr";
repo = "persp-mode.el";
- rev = "ccf87da2c230c3a91e627105b0f034a954e6842a";
- sha256 = "1dv3ghl9falw888bl1w0d5pzp0jz8qsbisd7kfd887bsyn7x7jqw";
+ rev = "eef754ce06159e220a9f3c99db3809925f41b8f1";
+ sha256 = "1x4s1nlnvab3sgzm0glkazfpc7lkh64af5nc4jjz1jzin8v0m055";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -54670,12 +57336,12 @@
perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
melpaBuild {
pname = "perspeen";
- version = "20170916.404";
+ version = "20171203.221";
src = fetchFromGitHub {
owner = "seudut";
repo = "perspeen";
- rev = "525f2f25358f17c7269c3750d56bfb8a6d59b5e6";
- sha256 = "17nv33nl60jdn6cz6abbj6jxnvjcshaq4a22lkssxczp968k1qn3";
+ rev = "edb70c530bda50ff3d1756e32a703d5fef5e5480";
+ sha256 = "12h0kj96s4h8z4kqalp7hccnlnqn5lrax3df75gz16pskx2dwxqr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
@@ -54691,12 +57357,12 @@
pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pfuture";
- version = "20170726.1502";
+ version = "20171116.812";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "pfuture";
- rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb";
- sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m";
+ rev = "d55a764b5beee803e489974be2408dbe236fc482";
+ sha256 = "1p6prnjh9pnz6q7fmlb5wjm2jzdm2jikkp6qfll8v7m3l19xwrmw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
@@ -55111,12 +57777,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
- version = "20171107.826";
+ version = "20180309.822";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-mode";
- rev = "1e9ec6411e6ad3c85225e724215c28b01232fe18";
- sha256 = "0c8gdy6hc03c9al91j1py6xg0c6qzbhkcyzn4423lnkakv33iiwp";
+ rev = "b67b34c43c6e937b70fcf87cc324936ef117093b";
+ sha256 = "0z3byyy5wd2h9ab8wnhyfj3xymwz3dxq37caxjfyspzsgaviwq4c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -55129,36 +57795,15 @@
license = lib.licenses.free;
};
}) {};
- php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "php-plus--mode";
- version = "20171027.921";
- src = fetchFromGitHub {
- owner = "echosa";
- repo = "phpplus-mode";
- rev = "523e7e50f9978ba74b8a324f9f896cd9b5dfd9de";
- sha256 = "0xf79pxsrfr9bi3138hdq2ccrh391sci8lvmvzcs3vnzw0hrzbfh";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode";
- sha256 = "1wl15l4m68xng1b87a19fm21qwr230ckjz1iwi3y1xl184zliv8p";
- name = "php-plus--mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/php+-mode";
- license = lib.licenses.free;
- };
- }) {};
php-refactor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-refactor-mode";
- version = "20160417.1446";
+ version = "20171123.2235";
src = fetchFromGitHub {
owner = "keelerm84";
repo = "php-refactor-mode.el";
- rev = "de47bb705c58e7ac06bdb1b403697013c77306ae";
- sha256 = "01i552ch8r8i6nzw8prwxcafzrq6xnzyc4cn36w3my1xq0k2ljvz";
+ rev = "7a794b0618df2882b1bd586fdd698dba0bc5130d";
+ sha256 = "12kjyzmicay7y37znk0znpn81lszmnydq5fkl5pk57bxblwwiivg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad4a9bb43e131e2eb0d8b09b13245bc268c524a5/recipes/php-refactor-mode";
@@ -55174,12 +57819,12 @@
php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-runtime";
- version = "20170901.1106";
+ version = "20180110.934";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "php-runtime.el";
- rev = "e1bca88ab5472e9b520b4ce915cd27d1e7803c2d";
- sha256 = "1krnfzck9j5wmda1rkmzhl9lcdzxfw324xfy4lz92nwb92mgw8gq";
+ rev = "fa4312863245511462b75cb31df2f8558288f4df";
+ sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime";
@@ -55237,12 +57882,12 @@
phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "phpunit";
- version = "20161219.320";
+ version = "20171127.301";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "phpunit.el";
- rev = "5ca5ee53e16b2cf0939dbeacbf1dffa13b41b48f";
- sha256 = "0gmb5fxnllkjg45cmqpr2gy2k6qhg1r6j2w67qbpir0x4h3q2x6x";
+ rev = "a13706733f98be3639c47311fc820b3b50f4bc33";
+ sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
@@ -55258,12 +57903,12 @@
pianobar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pianobar";
- version = "20120128.1301";
+ version = "20171117.1522";
src = fetchFromGitHub {
owner = "agrif";
repo = "pianobar.el";
- rev = "9193e3888a8097dbe7ee58e4658cc6ec2a76b160";
- sha256 = "053jqzl0sp3dnl4919vi30xqrdcpi9jsqx5hndj1bprf7926w11d";
+ rev = "68fe0ed839f6775535081b3ae0a946ccaf11234a";
+ sha256 = "0ycwahbn7fny3slmh5xkfv7vk4qj95jydygdk6pzzx6drsdhnyza";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5659b4c7be20572aabe75caba866301393db012/recipes/pianobar";
@@ -55276,6 +57921,27 @@
license = lib.licenses.free;
};
}) {};
+ pickle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "pickle";
+ version = "20180218.1840";
+ src = fetchFromGitHub {
+ owner = "ahungry";
+ repo = "pickle-mode";
+ rev = "d672186129a19581c908bae3063e09baa815869c";
+ sha256 = "10jl9xinljzb8nra59r6wyrmsr8sbbl40yahpzn4558nmmdckcnb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4cb71882f074d3fef1f5a7b504dafcb6adff8ed4/recipes/pickle";
+ sha256 = "0fryzmrs6bn6r590qp08jyzx9g6jakf1pahxhcfglsv9k3jbfp13";
+ name = "pickle";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/pickle";
+ license = lib.licenses.free;
+ };
+ }) {};
picolisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "picolisp-mode";
@@ -55468,12 +58134,12 @@
pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pip-requirements";
- version = "20171109.1439";
+ version = "20180306.1522";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "pip-requirements.el";
- rev = "d6d0437794e5de205a5fb03e0ff0a4a1b9e04eea";
- sha256 = "01j33xlrh8zflzib7gngjhkgg8fvyx2yz57clxzbjkd4377f22c2";
+ rev = "88c764ad5d988a3ed0d2b6f0b7dd22308b03a058";
+ sha256 = "01gl4nzqpmczprsdg13yvcj8d1p49wdwskmkm8nzssrshir6xdxl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa/recipes/pip-requirements";
@@ -55486,6 +58152,27 @@
license = lib.licenses.free;
};
}) {};
+ pipenv = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "pipenv";
+ version = "20180222.359";
+ src = fetchFromGitHub {
+ owner = "pwalsh";
+ repo = "pipenv.el";
+ rev = "364eaf1c823a28db97fe55e7fe85106107a23234";
+ sha256 = "1f3xx606xvsmcc73mqml0w07xbkkm2xjirc4pfkb2883cfsk3fq1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv";
+ sha256 = "110ddg6yjglp49rgn1ck41rl97q92nm6zx86mxjmcqq35cxmc6g1";
+ name = "pipenv";
+ };
+ packageRequires = [ emacs f s ];
+ meta = {
+ homepage = "https://melpa.org/#/pipenv";
+ license = lib.licenses.free;
+ };
+ }) {};
pippel = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "pippel";
@@ -55612,22 +58299,22 @@
license = lib.licenses.free;
};
}) {};
- plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ plain-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plain-theme";
- version = "20170625.1100";
+ version = "20171123.2010";
src = fetchFromGitHub {
owner = "yegortimoshenko";
repo = "plain-theme";
- rev = "7c376f5bf9d653bf12e414176284736cbdd19108";
- sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a";
+ rev = "2609a811335d58cfb73a65d6307c156fe09037d3";
+ sha256 = "0g5vl4xigdm2pn2mnkwgj1kxdjr66w7ynr77bchy3ij6qvzdzkqd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8";
name = "plain-theme";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/plain-theme";
license = lib.licenses.free;
@@ -55636,12 +58323,12 @@
plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plan9-theme";
- version = "20170529.2212";
+ version = "20180102.1852";
src = fetchFromGitHub {
owner = "john2x";
repo = "plan9-theme.el";
- rev = "cdc50195f6579e6c3e6e8060142ce25b609f7949";
- sha256 = "17grr5rvazh448qzrksxrgp0yclp32s2rxs4h5pygky7knb5vf3v";
+ rev = "2a31fb9251922667692337c867612947d2139696";
+ sha256 = "0g01a34q3dsn23s7s94xxmrvqalmvzi3hdz2hgh4swn4hrp4bzqf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme";
@@ -55696,6 +58383,27 @@
license = lib.licenses.free;
};
}) {};
+ plaster = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "plaster";
+ version = "20180127.1250";
+ src = fetchFromGitHub {
+ owner = "Shirakumo";
+ repo = "plaster";
+ rev = "c6c9c223d634041411d111b4397574f65e140585";
+ sha256 = "0pzdw9jb1p1bi5zc59sjvwxzczg8laz5vlsrs73ah1pk9jckqwf5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7e363cffa021e649c052f38cedb7cc01dbe9e24a/recipes/plaster";
+ sha256 = "0vfixc0f5n4flsmdf1iqlbx03yv28w3nqm1ycz2fx6p5jvhkvfqk";
+ name = "plaster";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/plaster";
+ license = lib.licenses.free;
+ };
+ }) {};
platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "platformio-mode";
@@ -55717,6 +58425,27 @@
license = lib.licenses.free;
};
}) {};
+ play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "play-crystal";
+ version = "20180114.224";
+ src = fetchFromGitHub {
+ owner = "veelenga";
+ repo = "play-crystal.el";
+ rev = "0b4810a9025213bd11dbcbfd38b3ca928829e0a5";
+ sha256 = "15gqr11paz5qmx43qb0f95wc87nn2snr7my22b0n6jwbk5djf402";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal";
+ sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf";
+ name = "play-crystal";
+ };
+ packageRequires = [ dash emacs request ];
+ meta = {
+ homepage = "https://melpa.org/#/play-crystal";
+ license = lib.licenses.free;
+ };
+ }) {};
play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "play-routes-mode";
@@ -55741,12 +58470,12 @@
playerctl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "playerctl";
- version = "20170414.156";
+ version = "20180301.554";
src = fetchFromGitHub {
owner = "thomasluquet";
repo = "playerctl.el";
- rev = "8354352813cd206efb60002f2af4427957bf8894";
- sha256 = "1138jcn2yjfhg0abkiwzzrf69pc5nddppf2hj35mn8b0rr7zs4bq";
+ rev = "3eee541423c2e5eb9f23a26fa9aa88c9c5a19ad1";
+ sha256 = "16qvn1mss5j8vpf1qpq4lwl4hwng64caw3c3shixsncfmgw25z6f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6db0d82c2eef7c5bef5f9f2c15969da4c404b62d/recipes/playerctl";
@@ -55759,6 +58488,27 @@
license = lib.licenses.free;
};
}) {};
+ playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "playground";
+ version = "20180309.1614";
+ src = fetchFromGitHub {
+ owner = "akirak";
+ repo = "emacs-playground";
+ rev = "0781674b0d65b287d253f143c2bc51ee65ec5959";
+ sha256 = "0jb8qkj2hbnz4j5xzky1n9kq035xzqadssa3s9zwm43cyn6nn6f7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground";
+ sha256 = "1xjmxkl8h4l87fvv1sr478r6mkmy9gkzw2fxmzqn5fcsahzkyg4d";
+ name = "playground";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/playground";
+ license = lib.licenses.free;
+ };
+ }) {};
plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plenv";
@@ -55888,8 +58638,8 @@
version = "20170419.303";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/gettext.git";
- rev = "981c523ddbd1462970335a1069573ca3bdd3df5e";
- sha256 = "1aq95scp0lg5r1fsn62r54dqamm3174wzrr0h3vxx75m3iycsxxi";
+ rev = "007245c860654e88d5228b341c9066e84f035903";
+ sha256 = "091p7m0vs96wywysqbagirpkyn1iw1g4b5afnpv9ng0x4fvilq62";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -55947,12 +58697,12 @@
pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }:
melpaBuild {
pname = "pocket-mode";
- version = "20170327.438";
+ version = "20171201.515";
src = fetchFromGitHub {
owner = "lujun9972";
repo = "pocket-mode";
- rev = "4338e869862a057e7ad1e53953e8c4a2c0f12a46";
- sha256 = "0c23np33g9hndppyfvvh9qb8xdh2v92r8rvcsi2cbwwm4z7xsvra";
+ rev = "229de7d35b7e5605797591c46aa8200d7efc363c";
+ sha256 = "0j3axac4lp7p00a7mf7frryqg1y3jwqaw0s475gz606642vg9l45";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode";
@@ -55965,15 +58715,15 @@
license = lib.licenses.free;
};
}) {};
- pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
+ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
melpaBuild {
pname = "pocket-reader";
- version = "20171023.737";
+ version = "20171127.335";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "pocket-reader.el";
- rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574";
- sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp";
+ rev = "6a35d531f2425e2e187f5107047f3dc7625f3623";
+ sha256 = "0pankd0wvmfaws6xm9yvaddf592nj5hphqfq5dmwvzcp5ywx62n4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
@@ -55983,6 +58733,7 @@
packageRequires = [
dash
emacs
+ ht
kv
org-web-tools
ov
@@ -56145,12 +58896,12 @@
pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pomidor";
- version = "20170925.2301";
+ version = "20180312.828";
src = fetchFromGitHub {
owner = "TatriX";
repo = "pomidor";
- rev = "16bed77ff933cb5f8430b6eacf27509631d22072";
- sha256 = "1w2ql67arjzzjakqm34gbs3vf6w9yzkw5kzi5vrvkcwajqq8qq56";
+ rev = "b15219a7a31adeebc80a060c42aed36d4b48d149";
+ sha256 = "0xfl08cfgnms404vmc64mdihp49z00cyqyihk7i4fp1ag8cbja1k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -56397,12 +59148,12 @@
popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "popup-switcher";
- version = "20161130.656";
+ version = "20171205.51";
src = fetchFromGitHub {
owner = "kostafey";
repo = "popup-switcher";
- rev = "86809fbd3c3c3d566043043b6577ccf8133ac855";
- sha256 = "1r8g3wxyklkck9af1x7rg7hyj8fnf28fd34p12vv17mhnqzb4x4y";
+ rev = "f5788a31918e37bb5c04139048c667bcec9f1b62";
+ sha256 = "0gfi8dlgynciv3q5a208c7gd66g2r99b3zn0i31ibpppjqy2vcsk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7d1897c4c4a6f4b4527279e6dad976219d7b78/recipes/popup-switcher";
@@ -56478,15 +59229,36 @@
license = lib.licenses.free;
};
}) {};
+ posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "posframe";
+ version = "20180308.1627";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "posframe";
+ rev = "c29228eb2100503a0fda39252d4f11c1eb5acc56";
+ sha256 = "1k92gzzy6ys2f86jzggqlz3x6v665hwkafj3frj4mgmxp7yxsiw0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe";
+ sha256 = "02chwkc7gn7fxaaxsz9msmrhrd62bji5hhb71kdm019x8d84z06w";
+ name = "posframe";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/posframe";
+ license = lib.licenses.free;
+ };
+ }) {};
postcss-sorting = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "postcss-sorting";
- version = "20170531.1858";
+ version = "20180211.156";
src = fetchFromGitHub {
owner = "P233";
repo = "postcss-sorting.el";
- rev = "1320d74abd8ee7f0a09b5f7920d554650a7047a6";
- sha256 = "0071al1nwqazv8rhr7qm799rmizbqwgcrb5in3lm0sz88fbs9vnk";
+ rev = "deb0c935d2904c11a965758a9aee5a0e905f21fc";
+ sha256 = "03kng7i09px5vizvmmrar7rj3bk27y43bi8hlzxax0ja27k0c66c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9fae97430f211786f615f7450936f823e2a04ec4/recipes/postcss-sorting";
@@ -56544,12 +59316,12 @@
powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "powerline";
- version = "20171023.750";
+ version = "20180115.1942";
src = fetchFromGitHub {
owner = "milkypostman";
repo = "powerline";
- rev = "fda4fb96984607d4a6502b1d8c8898e56d10cf6c";
- sha256 = "1lz3kr8w9z9xx5amqqvim85asjji13q84d4r1cb5x77wajmj1p21";
+ rev = "2933f2b6d00a8cab39f73fc6231fac311cba5b29";
+ sha256 = "0fxkz7rqj057bnxfqgh3i88waqxnla05dqw20v8njf9swchry0ya";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline";
@@ -56628,12 +59400,12 @@
prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "prassee-theme";
- version = "20170406.1953";
+ version = "20180105.1644";
src = fetchFromGitHub {
owner = "prassee";
repo = "prassee-emacs-theme";
- rev = "7ce96272a514caa8598aa3c7227ade8a21e20daa";
- sha256 = "033qmd1rfjpiz27zz34b96dyc2lil08qdf9nn13sa915gc6704ps";
+ rev = "b68d13f929364b9bb087f8f587798144218f7dc6";
+ sha256 = "08r22xsrlycl0lyqg5qi5wv5w4zhdawmi8ikdgvn5776qaixb6r7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme";
@@ -56670,12 +59442,12 @@
preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "preseed-generic-mode";
- version = "20170802.1753";
+ version = "20180209.2100";
src = fetchFromGitHub {
owner = "suntong";
repo = "preseed-generic-mode";
- rev = "341d85f8ecdc8834956a0352ece542f45def88db";
- sha256 = "1p486absi0mlcangpbh6hs36wvlmm9s6f4ag0lzmw7w3ikhp88kn";
+ rev = "3aa8806c4a659064baa01751400c53fbaf847f66";
+ sha256 = "02yb5xkgwqxpwghhjmxf2gx0faifi04w2jd8cvfsiwzwqmqyhmv7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/preseed-generic-mode";
@@ -56691,12 +59463,12 @@
prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "prettier-js";
- version = "20170823.159";
+ version = "20180108.2326";
src = fetchFromGitHub {
owner = "prettier";
repo = "prettier-emacs";
- rev = "6cc79cc933968f9ecae988ed79398d9dc97790e2";
- sha256 = "01k1k68rwwpjdajc12dvpjr8jfncvj8lli2l6065jwbq8ldg2ja0";
+ rev = "fac9dd29720f8417bd8cd5dd8ab5138c6dd7d701";
+ sha256 = "00bgwzvha2i2sfi05jdzgpxvbjfpjhj5gv2vn3bnalgd1z3cz89r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js";
@@ -56901,12 +59673,12 @@
prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "prodigy";
- version = "20171107.1159";
+ version = "20180312.325";
src = fetchFromGitHub {
owner = "rejeep";
repo = "prodigy.el";
- rev = "9c6c494ffdabd3125980c98824bc3af800176624";
- sha256 = "0dy185gdkxscm3lwxcgaw6ad636wcha7kwi3zfmxkjm9zd90jfd1";
+ rev = "67b74d1354616f4761acd947fb4f89c6c8bd758e";
+ sha256 = "0pnkw65kr046368xd29rpfbf4x7qd9h430knpy8rgf4czqqvl3hw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy";
@@ -56940,6 +59712,27 @@
license = lib.licenses.free;
};
}) {};
+ prog-fill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "prog-fill";
+ version = "20180128.2019";
+ src = fetchFromGitHub {
+ owner = "ahungry";
+ repo = "prog-fill";
+ rev = "ad38e2f6a45a8dd7eb08c407506256dd2e045de1";
+ sha256 = "13dsihqs0wc2bjxgyiqb5xbav9va432qqkpl84a0rdrwndpc7lpc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/90d680ed481688c9899adb28fbd9a22a17fa8943/recipes/prog-fill";
+ sha256 = "0wnqzkzhaywcyw93z86pngpycsrd1mi79psmck6qbhms1aia79p3";
+ name = "prog-fill";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/prog-fill";
+ license = lib.licenses.free;
+ };
+ }) {};
prognth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "prognth";
@@ -57089,12 +59882,12 @@
projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "projectile";
- version = "20171109.240";
+ version = "20180316.2010";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "projectile";
- rev = "7dccd879f62c6a8386734ff6ffe57d73c435b332";
- sha256 = "1fw8fqhnid3psfz7maq3l229icwlxrjypxc4p4fmdqgvsnhr01ds";
+ rev = "981ef7de7cd4d2465e95ae649993561783d85bc8";
+ sha256 = "0za8a1p05xqss2n4y1pvmr686xzaqwqsnp8myc8d3xqpl5412ha3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -57110,16 +59903,16 @@
projectile-codesearch = callPackage ({ codesearch, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "projectile-codesearch";
- version = "20151228.20";
+ version = "20171129.600";
src = fetchFromGitHub {
owner = "abingham";
- repo = "codesearch.el";
- rev = "7013d933cd9d3c04f19a6572176483b48a311807";
- sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp";
+ repo = "emacs-codesearch";
+ rev = "4e6a2382c26d1218a4a007d31de2bab8ef9d2e7c";
+ sha256 = "030zbx1glr6m7sxy89c833iw1v3bgjkcg835c38hlazra1vq783p";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/aa69679a71495a9ebaa8fcaac42f6682a5167d00/recipes/projectile-codesearch";
- sha256 = "0jgvs9is59q45wh2a7k5sb6vj179ixqgj5dlndj9r6fh59qgrzdk";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6b1b1d3e356c6b9bffdcf98848918efe2fdfa8c7/recipes/projectile-codesearch";
+ sha256 = "1457dhmpgrq1qafr3v4ccw26ix10m60c5vlrpyqsfz8vh8lv0bb8";
name = "projectile-codesearch";
};
packageRequires = [ codesearch projectile ];
@@ -57152,12 +59945,12 @@
projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "projectile-git-autofetch";
- version = "20170612.1011";
+ version = "20171129.1447";
src = fetchFromGitHub {
owner = "andrmuel";
repo = "projectile-git-autofetch";
- rev = "51b40134000a2411c6342e865e63f74c950a9310";
- sha256 = "0g4g4sjinmigyxs1irxv0yg524iq2hy8za09ksm3wbnbfa7w35ml";
+ rev = "da02069d906e6e7f28ea1dd6a9196529315a5cba";
+ sha256 = "106kj49rxsrdh6awvql3zyr3ramdcn0aaq4rmbmd45hz9ij7x1wh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch";
@@ -57194,12 +59987,12 @@
projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-rails";
- version = "20171103.1004";
+ version = "20171117.730";
src = fetchFromGitHub {
owner = "asok";
repo = "projectile-rails";
- rev = "ff5f63df4e1403f5ab1286f1099a072a5f6694d9";
- sha256 = "0qxnpz0nmh3rxrqmw93abmxjf0fnhl0nyalywa8crhzfrd7qff79";
+ rev = "348b11b237e87d87e784ab7accaef2bf97664bd6";
+ sha256 = "1swlbndipa48hd6mhmgzi1x3bapdzn4cwd7j7a13wxfcj9s1jm9x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -57215,12 +60008,12 @@
projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }:
melpaBuild {
pname = "projectile-ripgrep";
- version = "20170211.857";
+ version = "20180301.651";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "ripgrep.el";
- rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d";
- sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx";
+ rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85";
+ sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
@@ -57534,8 +60327,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "8cf53f8dfca43b0347efcc1052033c96aa3f626c";
- sha256 = "1as1bj77zffc103wyw75wnng61z7bnnmbl9ds8glnq383gzqd99n";
+ rev = "ab95b1bc1eb964ee5f1fb48297344c5d37d35191";
+ sha256 = "0abx3gs9x081wn2p3pc7v2s9rfyv0a1fmrzfwlrv2i4cx1axafig";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57572,12 +60365,12 @@
psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "psc-ide";
- version = "20171031.129";
+ version = "20180101.1421";
src = fetchFromGitHub {
owner = "epost";
repo = "psc-ide-emacs";
- rev = "d28c33f65318a475133afc2f42e103db9251d2a2";
- sha256 = "19f9aw675d6crhd9j9jvqya39ddsf4f6hcwb03525k307syvg62y";
+ rev = "085e9d5541ccf35e876a6135daaddaa0a58f3bb2";
+ sha256 = "0q7xqrjvllngz658w32zm9jbz1njqwpaqgiv3b377nfnay9rsh3p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide";
@@ -57624,12 +60417,12 @@
psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "psession";
- version = "20171107.2313";
+ version = "20180314.205";
src = fetchFromGitHub {
owner = "thierryvolpiatto";
repo = "psession";
- rev = "d087644db226e2c66481d3c248e26afa9e4eb670";
- sha256 = "1hb8cs8kkqpd96fb5dc8fysgg29fvay0ky83n9nawwzq516396ag";
+ rev = "6f7c8d6807c76fd351380b2f6f273d800736c5ec";
+ sha256 = "1wc4fx5wqcqj2xzcch0wg5xr5vjdlqm04ljwz3cqv5ipdvqjz80z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession";
@@ -57708,12 +60501,12 @@
pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pug-mode";
- version = "20171018.829";
+ version = "20171208.2029";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-pug-mode";
- rev = "9dcebdb10c50620a3a5c6d71361d53bf482a482e";
- sha256 = "1rkbk8apd612ixksyssmmkrhswks6gbxl9kxhrbaxszfrrhqx86v";
+ rev = "894a86d0ae4e855ae6044af6d7e106f8996c97c2";
+ sha256 = "0phf9y5rcahhavbvnsh6hfm3ig7vr3fs7m503zv1sac9is5zxypi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
@@ -57813,12 +60606,12 @@
puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "puppet-mode";
- version = "20170928.1007";
+ version = "20171220.2249";
src = fetchFromGitHub {
owner = "voxpupuli";
repo = "puppet-mode";
- rev = "e04f041386ebfe29fc67c3407e85b577b820df4f";
- sha256 = "0hcp7hmxri62qcx80zqphlhwrhzapzi0c07kk4l2cm75xfy20a2l";
+ rev = "b3ed5057166a4f49dfa9be638523a348b55a2fd2";
+ sha256 = "0sgws5cl4vc8707l66lq0zi1p6pxik0474ihg9jczh2xxnq4clsk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -57834,12 +60627,12 @@
purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "purescript-mode";
- version = "20170926.242";
+ version = "20180120.709";
src = fetchFromGitHub {
owner = "dysinger";
repo = "purescript-mode";
- rev = "e2d6519a9669a1443db1040cf098bc3ea30ec861";
- sha256 = "1k8q32ipa684hvk7iwpdzqwikimw8g3j6gkmz9yi5fxflq6z1swr";
+ rev = "b76c7f37f1a3527e8ace66bbd584851e1f803cc8";
+ sha256 = "0nnrfs1siz4wwn56razlig6cvi8fqgcgk5wv5b0iyizq8a8wwia7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode";
@@ -58148,12 +60941,12 @@
pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pydoc";
- version = "20170429.1158";
+ version = "20180302.2041";
src = fetchFromGitHub {
owner = "statmobile";
repo = "pydoc";
- rev = "916153516382e5546b59b46342c58ed76cf27faf";
- sha256 = "18ba5mcp030l6ywdq70ryvbwn7af28kp0xi8h1bma5mwcxj2sg2c";
+ rev = "146a006493f5284fdf23b42ef90454f1be25d0c1";
+ sha256 = "1wk9zkwqi7vf0jpsf5y7hz0z198x4k9xp2fpqggkqfbv007ks1qq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc";
@@ -58193,8 +60986,8 @@
src = fetchFromGitHub {
owner = "proofit404";
repo = "pyenv-mode";
- rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820";
- sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn";
+ rev = "eabb1c66f9e0c0500fef4d089508aad246d81dc0";
+ sha256 = "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode";
@@ -58210,12 +61003,12 @@
pyenv-mode-auto = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pyenv-mode, s }:
melpaBuild {
pname = "pyenv-mode-auto";
- version = "20160122.2341";
+ version = "20180216.2352";
src = fetchFromGitHub {
owner = "ssbb";
repo = "pyenv-mode-auto";
- rev = "714e322319ad7a8f5f2a3691aa431537b8a1b26c";
- sha256 = "1sclhzv3w9fg54dg4qhlfbc0p1z5clyr8phrckhypvlwfgbar4b4";
+ rev = "08f319efbc31571f391e032379169ab90fa71418";
+ sha256 = "089n0s0vhwysgrkpjidy7gsl6skmzz2lg011mgiskfvqwijj2vyx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto";
@@ -58256,8 +61049,8 @@
src = fetchFromGitHub {
owner = "JackCrawley";
repo = "pygen";
- rev = "430e2a059b6e2b0d76700cf79a3de55d9deefd9b";
- sha256 = "1blb9j3y1vfph0gxsslr4gw2diyqqb6xbkrkkcp8vzmx4jr06ki3";
+ rev = "9019ff44ba49d7295b1476530feab91fdadb084b";
+ sha256 = "01gmggjv36jc8660xfpfy70cydabhymd17q3z16cjqvsxapbj7nf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e761724e52de6fa4d92950751953645dd439d340/recipes/pygen";
@@ -58270,22 +61063,22 @@
license = lib.licenses.free;
};
}) {};
- pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
+ pyim = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }:
melpaBuild {
pname = "pyim";
- version = "20170916.2024";
+ version = "20180206.1419";
src = fetchFromGitHub {
owner = "tumashu";
repo = "pyim";
- rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a";
- sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w";
+ rev = "c670df2a338ca956b6103fd388f81a551bfc33f8";
+ sha256 = "1pkjwcwz6xagamigsv25bxydda1yxzphw0xfclpi21raqnr9f1s6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
name = "pyim";
};
- packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ];
+ packageRequires = [ async emacs popup pyim-basedict ];
meta = {
homepage = "https://melpa.org/#/pyim";
license = lib.licenses.free;
@@ -58357,12 +61150,12 @@
pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "pyimport";
- version = "20170808.346";
+ version = "20180308.952";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "pyimport";
- rev = "50789ef8c5e19997bd5b0d4c47acb7660d128e76";
- sha256 = "1g4kp6m9bqpvyp0wy1bjx8246mqvdy5jznl1ash1qn7gr07kb34s";
+ rev = "a6f63cf7ed93f0c0f7c207e6595813966f8852b9";
+ sha256 = "1q5gqhvh4zq5dy8vns694warcz48j1hdnxg16sjck4gsi9xivbvs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -58403,8 +61196,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "7f6bae953ad2515b5849b90a9b7b3a64f52ea3c6";
- sha256 = "0iz3f94kghda379sspv4k8s23ykhwc70q877j12l5msq1b858gcv";
+ rev = "03aa4ca2d6a78a4d9dc69438cbc76b982aca1569";
+ sha256 = "0a8jdksaabm8ybpk0fzp58v9zy4vld1h857nwxf0crk68r50dv6z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -58417,6 +61210,27 @@
license = lib.licenses.free;
};
}) {};
+ pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "pynt";
+ version = "20180203.2100";
+ src = fetchFromGitHub {
+ owner = "ebanner";
+ repo = "pynt";
+ rev = "92b3f0e7ee88dde641b9f62c50431f7c499dcf1e";
+ sha256 = "1wn1gjql7g2dg7bnwqgx3r66b0hnxcmpmbh1wc5nc312wnklpz6f";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt";
+ sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3";
+ name = "pynt";
+ };
+ packageRequires = [ deferred ein emacs epc helm ];
+ meta = {
+ homepage = "https://melpa.org/#/pynt";
+ license = lib.licenses.free;
+ };
+ }) {};
pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "pytest";
@@ -58546,12 +61360,12 @@
python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-mode";
- version = "20171113.324";
+ version = "20180121.50";
src = fetchFromGitLab {
owner = "python-mode-devs";
repo = "python-mode";
- rev = "7c4683ff12e32844f53bb31db2b3feab56cd7164";
- sha256 = "0abxip189gyhqkchwsbnylrcgxn1py9fyvrxjvrkfr24qr9m30qq";
+ rev = "c9009f6753e05a4182674fdd3d9f80808de2dc2f";
+ sha256 = "01r54skcxkjd6ihx7spx4rmp1b4x02yy9my93qgb4bkg3mwsbq5w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -58564,6 +61378,34 @@
license = lib.licenses.free;
};
}) {};
+ python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }:
+ melpaBuild {
+ pname = "python-pytest";
+ version = "20180307.844";
+ src = fetchFromGitHub {
+ owner = "wbolster";
+ repo = "emacs-python-pytest";
+ rev = "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70";
+ sha256 = "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest";
+ sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4";
+ name = "python-pytest";
+ };
+ packageRequires = [
+ dash
+ dash-functional
+ emacs
+ magit-popup
+ projectile
+ s
+ ];
+ meta = {
+ homepage = "https://melpa.org/#/python-pytest";
+ license = lib.licenses.free;
+ };
+ }) {};
python-switch-quotes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-switch-quotes";
@@ -58609,12 +61451,12 @@
python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
melpaBuild {
pname = "python-x";
- version = "20171006.336";
+ version = "20180218.1447";
src = fetchFromGitHub {
owner = "wavexx";
repo = "python-x.el";
- rev = "9bf0d16cfe7b5f24b98d6b33cbc8763edaceb174";
- sha256 = "0x255lnfyv2i7yz6ipx5adazqmvgmf4mdcixzs1wv85gazmbgfc5";
+ rev = "35d6719953e809a07c0bb8f770deb5fa712d00e5";
+ sha256 = "1s24a9ji549nhlanm13gq7ghnz0zj6mwpbbmbqk8igsw3arx2nvr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x";
@@ -58630,12 +61472,12 @@
pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "pythonic";
- version = "20160221.1123";
+ version = "20180208.214";
src = fetchFromGitHub {
owner = "proofit404";
repo = "pythonic";
- rev = "87475def246b84339f464e80c76c7e7fcc2e780a";
- sha256 = "1j93c4rx7llyfvfvvvcrcpsj47zb56kkdii1lnyzay4n5zakhjhf";
+ rev = "e8102636cdd44a65638e3752fac9834a4ea87504";
+ sha256 = "1v8qq9g9hdyia2hjkwwhsaikz528xkcirqpkgv6m9glbd3831h21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic";
@@ -58651,12 +61493,12 @@
pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pyvenv";
- version = "20171005.1106";
+ version = "20180304.712";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "pyvenv";
- rev = "9f528449dfc35516647118689a2104603f23b49c";
- sha256 = "11yznfndkbyl6cmi7blxrr5yw9b32qw01abhvsj8jz1g1wnxhn45";
+ rev = "f83c31a825138645dc55db49c5389cd8c7bf7b42";
+ sha256 = "0xq71zbwfl0ijmljcsq74nxmm2pj8m3rbdpwpcdk2j2i6zx2wgr6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -58756,12 +61598,12 @@
quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "quasi-monochrome-theme";
- version = "20170124.136";
+ version = "20180307.458";
src = fetchFromGitHub {
owner = "lbolla";
repo = "emacs-quasi-monochrome";
- rev = "7d3afe41c2696ee25e3e4bcce987af1f589208d6";
- sha256 = "0bn1yzxzj6r1k3xcp45l04flq4avzlh0sbjfyiw4nglfhliyvwcf";
+ rev = "7c1217521616f568a1c9aba76cc87a7381b833a4";
+ sha256 = "1yg3dg6ldlpxgsxxd15qgpda0jivj4g4cyy631hakdrp5skvpmk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme";
@@ -58777,12 +61619,12 @@
quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
melpaBuild {
pname = "quelpa";
- version = "20170727.557";
+ version = "20171207.1139";
src = fetchFromGitHub {
owner = "quelpa";
repo = "quelpa";
- rev = "c095fa14046c1313b97df4ec102bdea5a981ff1d";
- sha256 = "159pkv7q0kz3slc34489gnfbyw07g3iphkx6mvzqkxql8k2iw0v7";
+ rev = "fc393aeb3bb1a9a35e603515d13c90cc008caece";
+ sha256 = "1zkx7bpzmphhfwgqf5pfwf6qb4vjwgvhmds38vm6h2302hl4racx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -59005,22 +61847,22 @@
license = lib.licenses.free;
};
}) {};
- racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
+ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, rust-mode, s }:
melpaBuild {
pname = "racer";
- version = "20170218.516";
+ version = "20171211.1548";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "emacs-racer";
- rev = "6e0d1b3ebd54497c0cc995a92f09328ff101cd33";
- sha256 = "0sz78cnx6gifsgd1r1l1p8bkjc5jwfh57yvwabc9zzgivfimhcb5";
+ rev = "cb74060bbaff8e505ba36e20e4a3a763ee7dd4c8";
+ sha256 = "1azhvwm42sracyg9vj51k72pq3mm2gfimdvrbz50p5ijmirmllja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
name = "racer";
};
- packageRequires = [ dash emacs f rust-mode s ];
+ packageRequires = [ dash emacs f pos-tip rust-mode s ];
meta = {
homepage = "https://melpa.org/#/racer";
license = lib.licenses.free;
@@ -59029,12 +61871,12 @@
racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "racket-mode";
- version = "20171110.1153";
+ version = "20180313.719";
src = fetchFromGitHub {
owner = "greghendershott";
repo = "racket-mode";
- rev = "b4eb09a794ba31dbe545553a54a0f232ec30e082";
- sha256 = "1wwdzal764v9fy6n05y8swsmv92nn5d15d1qxd0pjp3sqhkrsivk";
+ rev = "62c40b5a166f3d15d4ab82f5ccc0bbbd0fe90334";
+ sha256 = "0v3myl2sfpk8b4n9xsnpwn37f7bzxyh99lm3ya1qj8p3qvmqszgv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -59071,12 +61913,12 @@
railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "railscasts-reloaded-theme";
- version = "20170314.146";
+ version = "20180131.2246";
src = fetchFromGitHub {
owner = "thegeorgeous";
repo = "railscasts-reloaded-theme";
- rev = "bd6e385752c89760fdee7bdf331e24d1d80ee7e9";
- sha256 = "17vr2mbz1v20w7r52iqb7hicy131yaqhifbksvknx8xnm6z27pnm";
+ rev = "6312f01470dcc73537dbdaaccabd59c4d18d23a9";
+ sha256 = "1fqpqgkpn36kj3fb4na0w4cjwln05rvy6w1q5czas8z37rk2bs33";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
@@ -59176,12 +62018,12 @@
rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rake";
- version = "20170921.801";
+ version = "20180212.208";
src = fetchFromGitHub {
owner = "asok";
repo = "rake";
- rev = "a27322262ebcce7765574b577000f6f939400206";
- sha256 = "1fzlll8s5vri5hmqsx5ilbrms73b0rsn3k6m5dgq6rhgn5z5k6r1";
+ rev = "9c204334b03b4e899fadae6e59c20cf105404128";
+ sha256 = "09k2fqkmqr6g19rvqr5x2kpj1cn3wkncxg50hz02vmsrbgmzmnja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake";
@@ -59491,12 +62333,12 @@
rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rdf-prefix";
- version = "20170915.1200";
+ version = "20180127.1006";
src = fetchFromGitHub {
owner = "simenheg";
repo = "rdf-prefix";
- rev = "25cc3c8902f16191496b549705b00ffc7dff51f1";
- sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy";
+ rev = "164136d05505275d42d1ca3a390f55fcc89694b8";
+ sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -59638,12 +62480,12 @@
real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "real-auto-save";
- version = "20170918.730";
+ version = "20180107.1850";
src = fetchFromGitHub {
owner = "chillaranand";
repo = "real-auto-save";
- rev = "780d6c1c219e1f1efde1159a99af97b1c54c005d";
- sha256 = "1wcyvyc3nwr9a89v8i4wmqvy2fwf7x7f3kcj7a8kdnp2albkvwsa";
+ rev = "d813632c1e754539cc92953ac4c3609105f9af58";
+ sha256 = "0gz0w7zxl865shz9mf5xv8xi5mjq969600jqh4laazvhyk32skmg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save";
@@ -59659,12 +62501,12 @@
realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild {
pname = "realgud";
- version = "20171006.1840";
+ version = "20180312.1514";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-dbgr";
- rev = "081f7edc79a8e510d47e10c6ce4306b2f850df1f";
- sha256 = "0nj95w5jfck0lhnrrnrl6h31cvgnpizbhnr52k7mf360vwrsjil6";
+ rev = "6706358aa7adbfc6b551d8a2fd394287b01070e5";
+ sha256 = "1m9j3gfz9nhlvdfxrn1qf6fysj6zjjzyvr4vs8wnd7zdv2s4cvrw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -59686,12 +62528,12 @@
realgud-byebug = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
melpaBuild {
pname = "realgud-byebug";
- version = "20160805.732";
+ version = "20180308.1923";
src = fetchFromGitHub {
owner = "rocky";
repo = "realgud-byebug";
- rev = "cb75d6bd9abbe04afa4c74a7ce9c66852814e0c3";
- sha256 = "04fn27a079zsdrf08w4rrvw9xd473ni1bh57gbizdznnvgjldfkr";
+ rev = "de603d58aa9ef72a2619247a0234fccf6bc2cc9a";
+ sha256 = "1hk2z7axy1v5yvx4xgkisfk00varq5rf8j88f0l63ywylyw1fwhl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug";
@@ -59791,12 +62633,12 @@
rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rebecca-theme";
- version = "20170730.943";
+ version = "20171114.2208";
src = fetchFromGitHub {
owner = "vic";
repo = "rebecca-theme";
- rev = "add349748d0f648587bf17d14036677570f081aa";
- sha256 = "1932ga5j5cv3w32iwxjdjs2jdz20sw5ai10dnxb6bdzh68kkw4f3";
+ rev = "f34089f176def79ecee5feda7dd79896f555bbe2";
+ sha256 = "08kavajrmp3lxl9r67rg9710326ynywlklz73vdijpzjpyhp5al5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -59830,6 +62672,48 @@
license = lib.licenses.free;
};
}) {};
+ recentf-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "recentf-ext";
+ version = "20170925.1735";
+ src = fetchFromGitHub {
+ owner = "rubikitch";
+ repo = "recentf-ext";
+ rev = "450de5f8544ed6414e88d4924d7daa5caa55b7fe";
+ sha256 = "1jylpqgngbl594a1qvd305m9lda48cib4dsasimdqxp20d4c56iy";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/recentf-ext";
+ sha256 = "122kns45l75cdwxbfjznks3kvm5jc89ik714ij2qx14qyik0xmni";
+ name = "recentf-ext";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/recentf-ext";
+ license = lib.licenses.free;
+ };
+ }) {};
+ recentf-remove-sudo-tramp-prefix = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "recentf-remove-sudo-tramp-prefix";
+ version = "20180204.2156";
+ src = fetchFromGitHub {
+ owner = "ncaq";
+ repo = "recentf-remove-sudo-tramp-prefix";
+ rev = "6d23ebc3f52b0a66236c171c45cc77a4d3aba541";
+ sha256 = "0rzs9fmy1iqips6px0v57wnplbxmm3sbnk6xcszwhkwwp563hk32";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0bf1761715ee4917ba0823adbda03859d5b8131a/recipes/recentf-remove-sudo-tramp-prefix";
+ sha256 = "01kdpx7kqd39a5hjym5plcj5d8szzghigq9mq186mggayg8q44cr";
+ name = "recentf-remove-sudo-tramp-prefix";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/recentf-remove-sudo-tramp-prefix";
+ license = lib.licenses.free;
+ };
+ }) {};
recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "recompile-on-save";
@@ -59980,12 +62864,12 @@
redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "redprl";
- version = "20171030.1346";
+ version = "20180227.723";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "6688fa7e190d5512b2bfc4ac70e6ba2f3bcc6462";
- sha256 = "0vj4mbndpawvm5sm7b0pvbi5nnd1vsvzk2qk3h9ln7i04lilsxmd";
+ rev = "8482615ea753ff78aad2f16565ff3a918e7f6435";
+ sha256 = "1h6y2b0073xm996w4858w2xfhj97viq1fn674sfz21g93w4gjw51";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -59998,6 +62882,27 @@
license = lib.licenses.free;
};
}) {};
+ redshank = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
+ melpaBuild {
+ pname = "redshank";
+ version = "20180128.1348";
+ src = fetchFromGitHub {
+ owner = "emacsattic";
+ repo = "redshank";
+ rev = "f3eef7d4891570e6bcb74eb52c73edb765a639b8";
+ sha256 = "00mihmjd0amr9wzb3qsz69bp7y5iqx9vvh1hg77i57zlm88x6ma6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2677a5cf74ebace6510517f47eaa43b35f736683/recipes/redshank";
+ sha256 = "0p18rkn09qb4ssr6jix13kqc3jld407qr2z2k8z78i3xy4bfzr5f";
+ name = "redshank";
+ };
+ packageRequires = [ paredit ];
+ meta = {
+ homepage = "https://melpa.org/#/redshank";
+ license = lib.licenses.free;
+ };
+ }) {};
redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "redtick";
@@ -60022,12 +62927,12 @@
refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "refine";
- version = "20170322.1527";
+ version = "20180315.1528";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refine";
- rev = "55984dbd570c361e7d56d85f2d4ecfbcc567bda1";
- sha256 = "0amj5i69cgk0p0c3wlm68dgrav8in5n19msglnks210mbfd1vzhj";
+ rev = "0a99439a0b4ed6f79b9a240ea1270140a9e328bc";
+ sha256 = "1scw449mbmr70kb0r2ymhph9j0s5ym77ijp5fpwph9bri46cad3g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@@ -60110,8 +63015,8 @@
src = fetchFromGitHub {
owner = "zonuexe";
repo = "right-click-context";
- rev = "10578576f6cb2945aed00fdcd585fc65cd2c5c31";
- sha256 = "07bhw6ll2ad5725rq6jlvp2v8aqhlrbsywjng5ypmcvds5dhgbsk";
+ rev = "2f8195fb81b8d27aeb42bdc4055ebce37c09717b";
+ sha256 = "05fr1gg5xfwp4rmyyn181vxn2mhmb3aca1g1rp2nk36v7lfzgpxv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert";
@@ -60171,13 +63076,13 @@
pname = "related";
version = "20161002.2310";
src = fetchgit {
- url = "https://bitbucket.org/lyude/related";
+ url = "https://bitbucket.org/julien-montmartin/related";
rev = "0065a2e16eeaa9bface49f7f0815b9cf9719f441";
sha256 = "0gaj1mqv77dahw6zfqlf8q624b2ba589chgaa22vy4vg3lz6qzks";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a39b2fd835f6911e3dd2b42987f65d5bbea36091/recipes/related";
- sha256 = "098rd8rvlx9shbh05zdw7lnrawfkbk4cfan1i963h994538sda1w";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6248cbbb6c977c9c9332a34b449eb090dd9322b3/recipes/related";
+ sha256 = "0nm2dnmz4a5z187mzggsj8xrdy1x84lxx79rmwcrkh1d7jzjhi6f";
name = "related";
};
packageRequires = [ cl-lib ];
@@ -60228,22 +63133,22 @@
license = lib.licenses.free;
};
}) {};
- remark-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+ remark-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "remark-mode";
- version = "20151004.955";
+ version = "20171217.2356";
src = fetchFromGitHub {
owner = "torgeir";
repo = "remark-mode.el";
- rev = "a7e22eaf17673bd5cbf2f80bdfb219c89c1ea74b";
- sha256 = "0w40cx58c0hmc0yzs8maq1389hwha0qwfbz76pc6kpcx14v1gkhh";
+ rev = "e8a95f25d865d6165a7fdb1cadf5e6f0bb5ee73b";
+ sha256 = "01qdaby7mn5d8y95wcbqzwzcbjmf2329g6yjbvmdd1gn6s7qzs0b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/161a45835a153c6ac81b99311482f5dd36507da1/recipes/remark-mode";
sha256 = "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0";
name = "remark-mode";
};
- packageRequires = [ markdown-mode ];
+ packageRequires = [ emacs markdown-mode ];
meta = {
homepage = "https://melpa.org/#/remark-mode";
license = lib.licenses.free;
@@ -60420,12 +63325,12 @@
req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
melpaBuild {
pname = "req-package";
- version = "20170826.2252";
+ version = "20180121.2100";
src = fetchFromGitHub {
owner = "edvorg";
repo = "req-package";
- rev = "179ab70bb3d4f7a94401dace64f695c50acfe389";
- sha256 = "1j54l002vq8hz1pghyas4aalqhsnma5czjh4fh5s5cs4v7v6d7s8";
+ rev = "699d5aa9204c07905db4574406f771c69aa5752c";
+ sha256 = "15q8lsld2k8yd8wqrn0hsnj8xvmwj9zgpbrqzjda452jdqsznfcm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
@@ -60567,12 +63472,12 @@
restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "restclient";
- version = "20170727.825";
+ version = "20180316.851";
src = fetchFromGitHub {
owner = "pashky";
repo = "restclient.el";
- rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518";
- sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra";
+ rev = "859d944796ce298b5779d9d256bd8d271d57e221";
+ sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -60592,8 +63497,8 @@
src = fetchFromGitHub {
owner = "pashky";
repo = "restclient.el";
- rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518";
- sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra";
+ rev = "859d944796ce298b5779d9d256bd8d271d57e221";
+ sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -60609,12 +63514,12 @@
restclient-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }:
melpaBuild {
pname = "restclient-test";
- version = "20160618.315";
+ version = "20180106.1246";
src = fetchFromGitHub {
owner = "simenheg";
repo = "restclient-test.el";
- rev = "a21e41b905b423e762eeb4da3a236c8b1aea8c49";
- sha256 = "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih";
+ rev = "4518561bc9661fedacb6fb352e9677207f45c418";
+ sha256 = "0hbilpn77w0vykga9p4dkwaygipyna7mwn24y2kwfcahcr39pqjb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82e3078fc1f96d276fd288c3d7b91df5df4717a6/recipes/restclient-test";
@@ -60651,12 +63556,12 @@
reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "reverse-im";
- version = "20170721.940";
+ version = "20180213.525";
src = fetchFromGitHub {
owner = "a13";
repo = "reverse-im.el";
- rev = "63fb1edee017177c44f8b663a707201b3dd78345";
- sha256 = "1ha4ldfcnw57rg15mbxspymgs6b2b50f6s0fcb6d7k9xai5idmnp";
+ rev = "16931909115a922b1cf3846b1f60509b6590001f";
+ sha256 = "0ccpnd1n9z18wpf8m9xyx5gps2xh5kxv8s1q2zan2zs9f46sz9pc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im";
@@ -60693,12 +63598,12 @@
review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "review-mode";
- version = "20171029.650";
+ version = "20180312.535";
src = fetchFromGitHub {
owner = "kmuto";
repo = "review-el";
- rev = "115cd06558c01889f89feaa659e0d7513a2ad21e";
- sha256 = "0162gg3hf633zhr5jwj222lx143xvph001qmpmlbbqdxc0sgw5hv";
+ rev = "bf38b0ce8be2eef1cf810ac6f3664d2190bb9ef7";
+ sha256 = "0vmv19qvpba715xqx18dmlxq9kgkzvkf6jfd03bdcj2lh804y3pb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode";
@@ -60735,12 +63640,12 @@
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "rg";
- version = "20171018.1317";
+ version = "20180312.2254";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14";
- sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g";
+ rev = "a3516855e12e58cef5894ddf1ca7f7b524c804d7";
+ sha256 = "1hc85c0ffkiawy3ifln8i6rak3samdzlsyl5kz7rqgg8x9pzvaf4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -60802,8 +63707,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "rich-minority";
- rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4";
- sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b";
+ rev = "a50d9b2fd059f6a0e5b22063a5375851a087f61a";
+ sha256 = "126slgxa786rcbxdnazyn7svkwk31hy1c2ab7kzswf8f0k81fqk8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
@@ -60903,12 +63808,12 @@
ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ripgrep";
- version = "20170810.1118";
+ version = "20180301.650";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "ripgrep.el";
- rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d";
- sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx";
+ rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85";
+ sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -60945,12 +63850,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
- version = "20171029.1156";
+ version = "20180314.845";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
- rev = "4c10dcd764ade8e3d5dc235c26ba9299576a513d";
- sha256 = "034hrzcvbnsrr9cxy2wzggnsax708hd231hfkixwffzrrwdlhwz8";
+ rev = "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0";
+ sha256 = "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -60966,12 +63871,12 @@
robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild {
pname = "robe";
- version = "20170611.1755";
+ version = "20171116.1249";
src = fetchFromGitHub {
owner = "dgutov";
repo = "robe";
- rev = "9305fa042c40a32a2fcf60f935c0796dc67b5c55";
- sha256 = "0jx3pnz9m9bxlga867qdb6midz82mfl4wzn9dsfihkl399hbj46j";
+ rev = "7829f4fdda41eee0add8868646ab86e6b17de4b4";
+ sha256 = "1h526m21g0yqpry8dh42aj8nv4lp74dc1cmcyfb16sx5rrk0vx27";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
@@ -61176,12 +64081,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20171027.1028";
+ version = "20180224.1658";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "dadd74f015f89317ff77424be30a9accadeeb4a4";
- sha256 = "1ylasq4byd2vhaliq34cs86873z7v5w6yzhm4zc457fazsmb8s25";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61215,6 +64120,27 @@
license = lib.licenses.free;
};
}) {};
+ rubik = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "rubik";
+ version = "20180222.1214";
+ src = fetchFromGitHub {
+ owner = "Kurvivor19";
+ repo = "rubik-mode";
+ rev = "c8dab1726463dbc9042a0b00186e4a8df02eb868";
+ sha256 = "13razzmk70h5sd69ms0a3ljr285zcad0wnrqkfxbgi5rnppqlkh1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik";
+ sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267";
+ name = "rubik";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/rubik";
+ license = lib.licenses.free;
+ };
+ }) {};
rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rubocop";
@@ -61320,6 +64246,27 @@
license = lib.licenses.free;
};
}) {};
+ ruby-extra-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ruby-extra-highlight";
+ version = "20171106.1133";
+ src = fetchFromGitHub {
+ owner = "Lindydancer";
+ repo = "ruby-extra-highlight";
+ rev = "83942d18eae361998d24c1c523b308eea821f048";
+ sha256 = "18mq0ap7f0b22cdp2wdj0y2fqsahm2ngf7fvdy0mkkfs3818awlp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/73488b0aea4eb470a1f235fece0753797bfd7e35/recipes/ruby-extra-highlight";
+ sha256 = "0dybf39yv0yzy8bsz9k5s64033id6hq4v268m11la4bp5fbv5r37";
+ name = "ruby-extra-highlight";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ruby-extra-highlight";
+ license = lib.licenses.free;
+ };
+ }) {};
ruby-factory = callPackage ({ fetchFromGitHub, fetchurl, inflections, lib, melpaBuild }:
melpaBuild {
pname = "ruby-factory";
@@ -61348,8 +64295,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "ruby-hash-syntax";
- rev = "bc05c3130a5d3237f04c6064297e56de5f73887d";
- sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414";
+ rev = "90e0fc89a2b28c527fcece7ee90d5783694a4406";
+ sha256 = "1lkicxingcvs4inxvkrpxknylf09a506plbzx6bfiq9dicsnlw14";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax";
@@ -61467,15 +64414,36 @@
license = lib.licenses.free;
};
}) {};
+ rum-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "rum-mode";
+ version = "20180126.1622";
+ src = fetchFromGitHub {
+ owner = "rumlang";
+ repo = "rum-mode";
+ rev = "893b1a26244ef6ea82833a9afbc13cb82c0cfb53";
+ sha256 = "0lgahv25a9b2dfgkcm9ipyziiqnr3sb9l2dvzm35khwf3m8dwxgq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9f8ce2dee376f1f34e89e9642c472a148fca77/recipes/rum-mode";
+ sha256 = "1838w8rk5pgp1hn7a0m83mfw9jin4qv5mkyl68hl3gj7g9lhn7sd";
+ name = "rum-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/rum-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
run-stuff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "run-stuff";
- version = "20170813.1957";
+ version = "20180208.2348";
src = fetchFromGitHub {
owner = "ideasman42";
repo = "emacs-run-stuff";
- rev = "2e23a78c26f62141142c743febd57ec54c78c0e3";
- sha256 = "04m7hpda5hbmr0dni4cnpdjxwzk3sygpr5m158gswhbwh2p4r0j4";
+ rev = "ed42a7bc9a197ccf1ca87f9937bf98f0a9ed3f92";
+ sha256 = "1w49v868n3723q6887y4bc5q8spd7xync5d581vvxdpi75qgvr0z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6e9ce2acd859b887f7e161f4b9969be1a0b8ef/recipes/run-stuff";
@@ -61554,12 +64522,12 @@
rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rust-mode";
- version = "20171106.510";
+ version = "20180303.854";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-mode";
- rev = "04e3078ffc5f4b95e0a62960e36866d4bf1a9537";
- sha256 = "1gj3wyb0bdz7a80bysji241pw47gy20k5f1jif3m2j186ki6f2s5";
+ rev = "42c98bbf3550aff91fd2a3f24637508b408d4cdb";
+ sha256 = "0l0dk7w1jklg8sh5i8sxh6ggcyb9gna0n72b0icvyfihqn25qk30";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -61600,8 +64568,8 @@
src = fetchFromGitHub {
owner = "senny";
repo = "rvm.el";
- rev = "8e45a9bad8e317ff195f384dab14d3402497dc79";
- sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
+ rev = "134497bc460990c71ab8fa75431156e62c17da2d";
+ sha256 = "1z5psj8mfp0fw8fx6v1sibf8cxhz30yyiwjw17w80f9c24g0j4ii";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/rvm";
@@ -61617,12 +64585,12 @@
ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ryo-modal";
- version = "20170217.1021";
+ version = "20180222.415";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "ryo-modal";
- rev = "f6073b56c43a8bc4fc01eb27faba3335d556606a";
- sha256 = "1pq8c79qrs2zwp8q89rhm5lmcpl48axnc9mwl10gq4jy2rlzfrks";
+ rev = "4d10e251ca734548e48e7f0785b3b69a6e863f67";
+ sha256 = "1pqq2mzrfam7lzilpgqnzr192dsisgxnnnkilyksqfk1q199p9my";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal";
@@ -61638,12 +64606,12 @@
s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "s";
- version = "20171102.227";
+ version = "20180227.51";
src = fetchFromGitHub {
owner = "magnars";
repo = "s.el";
- rev = "5e9a6857d42015c67681616aa3519f599f97b8d8";
- sha256 = "00g7nvcbf1291npid30pih72209l5hv2fpv6s6m5i1vg94z081fg";
+ rev = "5968b951bd646c003f2825f31cdf9da94d6f1cae";
+ sha256 = "1ai8r6dmlvaa702yr74dbph97kp5xar3h147ahpk3vj1gh5irvnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
@@ -61698,6 +64666,27 @@
license = lib.licenses.free;
};
}) {};
+ s3ed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "s3ed";
+ version = "20180204.549";
+ src = fetchFromGitHub {
+ owner = "mattusifer";
+ repo = "s3ed";
+ rev = "13503cb057bed29cb00a14dffe4472b5cb7748ad";
+ sha256 = "1ak5nmay12s4ipmvm1a36kyny05xhzmj7wp6dry391db9n7g2wy0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/32ba78167bd6908b49f340f6da48643ac38f25f2/recipes/s3ed";
+ sha256 = "08scv3aqnidz28rad5npz7b4pz9dx05rs72qkp3ybkk2vhqf2qwa";
+ name = "s3ed";
+ };
+ packageRequires = [ dash emacs seq ];
+ meta = {
+ homepage = "https://melpa.org/#/s3ed";
+ license = lib.licenses.free;
+ };
+ }) {};
sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sackspace";
@@ -61722,12 +64711,12 @@
sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "sage-shell-mode";
- version = "20171103.333";
+ version = "20180215.35";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage-shell-mode";
- rev = "75b84fdba1e0f4511e518b7e56c816f1ace49024";
- sha256 = "1mysq81xnwarcqvwda17n90fy25mp57gvijrccnxw91ni2wncyl4";
+ rev = "9f07ff835e8d19afe571dbe414afb690c7b1cb5c";
+ sha256 = "07al41ir1ab0z2m2acvx63scr33bfp3asshjl05shs4j9d4bkmdp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -61740,6 +64729,27 @@
license = lib.licenses.free;
};
}) {};
+ sailfish-scratchbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sailfish-scratchbox";
+ version = "20171202.532";
+ src = fetchFromGitHub {
+ owner = "vityafx";
+ repo = "sailfish-scratchbox.el";
+ rev = "bb5ed0f0b0cd72f2eb1af065b7587ec81866b089";
+ sha256 = "1b53mdqgcmjay3i3fnxnycv8crqi20yvyv57ybgs2ikfl3v282h2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e76261e7dffcb607839440843b085709c2c90b26/recipes/sailfish-scratchbox";
+ sha256 = "1s0glsi4fm6is7fv9vy1h14frq8a4bgahkc8w08vqfnpiin2r567";
+ name = "sailfish-scratchbox";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/sailfish-scratchbox";
+ license = lib.licenses.free;
+ };
+ }) {};
salesforce-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "salesforce-utils";
@@ -61764,12 +64774,12 @@
salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
melpaBuild {
pname = "salt-mode";
- version = "20170702.246";
+ version = "20180118.1754";
src = fetchFromGitHub {
owner = "glynnforrest";
repo = "salt-mode";
- rev = "a41c07660199cfad3f9dd928d5674d2727508035";
- sha256 = "0y7z4lfvhd1aiyhy0yhrx9jdjsy2k1di6y747rjmf0rlwcq2gb2q";
+ rev = "e46c28ef77663391519646c79641c9d177f70d35";
+ sha256 = "13zk20bif05qgpqsx9hf6ri7qkxqq7nicp2lb84dg7id24md22x9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
@@ -61953,12 +64963,12 @@
sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sbt-mode";
- version = "20171111.1558";
+ version = "20180314.1511";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-sbt-mode";
- rev = "84c3d178a1f2c580f620fd8f03a05ac6413086a3";
- sha256 = "1ndxylb2jbnfrrsbbs5vcxygrqd3ssf3az01nh694hv6lkcidw5k";
+ rev = "aebea880b3d3de606d8d8c8d65bc6a5040f52d1f";
+ sha256 = "1iqbigqdv1g12q2bg0f6j7xl0z1ra7vy4k8h1wfqxvlb9fqfqr1y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -61974,12 +64984,12 @@
scad-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scad-mode";
- version = "20170219.2003";
+ version = "20180108.1809";
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "7cb1e939b78c9f489d0c79812fe6c2a582113cfa";
- sha256 = "0mjdkc468w58x398ysgchshhv600px95sz7i8yfrjrhpdfn4yg5l";
+ rev = "3e7fbfff14baf75c5f0c23496ac3fb5c5e6f8a96";
+ sha256 = "12vs4k6ci02jw9l2z0iknm1mhs0w8kis2b9r5r1ip61nb9d43qx1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -62180,6 +65190,27 @@
license = lib.licenses.free;
};
}) {};
+ scp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "scp";
+ version = "20171203.1851";
+ src = fetchFromGitHub {
+ owner = "tszg";
+ repo = "emacs-scp";
+ rev = "447305db246d9c9240678dd9c734ed920300463a";
+ sha256 = "0f8dv17rjknlkw32dd4xmdxbkwby5dn8mychaqwlk8vanhm74n7w";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/62f5c9284de51373a4015cf053d66977cf00d175/recipes/scp";
+ sha256 = "1q7v2cr89syw682zqxhavaggv6aqi69rl94vm8bmn745a868gliw";
+ name = "scp";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/scp";
+ license = lib.licenses.free;
+ };
+ }) {};
scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
melpaBuild {
pname = "scpaste";
@@ -62393,12 +65424,12 @@
scss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scss-mode";
- version = "20150107.1400";
+ version = "20180123.908";
src = fetchFromGitHub {
owner = "antonj";
repo = "scss-mode";
- rev = "b010d134f499c4b4ad33fe8a669a81e9a531b0b2";
- sha256 = "113pi7nsaksaacy74ngbvrvr6qcl7199xy662nj58bz5307yi9q0";
+ rev = "cf58dbec5394280503eb5502938f3b5445d1b53d";
+ sha256 = "0raja19l0igwr0pn0ghr1pj1d8i9k3m3764ma4r8nwzxcj9qw4ja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/scss-mode";
@@ -62414,12 +65445,12 @@
sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }:
melpaBuild {
pname = "sdcv";
- version = "20171002.210";
+ version = "20180211.833";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "sdcv.el";
- rev = "1aad9defb871dc07e27f603092bb81413be54cf2";
- sha256 = "1ij7inm1f59hmn9s1iqnywk1acfm0pqiim2s36vwrljy9lnb4ls8";
+ rev = "7cb1f8ec0fa4bb25669534d62bff58df38a992a8";
+ sha256 = "09i7zsizwq5k79wi5sgcfqdlbx0nazrnw3nd6hkn2vfrcffb7pf1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv";
@@ -62516,21 +65547,21 @@
license = lib.licenses.free;
};
}) {};
- secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
+ secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "secretaria";
- version = "20170828.945";
+ version = "20180104.720";
src = fetchgit {
url = "https://bitbucket.org/shackra/secretaria.el";
- rev = "1cd32d957864be1ba5c44a3f505f662832169a28";
- sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg";
+ rev = "e9d59d264ba30f8055a1ee1576fe9296d5b41055";
+ sha256 = "10ijr9babki05j3wlhwsym85q868kirivsml7jlmi1csnn2y3c6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv";
name = "secretaria";
};
- packageRequires = [ alert emacs f org s ];
+ packageRequires = [ alert emacs f s ];
meta = {
homepage = "https://melpa.org/#/secretaria";
license = lib.licenses.free;
@@ -62665,12 +65696,12 @@
semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }:
melpaBuild {
pname = "semi";
- version = "20160816.239";
+ version = "20180204.1448";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "semi";
- rev = "6b9c62a76f22caf1476c837ee1976eaf0eaf38e7";
- sha256 = "0h0f6w13kiyy90vnsa4jlfdlsnd04wq6b0vrbmz74q1krfs8b0kz";
+ rev = "44aa82ecf78273d8ff4c84f2121b885fb7149f41";
+ sha256 = "1wl12gsz9pn4wzgbffv3ymr49kcxjggc2jx19kxqyjmwdnw004yf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi";
@@ -62728,12 +65759,12 @@
sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sentence-navigation";
- version = "20160830.1840";
+ version = "20171215.1007";
src = fetchFromGitHub {
owner = "noctuid";
repo = "emacs-sentence-navigation";
- rev = "f9aedbfc2b8d7957f427dac87558948c80582429";
- sha256 = "13413jpk84hs5hy05rlgkcr7h8diw46xhb9zdj1p9lh145s7si8w";
+ rev = "b2fc2de3aaf1e2e7fd12d6d75a5b6c4b23614022";
+ sha256 = "0s7xqs3r9ygc6vcba8ghsd7rbrgy7dkis3y1d36ik4w5dqh9qlvi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3d097cf9b6c9c1606505d3988a2afdd7b066abc8/recipes/sentence-navigation";
@@ -62749,12 +65780,12 @@
seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "seoul256-theme";
- version = "20170320.1311";
+ version = "20171213.1209";
src = fetchFromGitHub {
owner = "anandpiyer";
repo = "seoul256-emacs";
- rev = "8afaf6aa2c63a003e2899e3e5ba8be85f6fdd350";
- sha256 = "0viwqym1vns2l3lrxv0sdrbvadn6apk8gip26a3ln4pzq1723qxh";
+ rev = "1b487722ba817347030b50df01491dbbff4b2891";
+ sha256 = "0q8nnm5b6dp9qlnjg3hw7l863xiiajdfd4nk2i5p1gfx549mcdv5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme";
@@ -62788,6 +65819,27 @@
license = lib.licenses.free;
};
}) {};
+ sequential-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sequential-command";
+ version = "20170925.1740";
+ src = fetchFromGitHub {
+ owner = "rubikitch";
+ repo = "sequential-command";
+ rev = "a48cbcbe273b33edd3ae56e68f44b4100fa3a48a";
+ sha256 = "1f05amz22klvs2yqyw7n5bmivgdn5zc7vkv5x6bgc9b5k977lggj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/sequential-command";
+ sha256 = "0qhrpwcgn89sqdj8yhgax0qk81ycdanlgwx25cxy8wnxkqqcvh9m";
+ name = "sequential-command";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/sequential-command";
+ license = lib.licenses.free;
+ };
+ }) {};
servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }:
melpaBuild {
pname = "servant";
@@ -62917,12 +65969,12 @@
sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sexy-monochrome-theme";
- version = "20171011.536";
+ version = "20171125.1212";
src = fetchFromGitHub {
owner = "voloyev";
repo = "sexy-monochrome-theme";
- rev = "9fb835606088a0d24600faa12fe24d85cb2c0731";
- sha256 = "182wzr7lisrszivxpjp29m7vjxxi429mshp2labf2abqkfrb9jv4";
+ rev = "529a1c75196391d7f2f1f42cf9d9f4a52c7d9007";
+ sha256 = "0myrdmp5r2lr1n54cmrn8p0xi4kjizx8nclxaqxn99bc7g6wlcf1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme";
@@ -62938,12 +65990,12 @@
shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shackle";
- version = "20171018.1120";
+ version = "20171209.1401";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "shackle";
- rev = "0cee957bc0bfbdee5ea3f3e430e94cdcd87ed0c3";
- sha256 = "18zhrn18asbpanmlgasy271gfh6qywr947fx2svxz5b1w40hhyr0";
+ rev = "4189c1c773aab533969b587f7801ffbcd1d7d613";
+ sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -62980,12 +66032,12 @@
shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shader-mode";
- version = "20171108.916";
+ version = "20180105.1500";
src = fetchFromGitHub {
owner = "midnightSuyama";
repo = "shader-mode";
- rev = "29118fc483bd6ad3fa42cb80867fae9dbd613fff";
- sha256 = "1hybqwaicdy99wp8chaxjxyhqd8fwqvq1fh7w49wdy83lwr5g3a0";
+ rev = "c141841feeee48299cff6651ed2e201a052e0570";
+ sha256 = "177kn9zrnzsayx9n9ym9k9a1rrbn8sycv1v67knpca05wkxg53zi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4396f3c10a38f91d5f98684efbeb02812e479209/recipes/shader-mode";
@@ -63316,12 +66368,12 @@
shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shimbun";
- version = "20171018.131";
+ version = "20180201.2145";
src = fetchFromGitHub {
owner = "emacsorphanage";
repo = "w3m";
- rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e";
- sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8";
+ rev = "4b9664bab3794379af42d549d9540735c16b5a25";
+ sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun";
@@ -63547,12 +66599,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "20171108.910";
+ version = "20180310.1748";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "aa2fda2419b6e2540f1e6eb3789b6a247c319050";
- sha256 = "1imnpbc1wkx8gwac1v3ailycjxs4yxwhbhifgn20jib85nn8s66i";
+ rev = "b33b23097ad34177e4179e9d3731ec5db30c6391";
+ sha256 = "0vlgm1aix074ifi9gvp4c0ygdmzplydj4gdsl46173qbd8lfi2rj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -63673,12 +66725,12 @@
silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "silkworm-theme";
- version = "20160217.509";
+ version = "20180301.637";
src = fetchFromGitHub {
owner = "mswift42";
repo = "silkworm-theme";
- rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b";
- sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91";
+ rev = "4a297f952401cfe894dcb24174f6eda05e00fada";
+ sha256 = "00kjibpn3ry7j1s6kqmakybialpcx4919344lxks7wij5l6qqxx0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme";
@@ -63736,12 +66788,12 @@
simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simple-call-tree";
- version = "20161007.1913";
+ version = "20180224.1256";
src = fetchFromGitHub {
owner = "vapniks";
repo = "simple-call-tree";
- rev = "431206e9c2b88cbab9cfe9ebf3f6cb73f5e6740f";
- sha256 = "1qwswf5i060j396gfsr60zid0lqwf5xkrq3q0c1s6nz9wxlhayjw";
+ rev = "20059eb5549408def76aeb03d0d20839903dedef";
+ sha256 = "0gvhn2r7h6jz7a3i3a8gwlmghv1xfzj0sdib25kz645iylazji4h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree";
@@ -63757,12 +66809,12 @@
simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simple-httpd";
- version = "20171004.938";
+ version = "20180218.538";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacs-web-server";
- rev = "e7775d3bc5c6b73255814d0a62dc954e23a12c15";
- sha256 = "0pjhxhzzxrpcczwvd7b6a6q1nfmsr6m6mnlxn13nwf3r270grz87";
+ rev = "868ec06abdc23c69597bc3a12da7aa2e5c0ad9c5";
+ sha256 = "1grq5a74arng2nn5q1xjm7gl5gk55a1js2r22wsahm8gd0fn0jdv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd";
@@ -63778,12 +66830,12 @@
simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "simple-mpc";
- version = "20161103.1219";
+ version = "20180224.1801";
src = fetchFromGitHub {
owner = "jorenvo";
repo = "simple-mpc";
- rev = "61b39d02313fa51a1dd7326fe24871666c64a077";
- sha256 = "1g8s37misx0kl32ngffqgqdzphz22v25k39q571jz4q1dibhmsyz";
+ rev = "ad74cb621e04838f8725ab7dc8716f0f38c90413";
+ sha256 = "1g3pb0n5j0s4q85zgjqnw1idvpvq3kwrakv8d6if7xb066v21ng9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc";
@@ -63796,6 +66848,27 @@
license = lib.licenses.free;
};
}) {};
+ simple-paren = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "simple-paren";
+ version = "20180205.1141";
+ src = fetchFromGitHub {
+ owner = "andreas-roehler";
+ repo = "simple-paren";
+ rev = "f5cc9b4325a07efe92379a11a1a61035c9a1e8c4";
+ sha256 = "1p931vqdnh6agrrzxf55x34ikb1x53mz1a17kskzlqchlzfmc3da";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren";
+ sha256 = "0bmw8pkh9864gymy36r3w5yw08pq894gb1n80wfqls4a78zyvkm3";
+ name = "simple-paren";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/simple-paren";
+ license = lib.licenses.free;
+ };
+ }) {};
simple-rtm = callPackage ({ dash, fetchFromGitLab, fetchurl, lib, melpaBuild, rtm }:
melpaBuild {
pname = "simple-rtm";
@@ -63820,12 +66893,12 @@
simple-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simple-screen";
- version = "20141023.758";
+ version = "20161009.220";
src = fetchFromGitHub {
owner = "wachikun";
repo = "simple-screen";
- rev = "4fcbdb4575310c0a2b4dd17fc8aeb4d7e6e9ffae";
- sha256 = "0zf9wgyp0n00i00zl1lxr0d60569zgcjdnmdvgpcibvny5s1fp2i";
+ rev = "596e3a451d9af24730ab31a8fe15c91a4264d09d";
+ sha256 = "0mqlwrkipgf977s0gx57fv5xrqli67hixprvra6q64isapr86yh1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02db9a649002ed9dec03661a518f74f3c7a176d9/recipes/simple-screen";
@@ -63883,12 +66956,12 @@
simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
melpaBuild {
pname = "simplenote2";
- version = "20170618.644";
+ version = "20171201.1806";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "simplenote2.el";
- rev = "78ab3d818633c0d6575cd1895c119bd690003bf6";
- sha256 = "0z9zary8apzjsx031fhy94ggqancm94mjhj335kr743s8zr3511g";
+ rev = "0fd6dbd0566af29964078e4b74baf69c2f52381a";
+ sha256 = "0qlwmxrz2kngri7ywy64bja0najq9m6asq2gr53ns0mkq1ngf0l8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
@@ -63971,8 +67044,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "skewer-mode";
- rev = "7df248a4b7ec2eb0f3cabcbdfb052593d1f86590";
- sha256 = "07l90cqcngwy8vxx4yxx7i72lp10wzv44ypn07zwyrl69bcmf2q8";
+ rev = "c8fc64300cbe85896f6e0719ef2c91bfba9c4fcd";
+ sha256 = "1rl5rmvq0qgdr8zrzbdvahf8rxsdajj7zbyzxyqfmyqr83c9yrz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
@@ -63992,8 +67065,8 @@
src = fetchFromGitHub {
owner = "NateEag";
repo = "skewer-reload-stylesheets";
- rev = "27c5a64785cd61419c1fe5bf53da46cc278f251d";
- sha256 = "0pc0mnrgd47cq61s8xrc9mcizfc3cj4ln7r5ixqk6jq59img27fh";
+ rev = "b9cc5635230ac3c0603a6da690c6e632d0a7490a";
+ sha256 = "0c8dpbl0z45w1brllcysibmpbnk8yqjgi3iywmqnhrycb7lrda4g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeaa2c89b995f1ab0b0f96493db0cda44cc851ee/recipes/skewer-reload-stylesheets";
@@ -64051,12 +67124,12 @@
slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
melpaBuild {
pname = "slack";
- version = "20171017.822";
+ version = "20180315.253";
src = fetchFromGitHub {
owner = "yuya373";
repo = "emacs-slack";
- rev = "c8f4c3312b574b8f4cd5ddaaa6ec7710893a9ff0";
- sha256 = "01aibrnkzyi40b7bfz5wfl34wwjil4nylg6llkhrmzc6mfqabnjy";
+ rev = "b7e8aaee092a45ad96ea680a812cdb615463ad6e";
+ sha256 = "1hlynbydgi194j9x2na66zdnf7i2r7iklyxly4jbq7jqqh1zybgr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -64114,12 +67187,12 @@
slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
melpaBuild {
pname = "slime";
- version = "20171106.1331";
+ version = "20180308.733";
src = fetchFromGitHub {
owner = "slime";
repo = "slime";
- rev = "55fc578ed829b95a63c31cec242bd86a6e0be39e";
- sha256 = "1bgmk0kr0y15lm2cmkmzw529r2k98j4c3n8v1k4rsxw1rj8961n3";
+ rev = "85ffc5ff9cd1d88e0b2fa10bbcd03d0c84768896";
+ sha256 = "0wvfw7hk95zn78j6ry82gixz3q0z3wdiy7s3gwi8v9a8lizwq83i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -64132,22 +67205,22 @@
license = lib.licenses.free;
};
}) {};
- slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
+ slime-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
melpaBuild {
pname = "slime-company";
- version = "20161229.743";
+ version = "20180119.1043";
src = fetchFromGitHub {
owner = "anwyn";
repo = "slime-company";
- rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb";
- sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g";
+ rev = "4c2e2805540dea700130607fa235018a87e4a070";
+ sha256 = "0ihwchp6hc1rxmahrhaly1cnhqs6k6ks32iiywwsyw7fjc34alc4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company";
sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
name = "slime-company";
};
- packageRequires = [ company slime ];
+ packageRequires = [ company emacs slime ];
meta = {
homepage = "https://melpa.org/#/slime-company";
license = lib.licenses.free;
@@ -64282,12 +67355,12 @@
sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sly";
- version = "20171111.1604";
+ version = "20180221.1414";
src = fetchFromGitHub {
owner = "capitaomorte";
repo = "sly";
- rev = "83c88318bca48b1269924cd5c76b9777ecf84f11";
- sha256 = "0s6y54mi4p336cmky9kvfhwrwfkhvl8awy73knf27zfhclhjfh7c";
+ rev = "486bfbe95612bcdc0960c490207970a188e0fbb9";
+ sha256 = "0ib4q4k3h3qn88pymyjjmlmnpizdn1mfg5gpk5a715nqsgxlg09l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -64303,12 +67376,12 @@
sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
melpaBuild {
pname = "sly-company";
- version = "20160308.557";
+ version = "20180212.1653";
src = fetchFromGitHub {
owner = "capitaomorte";
repo = "sly-company";
- rev = "08aef69394fbef31dfeb3d3bb72a4557df9d7624";
- sha256 = "128gb6hsb7zig4czwgwjcm58lgqk6rmj7qi17a9cz5gsnggjcwii";
+ rev = "dfe18218e4b2ee9874394b50f82f5172f41c462c";
+ sha256 = "1bj8w2wfq944cnhsk5xx41mfrjv89scrg4w98kqgda5drkpdf8a7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/sly-company";
@@ -64405,6 +67478,27 @@
license = lib.licenses.free;
};
}) {};
+ sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
+ melpaBuild {
+ pname = "sly-repl-ansi-color";
+ version = "20171020.816";
+ src = fetchFromGitHub {
+ owner = "PuercoPop";
+ repo = "sly-repl-ansi-color";
+ rev = "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048";
+ sha256 = "0fgcn6bwgz8yyjza07kfi86siargvpq4kp4j20hs6b67ckxjxx0x";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/981e01f562c40e02cb6d56dc1347e922fbad9c18/recipes/sly-repl-ansi-color";
+ sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi";
+ name = "sly-repl-ansi-color";
+ };
+ packageRequires = [ cl-lib sly ];
+ meta = {
+ homepage = "https://melpa.org/#/sly-repl-ansi-color";
+ license = lib.licenses.free;
+ };
+ }) {};
smart-backspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-backspace";
@@ -64450,12 +67544,12 @@
smart-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-compile";
- version = "20171104.2333";
+ version = "20180315.2030";
src = fetchFromGitHub {
owner = "zenitani";
repo = "elisp";
- rev = "2a0c9b33bd97461d100e24df0103d4e5526a30d6";
- sha256 = "1h0d1rbaprxrwgwi8pq2q93xf9j8q8qy7p42iyywav9ilc6sak6p";
+ rev = "16ebc3c570f1949b8198fcc8663d6d26df32717a";
+ sha256 = "0i5g7inbr90l3n1rsf4152ax4wkbw2q41ks9j3x6a956zxn8q92w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/93562afd7b62d7535b8010179ba6ac7e8e6280d0/recipes/smart-compile";
@@ -64572,6 +67666,27 @@
license = lib.licenses.free;
};
}) {};
+ smart-jump = callPackage ({ dumb-jump, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "smart-jump";
+ version = "20180121.2252";
+ src = fetchFromGitHub {
+ owner = "jojojames";
+ repo = "smart-jump";
+ rev = "5431fcd2052918d85507ac31c40256adb67eb77e";
+ sha256 = "12224rfgb9193dmjgshcaxac70fprfl7r0m64p4aw0f6cxfr0pqp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump";
+ sha256 = "14c7p6xqasd0fgn70zj1jlpwjxldzqx44bcdqdk6nmjihw0rk632";
+ name = "smart-jump";
+ };
+ packageRequires = [ dumb-jump emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/smart-jump";
+ license = lib.licenses.free;
+ };
+ }) {};
smart-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-mark";
@@ -64596,12 +67711,12 @@
smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
melpaBuild {
pname = "smart-mode-line";
- version = "20171013.849";
+ version = "20180313.1752";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "smart-mode-line";
- rev = "1facbe9816b602c640ddb23602e30588d6d904ca";
- sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc";
+ rev = "08993097c991070a3f804e797862a92a8bb4d59c";
+ sha256 = "0mkhg4hj48yqzdr9ziszqm43pxr5n6ybk28sidrv8w10skrgjara";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -64621,8 +67736,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "smart-mode-line";
- rev = "1facbe9816b602c640ddb23602e30588d6d904ca";
- sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc";
+ rev = "08993097c991070a3f804e797862a92a8bb4d59c";
+ sha256 = "0mkhg4hj48yqzdr9ziszqm43pxr5n6ybk28sidrv8w10skrgjara";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
@@ -64785,12 +67900,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "20171112.902";
+ version = "20180308.1042";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "7a8dff4c6f0eb433c3f2bb92b04b5aac5d06d416";
- sha256 = "11gbswaisi5qn07s5acxazasdmsn1qb3wrz011cn06md6swg5i6x";
+ rev = "3181747d9b84ed44b95fa95855609b624ce83d9b";
+ sha256 = "0gv1k922w2sz1lgmivd1d5hh2gvv2w5zpvr51y94ddzpfmph4bwy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -64869,12 +67984,12 @@
smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smbc";
- version = "20160706.1522";
+ version = "20171229.1008";
src = fetchFromGitHub {
owner = "sakshamsharma";
repo = "emacs-smbc";
- rev = "c377b806118d82140197d9cb1095548477e00497";
- sha256 = "16cj6jsy1psmcjshxb46i44sf1zb9s4mfiagl5cr22njy01ajq1h";
+ rev = "10538e3d575ba6ef3c94d555af2744b42dfd36c7";
+ sha256 = "0b2fndvp9kzlr65b0gr0z5hmapa4y96a6zvc2nrlijffkgyk05nn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc";
@@ -65121,12 +68236,12 @@
snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "snakemake-mode";
- version = "20171030.1016";
+ version = "20180128.752";
src = fetchFromGitHub {
owner = "kyleam";
repo = "snakemake-mode";
- rev = "990d6d8e98b96b9afe5b9b340507b1aecd8de1ce";
- sha256 = "1bd6kwzkk8vfhfc7m384y40lh6rdw90g6624c0hlfrs9zwihmvs3";
+ rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7";
+ sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -65331,12 +68446,12 @@
solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solaire-mode";
- version = "20171109.1215";
+ version = "20171209.1350";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-solaire-mode";
- rev = "ce91b8709124738abb4a1612d4801e16f1d0faec";
- sha256 = "1aval7m02m05w9is496za6kasp071jkwj29n1jsyixjzsfpbkrzi";
+ rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2";
+ sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -65352,12 +68467,12 @@
solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solarized-theme";
- version = "20171103.52";
+ version = "20180316.859";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "solarized-emacs";
- rev = "d06bf199f0e590708452ba32009d069dafa3d347";
- sha256 = "0zpwf8gf72i74rnmr0ywaynyasj5a8bxqag1kj70pigb4jxdwwyn";
+ rev = "1a46af3ff988e656a12b93c503fff87324b7420b";
+ sha256 = "1w8rw2fqrf5xmy2i5pr7bxlr6n21vzfhcgd65jknbp2229nggkrh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -65373,12 +68488,12 @@
solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solidity-mode";
- version = "20171001.926";
+ version = "20171231.741";
src = fetchFromGitHub {
owner = "ethereum";
repo = "emacs-solidity";
- rev = "d0a09c68912fcd03e384b0b2a9746f4e002d0df8";
- sha256 = "0zs16af2j6l0vypgikvs78x82cq8m5yfdfpi550cymkv7mjydj4v";
+ rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048";
+ sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
@@ -65394,12 +68509,12 @@
sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }:
melpaBuild {
pname = "sonic-pi";
- version = "20171011.503";
+ version = "20171205.405";
src = fetchFromGitHub {
owner = "repl-electric";
repo = "sonic-pi.el";
- rev = "6b362bbdfacf7aabeb494c3e22f6fd3f48ca9738";
- sha256 = "0xk03swaclhm41vnwzmwil05mgabkb23lrp28wvl6qxzhd3hmrwq";
+ rev = "3cf101b3b299735ed91658c7791ea4f04164e076";
+ sha256 = "1x2w7qcx9xcvagb47hlc5vsf5aj5mr0mzvnazyd7ajjilbzn48yr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi";
@@ -65461,8 +68576,8 @@
src = fetchFromGitHub {
owner = "omouse";
repo = "emacs-sos";
- rev = "01b5e25814b2e76db3814a967e25edf85d33bcac";
- sha256 = "1w1fdf5ppz22aq40w5wmi2619sgkvw97rr8zqigw1acva0pxysaa";
+ rev = "1573adca912b88b5010d99a25c83a5b2313bd39c";
+ sha256 = "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos";
@@ -65482,8 +68597,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "speed-of-thought-clojure";
- rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32";
- sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv";
+ rev = "a480c887b53cb007b7b099c5ffcab89b9e59d7bc";
+ sha256 = "1gf5fsrjigzxabd9k47lb98y3wdjwpw02x9ldnjzrgxfjfbxgqm0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure";
@@ -65590,12 +68705,12 @@
sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "sourcekit";
- version = "20170126.353";
+ version = "20180101.34";
src = fetchFromGitHub {
owner = "nathankot";
repo = "company-sourcekit";
- rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
- sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
+ rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781";
+ sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit";
@@ -65737,12 +68852,12 @@
spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spacemacs-theme";
- version = "20171102.1009";
+ version = "20180309.1335";
src = fetchFromGitHub {
owner = "nashamri";
repo = "spacemacs-theme";
- rev = "ce45974252536af726e67515271186f92d47e3cc";
- sha256 = "16gkphggpkach7w1s4qx08i2p53g1w9ps0r0i8a0qfk6rv0myvgh";
+ rev = "122b5b7edb0202610be7fcfd96b7a5e03b418de3";
+ sha256 = "1pv0pv1bkp5syvkg2rss82m3f4cfx8s4726hxglm7ar72i6qy21s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -65821,12 +68936,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
- version = "20171030.528";
+ version = "20171116.510";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
- rev = "e220a0c0c478fee0be3622442651981cdd82090c";
- sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
+ rev = "00527b8172ae61b667bc70a802c112132e06ba0b";
+ sha256 = "1k8hg1mg8zyxr9bvfm2k2447arph9wk58yjbxgqlq4w5svrq79km";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -65860,18 +68975,19 @@
license = lib.licenses.free;
};
}) {};
- speechd-el = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+ speechd-el = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "speechd-el";
- version = "20160710.359";
- src = fetchgit {
- url = "git://git.freebsoft.org/git/speechd-el";
- rev = "ec344edd498f95e3c945958475b31bae6505c34c";
- sha256 = "1ycq2ncixkm6imnhp2iqdray5f1mngnzfb3f2i3f0pi9k6xgavkb";
+ version = "20180105.1217";
+ src = fetchFromGitHub {
+ owner = "brailcom";
+ repo = "speechd-el";
+ rev = "0b25d3eb7ae219d2af9a7e9df2f3334652156bf5";
+ sha256 = "00b2851pgrzvcl828l48gxrmy779w8s1k4ngf8pf0sh1y9bd2715";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2d28c4550ae3b0f7e5fc032754d698cccda6ac0c/recipes/speechd-el";
- sha256 = "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/96669a664122c2fb69acd4cad2d7bf75d3e8272d/recipes/speechd-el";
+ sha256 = "0p8zih9s2x6l2xcfjbzriyhsicaiwxz54iq9h3c8szlzq708mayc";
name = "speechd-el";
};
packageRequires = [];
@@ -65880,22 +68996,22 @@
license = lib.licenses.free;
};
}) {};
- speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ speed-type = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "speed-type";
- version = "20161230.815";
+ version = "20171230.847";
src = fetchFromGitHub {
owner = "parkouss";
repo = "speed-type";
- rev = "9940383d94688e7f130b01f9872182ab59edf00f";
- sha256 = "0gfiw3rmqyargc1prkrglmzvzxm03nszqqba1q9zd7cs0m315pmm";
+ rev = "7a67fcd7bf825eee890097bd4a1b3c4f531a1135";
+ sha256 = "0nlmqgf4rg5qmkhpsal7j18wr5h74971k6d0wzw7rmjmpnjqhzvc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06";
name = "speed-type";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/speed-type";
license = lib.licenses.free;
@@ -65946,12 +69062,12 @@
sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sphinx-mode";
- version = "20170607.1436";
+ version = "20180316.856";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "sphinx-mode";
- rev = "0a9fcd60639f1f4235b4747e8449b9f48651705f";
- sha256 = "05kn45gh4l1wrj06qb3qzphx8mfqn3zqb8v73awhn5p7a1asb8kr";
+ rev = "95a14a288b50db70ee10598f83e5b087ba693bfb";
+ sha256 = "0c8p65jwrbn9pmk6j87g99p6fqcahfrc6wngmx94zw5m2wvxca2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode";
@@ -65985,24 +69101,24 @@
license = lib.licenses.free;
};
}) {};
- spike-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }:
melpaBuild {
- pname = "spike-theme";
- version = "20160530.733";
+ pname = "spiral";
+ version = "20180223.340";
src = fetchFromGitHub {
- owner = "m31271n";
- repo = "spike-theme";
- rev = "7a7766be0b6197103840644bb074f864d0d91cd8";
- sha256 = "0ah19a68d6fda3g5zzvqz28cms0yiadykkx7p8hiid4s4mdl41hj";
+ owner = "unrepl";
+ repo = "spiral";
+ rev = "907b9792467139a942ba7b07ca0276b90770baf9";
+ sha256 = "1rggzzvya26abbzd8bc2kpv59kzgm75wqv1vwqnj9c8im1jvs1na";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cd64f15c3fb7eee1bfdd0d7db5affa5c10052a6f/recipes/spike-theme";
- sha256 = "06pv0zzw0w12xlafyhakf09cl0hkyzis0g2bh2jn3pv4ac2kmwkp";
- name = "spike-theme";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral";
+ sha256 = "18rww2nfy5s22czabk71wqzrb53r0p2635872vr44b6kfwlb6qcw";
+ name = "spiral";
};
- packageRequires = [];
+ packageRequires = [ a avy clojure-mode emacs highlight treepy ];
meta = {
- homepage = "https://melpa.org/#/spike-theme";
+ homepage = "https://melpa.org/#/spiral";
license = lib.licenses.free;
};
}) {};
@@ -66097,8 +69213,8 @@
src = fetchFromGitLab {
owner = "iankelling";
repo = "spray";
- rev = "df326991acb2bd64af373bcf09816df9c6424d0d";
- sha256 = "1jk7qyj7yvbcs9m977fi73ypgp9bgsckgrqcf95wsfcfviajf8z4";
+ rev = "00638bc916227f2f961013543d10e85a43a32e29";
+ sha256 = "1avbfr32dvff26kgvd5vgan99nb5c6al9kv5xbmy2rcls17py7r2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4f5053aa4e1af3f636febe9c3ce8c6ae20c090d/recipes/spray";
@@ -66216,6 +69332,27 @@
license = lib.licenses.free;
};
}) {};
+ sql-clickhouse = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sql-clickhouse";
+ version = "20180302.755";
+ src = fetchFromGitHub {
+ owner = "leethargo";
+ repo = "sql-clickhouse";
+ rev = "35308c9292622547a79c0cc2659db2fc9de42e93";
+ sha256 = "12j9facwvwnwc8ga3nj9yddx3xp3kp28mih6lg4s1b67zj28pccg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a0ef23e6825924094eb69bd8526a95d8fab210c1/recipes/sql-clickhouse";
+ sha256 = "083i9aaf69yk71mndl5x0pimn3bkkhp3mfppxvy0f5lzf2847q2j";
+ name = "sql-clickhouse";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/sql-clickhouse";
+ license = lib.licenses.free;
+ };
+ }) {};
sql-impala = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sql-impala";
@@ -66345,12 +69482,12 @@
ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssass-mode";
- version = "20170817.1216";
+ version = "20171201.509";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "ssass-mode";
- rev = "d17d2de381ffc96e62e77435fb7b387bf59aceec";
- sha256 = "1vw2mzn8yczgyspgmv4f621d7h10qxa8hfzalb14bvwqn4h37spy";
+ rev = "a95c4c9f99895cc582849b35e90ae13f1587ddce";
+ sha256 = "1ldw72ggk22ih5j9fyb3bl0ngyfdkzfcyg97mp0mb40w8ly68qav";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode";
@@ -66387,12 +69524,12 @@
ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-agency";
- version = "20170807.1152";
+ version = "20180127.1301";
src = fetchFromGitHub {
owner = "magit";
repo = "ssh-agency";
- rev = "e572e031852561f98a7053afcdc9a3796dde2137";
- sha256 = "0z2ywkiwv983vz4bk5vc62p3xapp15a4715l9sp5c8x70nlq02y3";
+ rev = "31b2b41e33d315fff54ace8bc2234abc38adf7cc";
+ sha256 = "02kw4h3hzpad39ir6y8cg8lnldd01cl0lm8p22kf4bf5f7f3sdlw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency";
@@ -66408,12 +69545,12 @@
ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-config-mode";
- version = "20171109.1549";
+ version = "20180224.251";
src = fetchFromGitHub {
owner = "jhgorrell";
repo = "ssh-config-mode-el";
- rev = "7824d5f8baf2c97856f5bc7b1ef88befbb1978f3";
- sha256 = "1jqb6d83saliq11q9zkq0ndgpxgyfqjk41srwwnpg66nq031zdxq";
+ rev = "e4596accfc29f34388b701c1dd5ebffcb8c70154";
+ sha256 = "1jcfhxm2px19b9yy53napj4d22v8s1q76gy68c47yimkbabhmzir";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode";
@@ -66426,22 +69563,22 @@
license = lib.licenses.free;
};
}) {};
- ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "20171031.2204";
+ version = "20180301.2215";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23";
- sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw";
+ rev = "a3f9ec5dc8ecf7caa7551be31e62a6edfdc542c3";
+ sha256 = "130jrdj9y6cv78a71xsl6j9l79vnzf4081w6v1llxpyy1mn81a33";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm";
name = "ssh-deploy";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/ssh-deploy";
license = lib.licenses.free;
@@ -66492,12 +69629,12 @@
stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stan-mode";
- version = "20161023.1958";
+ version = "20180110.1441";
src = fetchFromGitHub {
owner = "stan-dev";
repo = "stan-mode";
- rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
- sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
+ rev = "a8e88473ef996b455523dc3fbcf2d8520659652f";
+ sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode";
@@ -66517,8 +69654,8 @@
src = fetchFromGitHub {
owner = "stan-dev";
repo = "stan-mode";
- rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
- sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
+ rev = "a8e88473ef996b455523dc3fbcf2d8520659652f";
+ sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets";
@@ -66534,12 +69671,12 @@
standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "standoff-mode";
- version = "20170609.134";
+ version = "20171115.931";
src = fetchFromGitHub {
owner = "lueck";
repo = "standoff-mode";
- rev = "b194fde6bf31ddc77409275e134aacba27e88043";
- sha256 = "0l48dij62d5cvw7kry0739i8zixkbmj80ghhixb30l6g0wg8k48g";
+ rev = "cf84b14066d63694d931395c6026fd0245d8a62b";
+ sha256 = "0dbcaz3faw8knx91yjsrb988sn2d9k0i5byhs1bi1ww36y6hmgs6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode";
@@ -66681,12 +69818,12 @@
stem-english = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stem-english";
- version = "20170113.24";
+ version = "20180108.1958";
src = fetchFromGitHub {
owner = "kawabata";
repo = "stem-english";
- rev = "c8d9ccf1ea38ea403ba360b79b1042b0fd449a70";
- sha256 = "15bwbqapr3kfazpxagpzy6fpkgc669mb8n8psz7gaqhlpxsliwiz";
+ rev = "c9fc4c6ed6bf82382e479dae80912f4ae17d31f4";
+ sha256 = "1bkmgjfp7xir6d0yf782xkjvf595blrqhr3hack26jg5zl8qsrya";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8e97e70e7a86b9f5e55bdd2db492994e8abdd5/recipes/stem-english";
@@ -66699,6 +69836,48 @@
license = lib.licenses.free;
};
}) {};
+ stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "stgit";
+ version = "20171130.759";
+ src = fetchFromGitHub {
+ owner = "ctmarinas";
+ repo = "stgit";
+ rev = "ffd7fb7a67b4c90b38f6caa7ce14448e11cbc86e";
+ sha256 = "01rxlg2qqqw1bvzdqdmhikag02sp9f6fira0zhwzxmrp5gsvbh3a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit";
+ sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g";
+ name = "stgit";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/stgit";
+ license = lib.licenses.free;
+ };
+ }) {};
+ sticky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sticky";
+ version = "20170925.1736";
+ src = fetchFromGitHub {
+ owner = "rubikitch";
+ repo = "sticky";
+ rev = "fec4e1af38f17f5cd80eca361d8e8ef8772db366";
+ sha256 = "126zs059snzpg83q9mrb51y0pqawwrj9smr3y7rza4q4qkdp1nk0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/sticky";
+ sha256 = "0g98qagqchwq9j5nvdz315wak8fvdw1l972cfh0fr4yyg7gxi6xr";
+ name = "sticky";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/sticky";
+ license = lib.licenses.free;
+ };
+ }) {};
stickyfunc-enhance = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stickyfunc-enhance";
@@ -66744,12 +69923,12 @@
strace-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "strace-mode";
- version = "20160710.2134";
+ version = "20171116.1239";
src = fetchFromGitHub {
owner = "pkmoore";
repo = "strace-mode";
- rev = "6a69b4b06db6797af56f33eda5cb28af94e59f11";
- sha256 = "1lbk2kzdznf2bkfazizfbimaxxzfzv00lrz1ran9dc2zqbc0bj9f";
+ rev = "2901baa968d5180ab985ac40ca22cc20914d01f5";
+ sha256 = "1jd930nc2g562n4cqq1ppl2d8dq7bxkr3fh9f0gjms7bcm106kz9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2003bee9992d9e79124d95d30b573c8a6bdbfe/recipes/strace-mode";
@@ -66807,12 +69986,12 @@
string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "string-inflection";
- version = "20170419.1638";
+ version = "20180102.643";
src = fetchFromGitHub {
owner = "akicho8";
repo = "string-inflection";
- rev = "297aaf68e666381521b02d433fcd28d8b51c48de";
- sha256 = "1621lwda3j3pwfxqwfa2gp4fxz869bc0ib87v71mrab8p1qsdizg";
+ rev = "d506eeeac59ea71601a901c311a874949a25372f";
+ sha256 = "0mp9h42qrgdlk34m9ffdqmhyy65slna5vw71bpw1883aic4agq70";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -67054,6 +70233,27 @@
license = lib.licenses.free;
};
}) {};
+ sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sudden-death";
+ version = "20180216.1623";
+ src = fetchFromGitHub {
+ owner = "yewton";
+ repo = "sudden-death.el";
+ rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb";
+ sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death";
+ sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
+ name = "sudden-death";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/sudden-death";
+ license = lib.licenses.free;
+ };
+ }) {};
sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sudo-edit";
@@ -67120,12 +70320,12 @@
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "20171016.1420";
+ version = "20180214.1523";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "345e00569333095eb24e61239a80b0f0c77b2d11";
- sha256 = "0npqvhnfmrx7jq1slz489rh2l4rnfhqhbi6ybdzw5rism8r3jqwb";
+ rev = "66051b2fd3d21a8e103928782a8c926ea434beba";
+ sha256 = "1xj3jzsh44ymah8nvjvm7i8g81vkq6wk7mcq2rm2qvaxin4l1bcp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -67372,12 +70572,12 @@
swap-regions = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "swap-regions";
- version = "20160413.1023";
+ version = "20180116.253";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "swap-regions.el";
- rev = "2789091b6f34c0d4b82546eb39c4e73dc96e8679";
- sha256 = "1m0apxjcj6xhbic36il1mbbril6pw2h6d9kmsb0jhibyy6mc8r78";
+ rev = "6e7a1bc68f11afe00809c8e27c13bca08393a91c";
+ sha256 = "02z552qsc96big3davdj3yaz6f4fg72ljpn7nvzccp2wwchzfa1c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6805c7710618ed1178ffd3488295d4d6b33e8ebe/recipes/swap-regions";
@@ -67390,27 +70590,6 @@
license = lib.licenses.free;
};
}) {};
- swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "swbuff";
- version = "20041012.18";
- src = fetchFromGitHub {
- owner = "emacsorphanage";
- repo = "swbuff";
- rev = "dcde4ddc7beafef3150e8c645724bdbbf8596028";
- sha256 = "1hxwa3hdhdx3ikfkblda748assm0k5mgwpdjv3jif37n0lw0f435";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff";
- sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk";
- name = "swbuff";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/swbuff";
- license = lib.licenses.free;
- };
- }) {};
sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
melpaBuild {
pname = "sweetgreen";
@@ -67435,12 +70614,12 @@
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "swift-mode";
- version = "20170918.51";
+ version = "20180222.232";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0";
- sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc";
+ rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29";
+ sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -67477,12 +70656,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20171107.1041";
+ version = "20180316.924";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "5009b8149a86949f9e6d7546479e998be2e14337";
- sha256 = "181bhxq2xscd9h1s0aix5lkp7gzg041q713157hrv200p2fnzb6d";
+ rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+ sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -67498,12 +70677,12 @@
swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }:
melpaBuild {
pname = "swiper-helm";
- version = "20151116.330";
+ version = "20180131.944";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper-helm";
- rev = "57012ab626486fcb3dfba0ee6720b0625e489b8c";
- sha256 = "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b";
+ rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008";
+ sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm";
@@ -67537,22 +70716,22 @@
license = lib.licenses.free;
};
}) {};
- switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ switch-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "switch-window";
- version = "20170718.1932";
+ version = "20180222.1731";
src = fetchFromGitHub {
owner = "dimitri";
repo = "switch-window";
- rev = "67113287ba61ce1951363a49f54148743dcea51e";
- sha256 = "06s1zdy2mlw63w3rnyja9jkvq4m5b46mvi8qjwxcpgqjdihj6f6m";
+ rev = "680182240012c2ad8fb35479f915e653315b4803";
+ sha256 = "0fkz29spgfbx7d1hi1xm71wa1glk448v7gidqgrdylsmbzwkj1y9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
name = "switch-window";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/switch-window";
license = lib.licenses.free;
@@ -67603,12 +70782,12 @@
sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "sx";
- version = "20170521.1832";
+ version = "20180212.1101";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "sx.el";
- rev = "8f1e3346286cfa5a5299ef192cc5aca3f37a7745";
- sha256 = "1ans6l0rv71w2vq0v4137jr0jhgzhkk62l7cq6b5m83v4ld9gr09";
+ rev = "833435fbf90d1c9e927d165b155f3b1ef39271de";
+ sha256 = "1369xaxq1vy3d9yh862ddnhddikdpg2d0wv1ly00pnvdp9v4cqgd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx";
@@ -67624,12 +70803,12 @@
symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "symbol-overlay";
- version = "20171103.2306";
+ version = "20180306.648";
src = fetchFromGitHub {
owner = "wolray";
repo = "symbol-overlay";
- rev = "305ef1d283923d2b0f1cd751f57f71754ab714e6";
- sha256 = "0j5542283mmdl30syk0k5p6ybb0w3xlnamjrrafdaj618v3anvgv";
+ rev = "bb02b971b06fb8e612c62bd2517b49884bc603a0";
+ sha256 = "18ib707rky1k5qw5m4zfd88y1lvgqfilc336ha3v88i7fz8bbzh9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -67750,12 +70929,12 @@
synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "synosaurus";
- version = "20170621.957";
+ version = "20180125.1034";
src = fetchFromGitHub {
owner = "hpdeifel";
repo = "synosaurus";
- rev = "acc4c634eb7c7f6dd9bce8610efa7fc900e9c47b";
- sha256 = "0q8ggyfzvclgxvma2nvkfc89870hmii9cc8022ff0n7729rfj7m0";
+ rev = "ceeb06e24d3af3643862ecfdb263590eec1f492f";
+ sha256 = "1qdppyx24zmz9dzm9kjvcx30g6znik602mg2h2s835cww9n97idm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus";
@@ -67792,12 +70971,12 @@
syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "syntactic-close";
- version = "20171004.1037";
+ version = "20180211.538";
src = fetchFromGitHub {
owner = "emacs-berlin";
repo = "syntactic-close";
- rev = "e2cd1f332d111b0e90d9a72f35bc969c7638b7cf";
- sha256 = "18fq9v1kb6bx0xxd1cic2f3gfwv82y4mjs5qg7q2ra1cz5d502w9";
+ rev = "5ba592366b0b29b724b1cbda952cc8e25ef8b239";
+ sha256 = "0b4lhvd3dsg95hpdnjmyhxrcaqkmigg7k5n98f9fb9b8k6gfdsan";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -67854,12 +71033,12 @@
system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "system-packages";
- version = "20170831.1239";
+ version = "20180316.811";
src = fetchFromGitHub {
owner = "jabranham";
repo = "system-packages";
- rev = "ccc2a6b3794b6ada59905ee609fe9e1d973622aa";
- sha256 = "0hs00y8wvsagnc8ckd8izxvigsli7230hgxf5xmrdknj9h4icrgw";
+ rev = "557b1eb96479cc6c73b9b7d509dd60b0ee71934d";
+ sha256 = "01r8754ckbzsvlmnbpwpx2j33q693cmg5a59i5d77adn24ssk4f4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@@ -67896,12 +71075,12 @@
systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "systemd";
- version = "20171006.1352";
+ version = "20180101.1803";
src = fetchFromGitHub {
owner = "holomorph";
repo = "systemd-mode";
- rev = "22f024fe8f433af7b6a6b99520cea1e766894fe5";
- sha256 = "11h1nr9gz0mw2gwlplv00i06s9ziw77a7zfcrrzd01rmanz1m4fa";
+ rev = "228f0b99ca3e1f3139ae8cacd15f9698d5b6da90";
+ sha256 = "0cdqpzkx01qm0pk66hs6yhzv5iccrzzgfv3bh5c8i91v55d66bff";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -68189,12 +71368,12 @@
tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tao-theme";
- version = "20170718.2306";
+ version = "20171221.1001";
src = fetchFromGitHub {
owner = "11111000000";
repo = "tao-theme-emacs";
- rev = "321dad4278776b63f8dcd1e67ad387531c472ed4";
- sha256 = "0w78ssd5qj5a1l3yhi2r2dhmls5jfw2p3ic1iinsqwimkwmvh8aa";
+ rev = "a97df8c51d77696787aaf55c67207f19c803fabe";
+ sha256 = "1djp4gbs6gr956a5hpkwh5laasc7pypqip32l7djd7405vx5ixp2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -68214,8 +71393,8 @@
src = fetchFromGitHub {
owner = "phillord";
repo = "tawny-owl";
- rev = "a8fc8300481a1e033a3811ccda54e552392d1689";
- sha256 = "1lkldr6rr21f97vp6kms2ha8hsszhmba4sn07is4k55lpvlnxd49";
+ rev = "3d353a435c7fcb0d9edae3094a9ece81914ba34e";
+ sha256 = "14kb6pzj23zrxwfkcxnra1j4fxzm94a3fym0nx1gf7bx362yqn5g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -68378,12 +71557,12 @@
telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "telephone-line";
- version = "20171109.1616";
+ version = "20180220.109";
src = fetchFromGitHub {
owner = "dbordak";
repo = "telephone-line";
- rev = "b3eaf4b8254bb1031f85ce7ac73ffdc856059d9a";
- sha256 = "1g2gpfqxs3mxwskrkdszab02mxfmwfli0h0yw8b5izb4g2a4gkiz";
+ rev = "3e73a0ed2457e7b6991ea6555a1379bf9b77053b";
+ sha256 = "0bwicz1xymq5j57m2kc8myjnc2dyfljm1jz2l80ifmlkdn549x92";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -68630,12 +71809,12 @@
terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "terminal-here";
- version = "20171022.552";
+ version = "20180208.944";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "terminal-here";
- rev = "b3659e13d3d41503b4fc59dd2c7ea622631fc3ec";
- sha256 = "1z3ngwgv8ybwq42lkpavk51a25zdkl6v9xdfi41njpxdpbfcmx8z";
+ rev = "e769d3741d1023af4f965609f75e3567c89de6f0";
+ sha256 = "0g0y8haw1476jr0pd1s9jckf78da11aigdkd9akzlawsvvx8z864";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
@@ -68655,8 +71834,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd";
- sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri";
+ rev = "ae83725819286d3f134a6b9956f1117b341e1040";
+ sha256 = "049xbwnd7qswvpqka1nsgj0zchmwqvg5dx52xg3kl6mf223xd5n7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -68676,8 +71855,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd";
- sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri";
+ rev = "ae83725819286d3f134a6b9956f1117b341e1040";
+ sha256 = "049xbwnd7qswvpqka1nsgj0zchmwqvg5dx52xg3kl6mf223xd5n7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -68798,12 +71977,12 @@
test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "test-kitchen";
- version = "20161115.1418";
+ version = "20171129.1235";
src = fetchFromGitHub {
owner = "jjasghar";
repo = "test-kitchen-el";
- rev = "9213e55e0334c2a3bb31f8cebf9b40022ca12db8";
- sha256 = "11nnc6s3ryfdrlvkf9rfya9m66l4x1d0zm4p9w1gf0vnyb5x7mfq";
+ rev = "0fc0ca4808425f03fbeb8125246043723e2a179a";
+ sha256 = "1pip15ysya8nsk1xgz6k6gcjm6g60922r0im2anq4j2gjzdja79k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen";
@@ -68858,6 +72037,27 @@
license = lib.licenses.free;
};
}) {};
+ texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "texfrag";
+ version = "20180117.2025";
+ src = fetchFromGitHub {
+ owner = "TobiasZawada";
+ repo = "texfrag";
+ rev = "aca88ea6440dc9a8ac35692e72ee00aac27ce575";
+ sha256 = "0bgjsqsxpfncfab5wnjpwy64wli6k7xw77dn7l1lpbymmsm9mnr5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag";
+ sha256 = "195vdpwqzypz35v8hc7ai9xpv1flrik60lgrk5m7xypnlp7mpr2x";
+ name = "texfrag";
+ };
+ packageRequires = [ auctex emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/texfrag";
+ license = lib.licenses.free;
+ };
+ }) {};
textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "textile-mode";
@@ -68966,12 +72166,12 @@
theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "theme-changer";
- version = "20161130.1440";
+ version = "20171221.1127";
src = fetchFromGitHub {
owner = "hadronzoo";
repo = "theme-changer";
- rev = "60e3dd7cbd237225fef34179168006501a27b06b";
- sha256 = "06y36i3h5m85d6b47cr0hghhbkd8kv23lm6ipc9swkmq0hl3pxfg";
+ rev = "61945695a30d678e6a5d47cbe7c8aff59a8c30ea";
+ sha256 = "14xc36jfgj8896pklrkpg394fgikir051rh9vm70v132n6i9j0cn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer";
@@ -68991,8 +72191,8 @@
src = fetchFromGitHub {
owner = "myTerminal";
repo = "theme-looper";
- rev = "0feeed3c93fc54305499bda5953112487f25a3a0";
- sha256 = "18fkfr7cihnkxbz7r2p6dl5w2yzaibx3qxgwqgmx3g47lb1g13gc";
+ rev = "875c2cfc84b3c143d3b14a7aba38905e35559157";
+ sha256 = "145gbjizkkmdil1mmhsppmda22xg6blz81zqfsrd5aznwpiyw36q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
@@ -69117,8 +72317,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "95d5fb3a1e38125b9eabcbe9cda1a6c7bbe3e93d";
- sha256 = "0xz5s63d5v8xmm4z99pg6cf37s28h2s7264r7rykkpggyd57i0sl";
+ rev = "a9efd1abd4fd4862d8e967ec207015af79494b6c";
+ sha256 = "104viwwc6z9qk7p77wlmb088278f9awwx1v5cycnn6qv8wglhxfj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -69155,12 +72355,12 @@
tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tickscript-mode";
- version = "20171106.1731";
+ version = "20171218.1803";
src = fetchFromGitHub {
owner = "msherry";
repo = "tickscript-mode";
- rev = "40d6c9dc574503fc8525f0bdaee160ae30ba31bf";
- sha256 = "0hmak9g9cfna6jwhjj82r7n22jwrabb7dadwlpw0ccqf1ccmka9n";
+ rev = "f0579f38ff14954df5002ce30ae6d4a2c978d461";
+ sha256 = "0b3rbsd978ch0hiv45sqg9g4zsxhjn557j5f72vjql8cx1h5d8s4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
@@ -69173,15 +72373,36 @@
license = lib.licenses.free;
};
}) {};
+ tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tidal";
+ version = "20171207.1452";
+ src = fetchFromGitHub {
+ owner = "tidalcycles";
+ repo = "Tidal";
+ rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406";
+ sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal";
+ sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a";
+ name = "tidal";
+ };
+ packageRequires = [ emacs haskell-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/tidal";
+ license = lib.licenses.free;
+ };
+ }) {};
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20171111.1922";
+ version = "20180301.121";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "e7ffcdcf9f68205d1498137e84a731c7ffb86263";
- sha256 = "0lym5jb2fxv4zjhik4q5miazrsi96pljl6fw5jjh0i9p8xs0yp4x";
+ rev = "bd6948be51c61845238fd323a6c08b929534cac1";
+ sha256 = "1ppzr2nhwarzmc3gpf0qcfphq2nz7jjvml1dkskpbm1j322z0mqa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -69437,12 +72658,12 @@
tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tldr";
- version = "20171023.1929";
+ version = "20180122.312";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "tldr.el";
- rev = "fe1bd5cee3d30741c816f3ccc118b94105ceba4c";
- sha256 = "1hdkrgv03w968qf8fm7c35k5pahk9wfwz5vy8xz6568ci1af47h3";
+ rev = "398b197c8d2238628b07e1b32d0f373876279f4c";
+ sha256 = "0iq7qlis6c6r2qkdpncrhh5vsihkhvy5x4y1y8cjb7zxkh62w33f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr";
@@ -69563,12 +72784,12 @@
toggle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "toggle";
- version = "20160331.100";
+ version = "20180315.1703";
src = fetchFromGitHub {
owner = "zenspider";
repo = "elisp";
- rev = "164ae0f8302c1e1938a9e30597901b1164b43f96";
- sha256 = "1mgkwaa0q672r3lmw267ax54z4bvc3v3zji3q9asygni9bymkfyz";
+ rev = "ee8a9c3052446876057ff853369d136aea7831f5";
+ sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd02426ce7ab46361363c7a6c56b1575642003e0/recipes/toggle";
@@ -69749,6 +72970,27 @@
license = lib.licenses.free;
};
}) {};
+ total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "total-lines";
+ version = "20171227.439";
+ src = fetchFromGitHub {
+ owner = "hinrik";
+ repo = "total-lines";
+ rev = "c762f08d039c8103f71c747e00304f209c2254f4";
+ sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines";
+ sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh";
+ name = "total-lines";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/total-lines";
+ license = lib.licenses.free;
+ };
+ }) {};
totd = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "totd";
@@ -69835,12 +73077,12 @@
traad = callPackage ({ dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
melpaBuild {
pname = "traad";
- version = "20171112.1435";
+ version = "20180104.2351";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-traad";
- rev = "843556bfa573d7e8837651b6e9765483cfdd321f";
- sha256 = "0q99wb6nz8752z1m8gikqln6jrjk01pcp0cnm96kxj3qwfy9ifcx";
+ rev = "ad160e32f4cc9849aa570ed8e29269a0845921ae";
+ sha256 = "0rj8fg66rzrw1hv707p0dmf025c1dymp373z87ryy5sxs24vn3j5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -69863,12 +73105,12 @@
tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tracking";
- version = "20151129.319";
+ version = "20171210.1302";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2";
- sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz";
+ rev = "f7f7cb62a992120bf80c3a078bec1c029f8ff0cd";
+ sha256 = "122wvsxvv3yzkdjfi8s5gbl371bzi5kw377a7f3cpp7hxz4i24bl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -69909,8 +73151,8 @@
src = fetchFromGitHub {
owner = "raghavgautam";
repo = "tramp-hdfs";
- rev = "b64f24d0419a80dffaa2c4ecec317aa2bba56e35";
- sha256 = "1bfqzwn19w6fs5npslw0sjqrwdswsv5m3wcdnk438pz1lp199wfy";
+ rev = "f8406f77bf83b66306ced693a5e4aaf606f46762";
+ sha256 = "15zr1fcmjk4mzjvmfbbkz5v9ryfgcjk0ag6rwxk8rp6wzwxcxvvl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs";
@@ -69926,12 +73168,12 @@
tramp-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tramp-term";
- version = "20141104.1345";
+ version = "20180223.727";
src = fetchFromGitHub {
owner = "randymorris";
repo = "tramp-term.el";
- rev = "983ed67ee65d26a51c641f306fa6b921ec83eeaf";
- sha256 = "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip";
+ rev = "7c29f888de0385a676dbf9a4e17bac0111f5c10a";
+ sha256 = "1ch9y632kggl3q6yx3g685j3dfbhy7yiwqh8cbxs3wja3rvml8xa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c84660c641f0bdf3cca8ad2a0f8f6e5d18b59c3/recipes/tramp-term";
@@ -69968,12 +73210,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "20171029.1210";
+ version = "20180201.1506";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "d78ae51fdc9292cc0b77dfb18279b38b6ccbf480";
- sha256 = "01k0nppxvkd2cy13hjcvihgh6j9c4by92yxv4jv8zvaz35fqf92n";
+ rev = "03a36853f141387654b7cb9217c7417db096a083";
+ sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -70070,22 +73312,22 @@
license = lib.licenses.free;
};
}) {};
- treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
+ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "20171112.422";
+ version = "20180314.435";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "fd5c893ce920082b4fcfc764feecc47096500ae2";
- sha256 = "10g1kvx7rlfczbq2jlkh6dljkm5g1n3f0j9p0qwk36vwaw80a5s9";
+ rev = "535e9131f1500b355b0c35a7a1118aaad56cce53";
+ sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs";
- sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs";
+ sha256 = "1wcsn0kzrbawyyhxmsmrsxr1vp0llkxw6r7zx53pwyc82ia64nlv";
name = "treemacs";
};
- packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ];
+ packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ];
meta = {
homepage = "https://melpa.org/#/treemacs";
license = lib.licenses.free;
@@ -70094,16 +73336,16 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
- version = "20170925.2232";
+ version = "20180203.416";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "fd5c893ce920082b4fcfc764feecc47096500ae2";
- sha256 = "10g1kvx7rlfczbq2jlkh6dljkm5g1n3f0j9p0qwk36vwaw80a5s9";
+ rev = "535e9131f1500b355b0c35a7a1118aaad56cce53";
+ sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
- sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil";
+ sha256 = "1i2mxqwnqb2jz775qg3z4lf7pk4mgi646fyyi2la5gdcnq6a46mg";
name = "treemacs-evil";
};
packageRequires = [ evil treemacs ];
@@ -70115,16 +73357,16 @@
treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
melpaBuild {
pname = "treemacs-projectile";
- version = "20170903.1235";
+ version = "20180203.416";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "fd5c893ce920082b4fcfc764feecc47096500ae2";
- sha256 = "10g1kvx7rlfczbq2jlkh6dljkm5g1n3f0j9p0qwk36vwaw80a5s9";
+ rev = "535e9131f1500b355b0c35a7a1118aaad56cce53";
+ sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile";
- sha256 = "0y7mq466c9cigyd6imzjnh54aq9kcsikhr7llga5gsclf35fc5ld";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile";
+ sha256 = "1vyifik30673bwlfvbmw8pzz7f3wd4q6zzssvbj8d23zhk8kh8vc";
name = "treemacs-projectile";
};
packageRequires = [ projectile treemacs ];
@@ -70136,12 +73378,12 @@
treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "treepy";
- version = "20170721.913";
+ version = "20170722.355";
src = fetchFromGitHub {
owner = "volrath";
repo = "treepy.el";
- rev = "b2191139d67d024e4666b6039e39a23b15b1aba2";
- sha256 = "170xgvwgnnqkr259d0wv6l4kcp62mb1y1wq6rnk8gp39djsqw01q";
+ rev = "282fbc94747fe2a00d36e2a74d147c8fa0ac4be7";
+ sha256 = "0acw6c073h2a0fy8gx2xc2d1fw0yhaqikqrvs2iq53fqcqrrq81r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy";
@@ -70323,12 +73565,12 @@
tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tuareg";
- version = "20171109.1615";
+ version = "20180312.410";
src = fetchFromGitHub {
owner = "ocaml";
repo = "tuareg";
- rev = "15bda87571bc597ef4853b4ad270946c7a4e8102";
- sha256 = "1qmripm9kyrmpqfd61vzh5ijyrs3dcxqwmxwg1m3f2a53dgnq00k";
+ rev = "a3ad3a9220363f2fd0898369866f5879489d51ec";
+ sha256 = "1l7nbg273d1ffnac8crhvmiq8mz2xdyd52aflp0s3am9iw7319kn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -70404,22 +73646,22 @@
license = lib.licenses.free;
};
}) {};
- turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "turing-machine";
- version = "20170512.1438";
+ version = "20180221.2038";
src = fetchFromGitHub {
owner = "therockmandolinist";
repo = "turing-machine";
- rev = "4b5901a13b38028b05ce19cecc78bcd2f708f97d";
- sha256 = "1avsqqpsbzlm0wi6fc5lgnmhps5wcr6gp05d4hw51sd5r0vx00dk";
+ rev = "fa60b76a5bac1f54b7a1b3dc55aae7602c7e385b";
+ sha256 = "0k1r0zkcr44kiki8cvdqwx09xpvpz7nkbq9w6i4gqy5h78zy5k79";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
name = "turing-machine";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/turing-machine";
license = lib.licenses.free;
@@ -70554,12 +73796,12 @@
twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "twittering-mode";
- version = "20170312.735";
+ version = "20180107.412";
src = fetchFromGitHub {
owner = "hayamiz";
repo = "twittering-mode";
- rev = "63c96fb029033b1a300b90aa922e167c7c405bcb";
- sha256 = "0kax42y0f1pa1pgybz3f57ig9g8fvmgcw8j7zl9nsw70dar4amqk";
+ rev = "c27d9b5b1dd20a1600e89909ac9c0ccd08af9bf9";
+ sha256 = "00vir1vfkprxm23if6cfjvliiwbza18n7gmh74bdnp1zkg2xy0hq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode";
@@ -70596,12 +73838,12 @@
typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typescript-mode";
- version = "20171109.727";
+ version = "20180315.1309";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "typescript.el";
- rev = "5b0487aae890e7e9f7105a679deecc50428e912d";
- sha256 = "08qx9g40aws9s9cpmayc6r3bjrvx8sy32vfy0rz3jkpjyqc6485x";
+ rev = "526f307ca8ca50b8f98975f2812198212f6acf2f";
+ sha256 = "1hj4jy91qfpfmnajb4wc9vavx0zlmawi0r1nvkh87ngm3q09mnbi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -70614,6 +73856,27 @@
license = lib.licenses.free;
};
}) {};
+ typing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "typing";
+ version = "20171115.2331";
+ src = fetchFromGitHub {
+ owner = "kensanata";
+ repo = "typing";
+ rev = "1ada06484695b8959f4a7c41cacf7f78c2aad998";
+ sha256 = "0mh1y960zd7878j7nhrjijck6jxxqnbmxr579s095k7yk2ynpkkg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e6e75695594ce17b618ad8786c8a04e283f68b11/recipes/typing";
+ sha256 = "0k2lplqzq3323nn7rybcs377sr87kbww8ci99rrka3yyb5bh1fa1";
+ name = "typing";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/typing";
+ license = lib.licenses.free;
+ };
+ }) {};
typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typing-game";
@@ -70638,12 +73901,12 @@
typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }:
melpaBuild {
pname = "typit";
- version = "20170519.51";
+ version = "20171231.2214";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "typit";
- rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5";
- sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj";
+ rev = "45dc6ba44fd5f2aece9da4a0e88effb947fe6c0e";
+ sha256 = "1q3gva57r7g9iqvkfi90zih97dq37ds2vfbjisqxzh43vab8hsjv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit";
@@ -70659,12 +73922,12 @@
typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typo";
- version = "20171005.1045";
+ version = "20171209.223";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "typoel";
- rev = "73c8d960e9dcbb77a4ad6166b4685122a0f208ee";
- sha256 = "1zlnfjav11842am9n043j3hk23134hp92k1pg86jvnsj5mwmp9ij";
+ rev = "9dad93b6f367f02f52c8d9bf15d446d922cec294";
+ sha256 = "1xaikwl265v67b7hilrhjgwzr6bcha9idnp82f27msqzdfdzxf0f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo";
@@ -70764,12 +74027,12 @@
ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ujelly-theme";
- version = "20170905.1505";
+ version = "20180214.824";
src = fetchFromGitHub {
owner = "marktran";
repo = "color-theme-ujelly";
- rev = "d08fe8e01db6df151b38c3001fba239a9a22369a";
- sha256 = "1a93pd7c2fgdy4vhhwy0lm7plyrwfqa9177m2x5kfblz0q51n6y8";
+ rev = "bf724ce7806a738d2043544061e5f9bbfc56e674";
+ sha256 = "0pz26q5qfq4wiqcpfkq26f19q5gyiv8q71sq4k77hkss5a5b5fqg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -71128,22 +74391,22 @@
license = lib.licenses.free;
};
}) {};
- unidecode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ unidecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unidecode";
- version = "20140317.2118";
+ version = "20180312.1226";
src = fetchFromGitHub {
owner = "sindikat";
repo = "unidecode";
- rev = "9e279e88a689584027d5a1b088fe5def25d0f75c";
- sha256 = "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw";
+ rev = "5502ada9287b4012eabb879f12f5b0a9df52c5b7";
+ sha256 = "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2a5265b00464bcd2bb397229e87385d172856474/recipes/unidecode";
- sha256 = "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0af5c20984ebe5458c6e97b24ef97e8b2fbc4045/recipes/unidecode";
+ sha256 = "1xizid7hg98lx2i544w253h6c51ykimim1j58jkn1r5fzqg3r4xd";
name = "unidecode";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/unidecode";
license = lib.licenses.free;
@@ -71152,12 +74415,12 @@
unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unify-opening";
- version = "20171108.33";
+ version = "20171122.1212";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "unify-opening";
- rev = "0599ff999293f31b7208343db6d85faddf722117";
- sha256 = "0k7czn1mfav6xbyngymq4x3gh0qahyvvfhw2j61irfydckiyyfwf";
+ rev = "502469ddba6d8d52159f53976265f7d956b6b17c";
+ sha256 = "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
@@ -71233,6 +74496,27 @@
license = lib.licenses.free;
};
}) {};
+ universal-emotions-emoticons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "universal-emotions-emoticons";
+ version = "20171209.1820";
+ src = fetchFromGitHub {
+ owner = "grettke";
+ repo = "universal-emotions-emoticons";
+ rev = "c89063a4f8e00f8e9c4dc6c252474b6d4bfc4e01";
+ sha256 = "0wgff3bbjgskbm1c4cww6akia93hd5sqr9md5szkqm6iiqi3q95z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/57f913112c98db2248cf69e44deb69fd09cee042/recipes/universal-emotions-emoticons";
+ sha256 = "1aj3k3yrvasn3zmfwz5si046hlyhnjdmxh7i8li6rc0v0qwl7p86";
+ name = "universal-emotions-emoticons";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/universal-emotions-emoticons";
+ license = lib.licenses.free;
+ };
+ }) {};
unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unkillable-scratch";
@@ -71338,22 +74622,43 @@
license = lib.licenses.free;
};
}) {};
- use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ usage-memo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "usage-memo";
+ version = "20170925.1737";
+ src = fetchFromGitHub {
+ owner = "rubikitch";
+ repo = "usage-memo";
+ rev = "88e15a9942a3e0a6e36e9c3e51e3edb746067b1a";
+ sha256 = "1aalrgyk8pwsc07qmczqhgccjli6mcckkbgpass3kvrkcfxdl2zk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/usage-memo";
+ sha256 = "0fv96xd6gk12nv98zccwncr00qms0pmrp0cv7iipbz54s20g0745";
+ name = "usage-memo";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/usage-memo";
+ license = lib.licenses.free;
+ };
+ }) {};
+ use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "20171030.1428";
+ version = "20180314.1143";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc";
- sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l";
+ rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+ sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
- sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package";
+ sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp";
name = "use-package";
};
- packageRequires = [ bind-key diminish ];
+ packageRequires = [ bind-key emacs ];
meta = {
homepage = "https://melpa.org/#/use-package";
license = lib.licenses.free;
@@ -71362,16 +74667,16 @@
use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }:
melpaBuild {
pname = "use-package-chords";
- version = "20170717.1152";
+ version = "20180127.1413";
src = fetchFromGitHub {
- owner = "waymondo";
- repo = "use-package-chords";
- rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026";
- sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds";
+ owner = "jwiegley";
+ repo = "use-package";
+ rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+ sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords";
- sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords";
+ sha256 = "1217l0gpxcp8532p0d3g1xd2015qpx2g5xm0kwsbxdmffqqdaar3";
name = "use-package-chords";
};
packageRequires = [ bind-chord bind-key key-chord use-package ];
@@ -71380,15 +74685,78 @@
license = lib.licenses.free;
};
}) {};
+ use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
+ melpaBuild {
+ pname = "use-package-el-get";
+ version = "20180130.2105";
+ src = fetchFromGitHub {
+ owner = "edvorg";
+ repo = "use-package-el-get";
+ rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947";
+ sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get";
+ sha256 = "0sg9ijkjax6w25p0q7rw5rjn8r2i83z5jfzjkvy8pxil5cg8zyh0";
+ name = "use-package-el-get";
+ };
+ packageRequires = [ use-package ];
+ meta = {
+ homepage = "https://melpa.org/#/use-package-el-get";
+ license = lib.licenses.free;
+ };
+ }) {};
+ use-package-ensure-system-package = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, system-packages, use-package }:
+ melpaBuild {
+ pname = "use-package-ensure-system-package";
+ version = "20180316.1307";
+ src = fetchFromGitHub {
+ owner = "jwiegley";
+ repo = "use-package";
+ rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+ sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package";
+ sha256 = "1cl61nwgsz5dh3v9rdiww8mq2k1sbx27gr6izb4ij4pnzjp7aaj6";
+ name = "use-package-ensure-system-package";
+ };
+ packageRequires = [ system-packages use-package ];
+ meta = {
+ homepage = "https://melpa.org/#/use-package-ensure-system-package";
+ license = lib.licenses.free;
+ };
+ }) {};
+ usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "usql";
+ version = "20180305.1523";
+ src = fetchFromGitHub {
+ owner = "nickbarnwell";
+ repo = "usql.el";
+ rev = "bfaf428b366a9a185eef84f0d645a98dc918fe3d";
+ sha256 = "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql";
+ sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84";
+ name = "usql";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/usql";
+ license = lib.licenses.free;
+ };
+ }) {};
utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "utop";
- version = "20170508.2343";
+ version = "20180228.305";
src = fetchFromGitHub {
owner = "diml";
repo = "utop";
- rev = "599fa4ff640d731927415a44679e5b07d9553acd";
- sha256 = "030wmzi51hya4180m411afy8i2vkq63r630cms3apdqd2bkjjjqs";
+ rev = "1b4bd052c6513d38f6cc626c24665637d25fdc07";
+ sha256 = "05pv6nj88im1jf9nngv56z362wrp9pmkzrjn3nm846rdzbc5f21j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -71635,12 +75003,12 @@
vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vc-fossil";
- version = "20171018.2216";
+ version = "20180215.835";
src = fetchFromGitHub {
owner = "venks1";
repo = "emacs-fossil";
- rev = "abdb5487831e641c291c0dcb3848f539ca11f400";
- sha256 = "024bf8cjf3srz0zrxk90c63yz9v525m83znb2fscwa1fwvnnpqkn";
+ rev = "7c5af95181213db38f81f5f9586f3334301a3ea0";
+ sha256 = "1c18ywvs0l5w7ip2igksjy48awzas8mph7plpvp1v8c67a3a3m2m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil";
@@ -71863,6 +75231,27 @@
license = lib.licenses.free;
};
}) {};
+ vertica-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+ melpaBuild {
+ pname = "vertica-snippets";
+ version = "20180208.154";
+ src = fetchFromGitHub {
+ owner = "baron42bba";
+ repo = "vertica-snippets";
+ rev = "5959d86c77d4b8f67383f65f7f6ca3e0db2a9529";
+ sha256 = "0hmvd2kly7k51qfhkg6rzcq0a5ksskr1r0x07i0imz0idm77g29z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c8cb5c0fdbb6820a08091d8936dd53a3c43c56/recipes/vertica-snippets";
+ sha256 = "0044qcf6dyxp2h14ij6w19zs7ikx9xalfrz6jqbl8sy35wcihmhn";
+ name = "vertica-snippets";
+ };
+ packageRequires = [ yasnippet ];
+ meta = {
+ homepage = "https://melpa.org/#/vertica-snippets";
+ license = lib.licenses.free;
+ };
+ }) {};
vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vertigo";
@@ -72034,12 +75423,12 @@
vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vimish-fold";
- version = "20170730.2206";
+ version = "20171231.2212";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "vimish-fold";
- rev = "5e2875c18e2d8ef27f594e0ea1ca15a2f759be42";
- sha256 = "1a24diw5xwk10d9y8dr1bgpc78d36f3swvlll0igl5b91q4x86dn";
+ rev = "c904cd3e8515e76fb836615305e174369211f6df";
+ sha256 = "1kwd6f2qi3p41kryd8z01lkiw7ikpgywgpfy9zbjyb5x6z2hn35s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
@@ -72097,12 +75486,12 @@
virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "virtualenvwrapper";
- version = "20171022.1831";
+ version = "20180211.1744";
src = fetchFromGitHub {
owner = "porterjamesj";
repo = "virtualenvwrapper.el";
- rev = "b4fd61aa5fddd47d33b147ffa1c873d8b20db724";
- sha256 = "04qhxg2gghb9bbvabrjbwj89jl154hhk00s07mzgg93js75ipx6z";
+ rev = "bf13158dde071bdf4901709ed101aba6b8a25f7f";
+ sha256 = "003nj9i6kfjyw1bdz1y3dssp3ff7irhsfq21r430xvdfnzrby4ky";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper";
@@ -72164,8 +75553,8 @@
src = fetchFromGitHub {
owner = "joostkremers";
repo = "visual-fill-column";
- rev = "57c2a72d46900117ea92e0a01b97e19481800503";
- sha256 = "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y";
+ rev = "d97017e9bcca79e6a0f3ef63414a954319feb879";
+ sha256 = "11w3krp5z6yxchqlz45kqiqf0y9drplmanixw3q4r5cwaspx94qh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column";
@@ -72244,12 +75633,12 @@
vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vlf";
- version = "20170830.1148";
+ version = "20180201.1454";
src = fetchFromGitHub {
owner = "m00natic";
repo = "vlfi";
- rev = "df677c128f8abc764b51d2a0ed26071618e686de";
- sha256 = "1fx2ngjh3y69ynih328jiy8132z9y7q7s91rzw8mgpf3hnfmaqly";
+ rev = "31b292dc85a374fb343789e217015683bfbdf5f1";
+ sha256 = "18ll47if9ajv0jj2aps8592bj7xqhxy74sbsqn07x9ywinxxi9mn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
@@ -72265,12 +75654,12 @@
vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vmd-mode";
- version = "20161106.125";
+ version = "20180223.556";
src = fetchFromGitHub {
owner = "blak3mill3r";
repo = "vmd-mode";
- rev = "e3b27f4f179002984643895292bb207c3e221a5c";
- sha256 = "0gpamwnsszhna9crhbg2zcvr9hrq7lackhgclq63lsvcm0z2ynfz";
+ rev = "24e38a20951dfad6e3e985c7cc6286c1e271da5f";
+ sha256 = "00anpbnf0h6iikhpqz4mss507j41xwvv27svw41kpgcwsnrmrqwm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vmd-mode";
@@ -72349,12 +75738,12 @@
vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vue-html-mode";
- version = "20170928.1057";
+ version = "20180104.1421";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "vue-html-mode";
- rev = "9218c61ff1ab2bdc6a6711d21ad760198d3511a8";
- sha256 = "1xpbr2fajn0nk53abb2x9m0qs0ygxfl62gdxd2iqfcwj56fswj9y";
+ rev = "3fa65f8ac8a4c54f13c32fd43c9865c92c22ce07";
+ sha256 = "00mj1qmcsfndnk7vif7aa9nqy7hd3cnbmn6fhik1mmsqrazcbp0h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode";
@@ -72370,12 +75759,12 @@
vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
melpaBuild {
pname = "vue-mode";
- version = "20171029.1905";
+ version = "20180104.1611";
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "vue-mode";
- rev = "a34f8a14fe6a680bb18cfa4519f7984d8071a4e3";
- sha256 = "08c3sgd80aszfpc4zbh0rsn7717nwwjhr38lfbsbxmgmlvqalxzk";
+ rev = "b489a63dabe0f2fee2730121ecabb1b4f4c11761";
+ sha256 = "09fkyyj0lg3q9q0874q0jpvx1h8rf26g96sn9a2xw0j3fl5ab1n4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -72412,12 +75801,12 @@
w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "w3m";
- version = "20171019.1734";
+ version = "20180221.2059";
src = fetchFromGitHub {
owner = "emacsorphanage";
repo = "w3m";
- rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e";
- sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8";
+ rev = "4b9664bab3794379af42d549d9540735c16b5a25";
+ sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m";
@@ -72433,12 +75822,12 @@
wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wacspace";
- version = "20140826.2232";
+ version = "20180311.1650";
src = fetchFromGitHub {
owner = "shosti";
repo = "wacspace.el";
- rev = "4a11168d58c9c129cfcd04a1c9581962565eca4a";
- sha256 = "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4";
+ rev = "54d19aab6fd2bc5945b7ffc58104e695064927e2";
+ sha256 = "1nfx1qsl2gxjqbbc5xsr8f3xz2qyb4wnz3634k3hglb1jpa78j3n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/58e5ff4c5853c5350d0534894ddb358daa83cee9/recipes/wacspace";
@@ -72516,12 +75905,12 @@
wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "wand";
- version = "20171103.513";
+ version = "20180112.454";
src = fetchFromGitHub {
owner = "cmpitg";
repo = "wand";
- rev = "83c0c723dae7d8a37e67a9d9f2d00e005b5486ca";
- sha256 = "0wc1gmaz02bfbapwrmmc5r7rcfwqlfr52x3jqk6bhxpiav141yq4";
+ rev = "e8939812e03255fff3e15c5d0f9d4da849aaf07b";
+ sha256 = "0l79vhf0s5rz9s02bmcfyx7yn4pvn3dnxkr50qfhqajrvfx1105g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand";
@@ -72558,12 +75947,12 @@
wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
melpaBuild {
pname = "wanderlust";
- version = "20171019.550";
+ version = "20180316.1534";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "wanderlust";
- rev = "15a8ca7a28d086066d148ca8bfbd454e32cc5f77";
- sha256 = "1a7xm3x8zyax6crrj8fj932yicwds12774znv991yggjzw5kcwcd";
+ rev = "f0c8c4e55be6569c4c56a1d041f5c53769e4d5ac";
+ sha256 = "11p5kqp16bvas26i0zgdazqhgz6jb6j612q032g6d4476yb8df26";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -72789,12 +76178,12 @@
web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-mode";
- version = "20171112.1324";
+ version = "20180313.1458";
src = fetchFromGitHub {
owner = "fxbois";
repo = "web-mode";
- rev = "39896c2a4ce8eda0f211afab14b1686bdc5ed1e9";
- sha256 = "05jx0sqnyl1qy0h9x4p60l236qlhw5cqywzcgfbymdg28d034k3m";
+ rev = "49a7a72adf77c8d3ee457ef38dce415cddd09aae";
+ sha256 = "0m0dg0w6pimvq0bp5xm7jca6619n38zsw40mddpb9xw01gxmaagb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -72856,8 +76245,8 @@
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "web-search.el";
- rev = "410c490ecf82a3693db3eb62003302233471ff84";
- sha256 = "0hib0ffwikdydkm5asmvzj6l49pd9694psnn2c010j3ixw6i8gsl";
+ rev = "bdf590e7d6d62e874810aa4c5017c48e4e93f823";
+ sha256 = "0fwxjmnhkpla6gb58nkcazjh1q9b92w89rfi12pw7qj0449rmihb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search";
@@ -72915,12 +76304,12 @@
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
- version = "20171025.956";
+ version = "20180127.1434";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "f047313c656e0ea85033bacc564d02ae6f4605ff";
- sha256 = "00mawa0n415dcnrldqmgwwjcj2rv59wblrbzkc2g9i388nl41rp5";
+ rev = "14fd97bc3c8554d9394b698610dca1186ff68b03";
+ sha256 = "1q7pqkww6ggh9sdnqa4vbq6nzivw0w011w3mvwx1mi4zp0dv50zs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -72936,12 +76325,12 @@
websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "websocket";
- version = "20170829.457";
+ version = "20171113.2045";
src = fetchFromGitHub {
owner = "ahyatt";
repo = "emacs-websocket";
- rev = "33d0406901f7306b326928190b6ad94247d01a5f";
- sha256 = "0lw7s121jfqaqrl3b2w9jbx3adh3nq0mkh911c40s4ydxm6xcnk3";
+ rev = "7d2adf218743c52578c8e8fd5584a5e54732e256";
+ sha256 = "0k8n710ip4av51n6l9ap1254qkifj987a6k86pgj3y6bw76ry08f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
@@ -72978,12 +76367,12 @@
weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
melpaBuild {
pname = "weechat";
- version = "20161211.259";
+ version = "20180112.1217";
src = fetchFromGitHub {
owner = "the-kenny";
repo = "weechat.el";
- rev = "2edf75a8405680ba94528864668b226102dd37c5";
- sha256 = "14p8q2bjpgka3mdfphllz13kp6l85aghn2l64fwbcpy0i4xgicbg";
+ rev = "4842e966a557e13fa4f16052cb60d221cdb886cf";
+ sha256 = "0y4vdsm4rb221hmr2a2sn0kj51jsgndkmhwcjiryqxzn2giy9siw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
@@ -73167,12 +76556,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "20170817.1107";
+ version = "20180301.1018";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031";
- sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88";
+ rev = "d19fe4e037baf8a5cd6e8c0609d3999528bb5ac9";
+ sha256 = "1ylfy31a63g3306v0392a8nx2jdjms10f0r91i7am57pkygrx664";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -73360,8 +76749,8 @@
src = fetchFromGitHub {
owner = "foretagsplatsen";
repo = "emacs-js";
- rev = "b05d584a4b3e0db168c3b920ce4a270b3908d842";
- sha256 = "0shgxd08da8a7ij37k5ybmvyqbqzq4nqxdyfbbpgnh1vgw61gr6c";
+ rev = "900cf8213df6e58bdd3244b446ea02c67b7555d8";
+ sha256 = "1yn2hadcpcsgnf0wy7x8zcfw97c90dpp2ipdml176191vz41n7nb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -73419,12 +76808,12 @@
wilt = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "wilt";
- version = "20151105.518";
+ version = "20180220.54";
src = fetchFromGitHub {
owner = "sixty-north";
repo = "emacs-wilt";
- rev = "5febe367c6c3729848654358af4d17ee2987da8d";
- sha256 = "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd";
+ rev = "04dbe37fa35d0b24c791421785d2c97a8cbfe2cc";
+ sha256 = "197kqp22pyy1in2rq063mahvrf00vrfvgnfkqp0zy7hpkhiiqvim";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eea4f2ca8b4f9ea93cc02151fdda6cfee5b68b70/recipes/wilt";
@@ -73737,8 +77126,8 @@
version = "20160419.1232";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "e80659fcc896";
- sha256 = "01cmwv6xafk19gg6ixgiw9szmhmqk19i2jha5yafaa93pwgnc40v";
+ rev = "d04938232934";
+ sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -73775,12 +77164,12 @@
with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "20171006.352";
+ version = "20180217.548";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "ee39f232f2daf997498a4030d104c35ae397f457";
- sha256 = "17m5b7g5sdh0iy6lpj2inv9akscyw83nyx9hl71disdk7diq15hn";
+ rev = "fcbccec6ec0f6639eab769d6ff8e97f25347a48e";
+ sha256 = "079dy4b409i9016j3fkgwxggw8332hkvnnm86am46va3lqpd3jr9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -73877,6 +77266,27 @@
license = lib.licenses.free;
};
}) {};
+ wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "wolfram-mode";
+ version = "20180306.1613";
+ src = fetchFromGitHub {
+ owner = "kawabata";
+ repo = "wolfram-mode";
+ rev = "be680190cac6ccf579dbce107deaae495928d1b3";
+ sha256 = "1cvdw28gvhbr9l65xkv8ld12rb0pcf53jd55gns2b0abz1lg1jc4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/40ded2302e413e233d867caa4776c54a778b8b99/recipes/wolfram-mode";
+ sha256 = "0rc39vvpyhpn0m52i4hs23j6avqfddmrkhjqg339apfq7z35fpli";
+ name = "wolfram-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/wolfram-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }:
melpaBuild {
pname = "wonderland";
@@ -73922,12 +77332,12 @@
wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wordnut";
- version = "20151002.1457";
+ version = "20180312.2143";
src = fetchFromGitHub {
owner = "gromnitsky";
repo = "wordnut";
- rev = "6e223dced5b865e9d38af6f9b7e57b3a56d362bb";
- sha256 = "1w4037jplkl8sr6b7qj4cb5qcrjwz6vnfxfshdjimilwgc3ihs16";
+ rev = "feac531404041855312c1a046bde7ea18c674915";
+ sha256 = "1jl0b6g64a9w0q7bfvwha67vgws5xd15b7mkfyb5gkz3pymqhfxn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut";
@@ -73964,12 +77374,12 @@
worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "worf";
- version = "20171002.1118";
+ version = "20180316.926";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "worf";
- rev = "cf2f382b368bcb3c8ba4785a7fac8ee9300e80b5";
- sha256 = "0rnvmwdks8m4f6dwnyinv9rli58mlvlnrg7swpdjfh0g3bqgr7w5";
+ rev = "543bfe21727c0ea96ee0c1022ed334103c0acdf0";
+ sha256 = "0ia74ijp6cdhxjfygvjb5kx36iyakbdws9lsz20761xlp8vw0dfq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -74136,8 +77546,8 @@
src = fetchFromGitHub {
owner = "lewang";
repo = "ws-butler";
- rev = "80dabd5d158929e8433e46207bb521282b21e4f3";
- sha256 = "0s4kfg2ga3qa6gb2ji1jv73fv66d9vn054cl0mif7n16kic4bkr4";
+ rev = "52321b99be69aa1b661da7743c4421a30d8b6bcb";
+ sha256 = "1b6hxhwhzs6xq12w0jmvvjw0bx4czw71xzj3qizq9gx0q4n7a0qf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler";
@@ -74279,12 +77689,12 @@
x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "x509-mode";
- version = "20170909.632";
+ version = "20180313.153";
src = fetchFromGitHub {
owner = "jobbflykt";
repo = "x509-mode";
- rev = "240b5045dcce18190bdabd91d74f48d3610a6fe2";
- sha256 = "0pi5hi0n6f2hif5hz1g04rk509rb4jlw6nrlhc8fg5k6x4n7ci3p";
+ rev = "d59058608bea1840fdba44810d7184b47bc88410";
+ sha256 = "1srqlzgrp75spygw360d1h2jfhlhmgszfsz9kyn8h564mlc3m35k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode";
@@ -74321,12 +77731,12 @@
xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-css-mode";
- version = "20170821.400";
+ version = "20180219.2311";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-css-mode";
- rev = "7167c7a9a0f0dcc167dafa833efd43a0c9ae4307";
- sha256 = "1iychyj79g9mxpr688f2a9w8bbsgm2r88rr11b42gagal0kgk8q4";
+ rev = "cf452fd0f2e742812a4c69e41cb5403f22b0a16a";
+ sha256 = "1wjj3sj90az5y4a7cy0pblwxi0xbj5gg72jdr9wbm95si582vk58";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode";
@@ -74342,12 +77752,12 @@
xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-elisp-mode";
- version = "20170828.1";
+ version = "20180228.2206";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-elisp-mode";
- rev = "6e94446566df206911afa107d06aec50ac3a56fc";
- sha256 = "028y8dlb5b4vclg03imcipjp56l1m4klgj69f0n7ir0rr6xwl3f6";
+ rev = "3a617b446fda59294b5ff67c0b86a0a6e9f15feb";
+ sha256 = "1bj2w1r98db1jwirvbvxnbc8p7l9pz3n4l0w2rl9g6kqavdx8pnh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode";
@@ -74363,12 +77773,12 @@
xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-find";
- version = "20170821.358";
+ version = "20180310.450";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-find";
- rev = "6b7a60d6210d42559b46f0e17d7a0e4a2607f887";
- sha256 = "11whm7cnz6z61lycm5w6qmvbbl5f2c2lpgmk5c5whks7v3bkq6n6";
+ rev = "0cd985675c286bfa5f07ab9d00231f8a23505537";
+ sha256 = "01h5wdbzf7swrmddai2vsakr8rsqg447w9bnp7akxla426fsr8wg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find";
@@ -74384,12 +77794,12 @@
xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-fly-keys";
- version = "20171101.1546";
+ version = "20180313.1143";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-fly-keys";
- rev = "c007dee9faeae7b4ef1cfd21c97952768f520f8e";
- sha256 = "1vkfff3w09h3gbwz9wqlrab29558ms03x5cgzzdxs0mjaq40pvnz";
+ rev = "cef43c378743bd0073e9044b5cd4df212a022bd8";
+ sha256 = "1qa4payi7r6ncg2dgp9frs6g8gmsc5mfaxssf84lgm3p3468y0fw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
@@ -74447,12 +77857,12 @@
xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-math-input";
- version = "20170905.849";
+ version = "20180308.349";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-math-input";
- rev = "fcdfbed46ff81c8da84422611e0009c6b267e359";
- sha256 = "01s4fhnp4zqh2cmqbp2sh1sbdcyq4i5hy1r8manqa26m041xk2z0";
+ rev = "2904922958f746cbb77692564e4c4487ff31c9ab";
+ sha256 = "1zk02fbkd9y6hy226lnqf31c3l5sync2m6gqj1m4pj4qqla98m1k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input";
@@ -74846,12 +78256,12 @@
xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xterm-color";
- version = "20170102.1525";
+ version = "20180202.1518";
src = fetchFromGitHub {
owner = "atomontage";
repo = "xterm-color";
- rev = "5873477fd7bd6e54142ab35fbc623ea9b55200aa";
- sha256 = "1328avc28barirwipasnhq81sn4nw6w6x6fffgqcxayv2r5bl1d8";
+ rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c";
+ sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
@@ -74951,12 +78361,12 @@
xwidgete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xwidgete";
- version = "20161029.1112";
+ version = "20171118.1316";
src = fetchFromGitHub {
owner = "tuhdo";
repo = "xwidgete";
- rev = "adcf3f84772f4a382ba791a6584fa7dddfafdcdd";
- sha256 = "17zlbrnxyc0lgsy5g8zqz13mqizhaqpp4i975x9m4ilpl5ycaqqx";
+ rev = "e4e8410fe32176df85b46234717824519443fb04";
+ sha256 = "04j4xwcdxlnrwxs89605zmwxszbi2j0z67v80651pshgnhj5p19i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xwidgete";
@@ -75060,8 +78470,8 @@
src = fetchFromGitHub {
owner = "drdv";
repo = "yahtzee";
- rev = "45987672d51ea2aac0131a11f3c6bacf103a4e10";
- sha256 = "0rri0cwxkydw19psaqkiad14pgp5v9h5605y2whqf9d6siyh3mjb";
+ rev = "c2912e845d74a22436bdf720eb9bc543d0e0c45c";
+ sha256 = "1swnr1nrlyd7ij4m05dvqwdfmpj41b3ibfqmb45qm073f27gvj65";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -75098,12 +78508,12 @@
yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yaml-mode";
- version = "20170727.1531";
+ version = "20180212.1556";
src = fetchFromGitHub {
owner = "yoshiki";
repo = "yaml-mode";
- rev = "28c34033194130d452d5c958b5241c88d42ca02b";
- sha256 = "1m3fr19sfkr7d94qzqkl7x1jmhpar2hnhq6mjscd3lfcqkifh6kv";
+ rev = "3fc5a33760b0bbb6e67adbce48ab3dc4ae34b847";
+ sha256 = "1ijq7ay5lx77nibzqc1kih64v4bg4790as1zg26igp7ivg66l1m6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode";
@@ -75161,12 +78571,12 @@
yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yang-mode";
- version = "20170323.1104";
+ version = "20180306.407";
src = fetchFromGitHub {
owner = "mbj4668";
repo = "yang-mode";
- rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695";
- sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv";
+ rev = "340aec635e359609b22f7e94df15af1af2b070f6";
+ sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -75182,12 +78592,12 @@
yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yankpad";
- version = "20170607.819";
+ version = "20180220.1049";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "yankpad";
- rev = "70e755fcf58e37092de2c335355eab93d5f1fb44";
- sha256 = "1ijd3vpym573p96dh81pw9rzlmman7dvamhvnf0jqp8mmy4g4bml";
+ rev = "de672dab9df4a0bffb44cdadaace93d00d9a8848";
+ sha256 = "1w0lkn1prv9xd4pn81kqxk26s37ia1xk0kz8qahcvjg7z4igyy9n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
@@ -75203,12 +78613,12 @@
yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yapfify";
- version = "20170519.115";
+ version = "20180105.1447";
src = fetchFromGitHub {
owner = "JorisE";
repo = "yapfify";
- rev = "492eb038b35f49b1012fb843d880bccc40f2260b";
- sha256 = "1jj1j525xlwhylsysay52f4rdrwz3r72ghx4iggkxqiqbv919ia4";
+ rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f";
+ sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
@@ -75329,12 +78739,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20170923.1646";
+ version = "20180310.1614";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "35a4df769cbdebd10d043f16d680bdb16ee858ed";
- sha256 = "0rkk39bm12d3d4gf8r99a2ipjaf1yb0b57rpg44bsqz5jada4a86";
+ rev = "5170f051ad39353ed46ae7ff7b67e50e0e27324c";
+ sha256 = "1ssb1ljbm8i78qii15yhd488y3q1w2082lb2pcwly2axwa5a02kv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -75350,12 +78760,12 @@
yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "yasnippet-snippets";
- version = "20171106.447";
+ version = "20180307.518";
src = fetchFromGitHub {
owner = "AndreaCrotti";
repo = "yasnippet-snippets";
- rev = "6b6dcd9eca4d6d3e982bbc241b51cd6562ef600e";
- sha256 = "07zblniw1rc24zyaw1xbam46yz8cac4wl6qf6l1ynkbpj5k0x1g5";
+ rev = "2b4c4d7ef7e85a3b9306ce7da82a65cf243edc22";
+ sha256 = "0v0q8ym8jp6pps6g9g0qnz9x39i4n4w937s8s6arf1f31fc73r52";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
@@ -75371,12 +78781,12 @@
yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "yatemplate";
- version = "20161108.1305";
+ version = "20180114.734";
src = fetchFromGitHub {
owner = "mineo";
repo = "yatemplate";
- rev = "07da11de32feb6cbce0f8c140c0304e3ba1b42c0";
- sha256 = "10af3pa8rh3rs0vpm436vm5wlwvqkfa3zpqyhdf2i3q4gaqfb902";
+ rev = "4ab835c5ee90a1dbc31c4275a563a9e741a78c6a";
+ sha256 = "119i1p1rj329yh7d5a1wizrwhbvnildzzhl2bv50vkswg9nvg3na";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
@@ -75391,15 +78801,15 @@
}) {};
yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "yatex";
- version = "20171030.502";
+ version = "20180223.2345";
src = fetchhg {
- url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "16763e5b7481";
- sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
+ url = "https://www.yatex.org/hgrepos/yatex";
+ rev = "af4601ee3c6a";
+ sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
- sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex";
+ sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0";
name = "yatex";
};
packageRequires = [];
@@ -75457,8 +78867,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "e8a6c2bb6cdc18645e2ebc6a8ede8f0c306f013d";
- sha256 = "0gijzvc6krz1228siysk4za3pwfgfmwh04b8zjc57qkccngibnf9";
+ rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2";
+ sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -75523,6 +78933,27 @@
license = lib.licenses.free;
};
}) {};
+ yoficator = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "yoficator";
+ version = "20180129.1252";
+ src = fetchFromGitLab {
+ owner = "link2xt";
+ repo = "yoficator";
+ rev = "e0dc076cb0d1999cb41585b5f36322681109fe86";
+ sha256 = "1vq07ndxrdry26dx3ci4yz1a1qdcr20yznj62y2f0wkyccrai9y9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator";
+ sha256 = "0b6lv6wk5ammhb9rws9kig02wkm84i5avm7a1vd4sb7wkgm9nj9r";
+ name = "yoficator";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/yoficator";
+ license = lib.licenses.free;
+ };
+ }) {};
yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yoshi-theme";
@@ -75589,12 +79020,12 @@
zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zeal-at-point";
- version = "20170427.2042";
+ version = "20180131.1554";
src = fetchFromGitHub {
owner = "jinzhu";
repo = "zeal-at-point";
- rev = "50a1bd4240ff0db7c8f2046c3b00c5a8e14b9d2f";
- sha256 = "1xy9nbbk0fkd9dm8n0c0gy52vi34s6vgzbnab0hrghn6whs89ig8";
+ rev = "0fc3263f44e95acd3e9d91057677621ce4d297ee";
+ sha256 = "0aq9w9pjyzdgf63hwffhph6k43vv3cxmffklrjkjj3hqv796k8yd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point";
@@ -75652,12 +79083,12 @@
zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zenburn-theme";
- version = "20171109.926";
+ version = "20180222.1757";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "zenburn-emacs";
- rev = "613f4c69513c7ffe7cb00a6c477cd5e8e6378d40";
- sha256 = "03n3ixkzfva5r2a7qdkl0b9254q56f9fh202lrkcgg135ynhkrhc";
+ rev = "3a9ae671d01d9828b3e2935c80e8796cd3c1d77b";
+ sha256 = "1kfwnwnnax22dlkc42rlw7lrdlpjxmh70sjnrrljpvi238scn5b2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -75696,13 +79127,13 @@
pname = "zenity-color-picker";
version = "20160302.354";
src = fetchgit {
- url = "https://bitbucket.org/Soft/zenity-color-picker.el.git";
+ url = "https://bitbucket.org/Soft/zenity-color-picker.el";
rev = "4f4f46676a461ebc881487fb70c8c181e323db5e";
sha256 = "14i2k52qz77dv04w39fyp9hfq983fwa3803anqragk608xgwpf4s";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e7c8f99ac93f2b828ded420a2fbcd18356ea641e/recipes/zenity-color-picker";
- sha256 = "1v6ks922paacdgpv5v8cpic1g66670x73ixsy2nixs5qdw241wzl";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/zenity-color-picker";
+ sha256 = "0rim1mbhlb2lj302c58rs5l7bd168nxg1jpir6cbpf8rp0k35ldb";
name = "zenity-color-picker";
};
packageRequires = [ emacs ];
@@ -75735,12 +79166,12 @@
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
melpaBuild {
pname = "zerodark-theme";
- version = "20171016.59";
+ version = "20180308.957";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "ccadcfba1a708352508d4c0857359df7425e7574";
- sha256 = "1mg1dhda9zvdinxizckvz454633lrl62a382vdm838295gvc40wm";
+ rev = "2a240de8cd89c741612d807a521d6b3e51088324";
+ sha256 = "10r806hzmgwnysjgg5lx252ychnhyma1bpwm980pf46vlywws5a0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
@@ -75756,16 +79187,16 @@
zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zig-mode";
- version = "20170920.802";
+ version = "20180309.1458";
src = fetchFromGitHub {
- owner = "AndreaOrru";
+ owner = "zig-lang";
repo = "zig-mode";
- rev = "814657c5b6b0600ace78a7bbd216c3e90d611cfd";
- sha256 = "0nhx2wsk3qpdplvwxmdzwlka9255x46ca9vcjb58zbpb5wbfckzx";
+ rev = "4f281e4748a4eae64efaa98d9dfd9b7c163fbed8";
+ sha256 = "0pip0kgbxh4cf60j2kzgb9lvrm5vksg83mllk1pcs9mkbxdgjyww";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/33895b0ff559ffd18a62c04736597188f55419ee/recipes/zig-mode";
- sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5cba49d25ebbaa9240d5d87d0c7ca48d928b2e4b/recipes/zig-mode";
+ sha256 = "005lsgnsaj8rjkzbhi23g99xy9zln4ggkad11xqmn4xa6g199wly";
name = "zig-mode";
};
packageRequires = [ emacs ];
@@ -75945,12 +79376,12 @@
zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zoom";
- version = "20171110.715";
+ version = "20180310.421";
src = fetchFromGitHub {
owner = "cyrus-and";
repo = "zoom";
- rev = "d4f417b24fe022b6512a1a0ffebf898044393250";
- sha256 = "0qksgg0c4z5c293avc87q2hgwnvr550rycwgnvrp574n3qmvqjmd";
+ rev = "a72714bb14eb32c1c5e7ad1cb4bdeb208450e507";
+ sha256 = "176fbhsh2rk6rn8fisfq4ja71lqvf1zbb393wzfsgg68df39mqyh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
@@ -76050,12 +79481,12 @@
zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }:
melpaBuild {
pname = "zotxt";
- version = "20170109.2040";
+ version = "20180218.1053";
src = fetchFromGitLab {
owner = "egh";
repo = "zotxt-emacs";
- rev = "1a010ea5db617269adc132e4cc028a44d9b629bd";
- sha256 = "10i5hq0mkb0b88n9lb40ad4d98fwv5inbdfiyxyrflvl4qj0q60r";
+ rev = "5b3715bab55c9f17f134a8fada5b68c07aa66cad";
+ sha256 = "1hz1m4190yi6knz3y088ql8wy3pmsl8lsznqby2vpnn9p74fvl37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt";
@@ -76071,12 +79502,12 @@
zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zoutline";
- version = "20170722.651";
+ version = "20180314.1059";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "zoutline";
- rev = "e86e739b53a1c8a0a2cf6de43dffabb15d465507";
- sha256 = "0ycri5d61pbwhwpwh9qx9m22mb4ab7bgniwgdbi9s8rzqs4q1p91";
+ rev = "b3ee0f0e0b916838c2d2c249beba74ffdb8d5699";
+ sha256 = "0sd0017piw0dis6dhpq5dkqd3acisxqgipl7dj8gmc1vnswhdwr8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline";
@@ -76092,11 +79523,11 @@
zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }:
melpaBuild {
pname = "zpresent";
- version = "20171008.2152";
+ version = "20180224.2212";
src = fetchhg {
url = "https://bitbucket.com/zck/zpresent.el";
- rev = "eb6f5bf71b00";
- sha256 = "1q3xz4gwqb7ac49w0nq7zvl4n790wk6r97by1kldv54y2fj0ja9g";
+ rev = "e2e34c061ff5";
+ sha256 = "00rj8lgp5b856csvlrin1vwas1109nmywbrnpny4qck4yghv6zqb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
@@ -76112,12 +79543,12 @@
ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ztree";
- version = "20170223.1014";
+ version = "20180215.1021";
src = fetchFromGitHub {
owner = "fourier";
repo = "ztree";
- rev = "febc2d02373312ce69f56c9dbe54cabea3e0813c";
- sha256 = "0sj30f87gvxbqwi1k7xxqc1h0w7n53630d04csqayiwvc6a2z2sz";
+ rev = "67a1d90595353ab57fd424651c567df9851b9494";
+ sha256 = "01qv400zp4bdfah62l3ixkc3kvkwrjj5ngc36m6w783q0zmr105r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree";
@@ -76175,12 +79606,12 @@
zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zzz-to-char";
- version = "20170519.335";
+ version = "20171231.2219";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "zzz-to-char";
- rev = "96dfe16a990474267cd290498cf9ac6dd6b3e7c0";
- sha256 = "1jvysrq9ya77x2xg0wqy1q27y0r43578d10bdhihpj2281nxng1y";
+ rev = "db8d9e660ad18a15159779efe34d7a98ef0df535";
+ sha256 = "1wlzlhabq75iqrhg9p2xx8l7rnfzpcjjflxmgyhaxhq188bwrqk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index a13093d964e8..6b986aa7499c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -36,6 +36,9 @@ self:
});
overrides = {
+ # Expects bash to be at /bin/bash
+ ac-rtags = markBroken super.ac-rtags;
+
# upstream issue: mismatched filename
ack-menu = markBroken super.ack-menu;
@@ -46,10 +49,16 @@ self:
# upstream issue: missing file header
bufshow = markBroken super.bufshow;
+ # part of a larger package
+ caml = dontConfigure super.caml;
+
# part of a larger package
# upstream issue: missing package version
cmake-mode = markBroken (dontConfigure super.cmake-mode);
+ # Expects bash to be at /bin/bash
+ company-rtags = markBroken super.company-rtags;
+
# upstream issue: missing file header
connection = markBroken super.connection;
@@ -66,6 +75,9 @@ self:
# upstream issue: missing file header
elmine = markBroken super.elmine;
+ # upstream issue: missing dependency redshank
+ emr = markBroken super.emr;
+
ess-R-data-view = super.ess-R-data-view.override {
inherit (self.melpaPackages) ess ctable popup;
};
@@ -74,9 +86,18 @@ self:
inherit (self.melpaPackages) ess popup;
};
+ # upstream issue: missing dependency highlight
+ evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
+
+ # upstream issue: missing dependency highlight
+ floobits = markBroken super.floobits;
+
# missing OCaml
flycheck-ocaml = markBroken super.flycheck-ocaml;
+ # Expects bash to be at /bin/bash
+ flycheck-rtags = markBroken super.flycheck-rtags;
+
# upstream issue: missing file header
fold-dwim = markBroken super.fold-dwim;
@@ -86,6 +107,9 @@ self:
# upstream issue: mismatched filename
helm-lobsters = markBroken super.helm-lobsters;
+ # Expects bash to be at /bin/bash
+ helm-rtags = markBroken super.helm-rtags;
+
# upstream issue: missing file header
helm-words = markBroken super.helm-words;
@@ -95,6 +119,9 @@ self:
# upstream issue: missing file header
initsplit = markBroken super.initsplit;
+ # Expects bash to be at /bin/bash
+ ivy-rtags = markBroken super.ivy-rtags;
+
# upstream issue: missing file header
jsfmt = markBroken super.jsfmt;
@@ -104,12 +131,15 @@ self:
# upstream issue: mismatched filename
link-hint = markBroken super.link-hint;
- # part of a larger package
- llvm-mode = dontConfigure super.llvm-mode;
-
# upstream issue: missing file header
maxframe = markBroken super.maxframe;
+ # version of magit-popup needs to match magit
+ # https://github.com/magit/magit/issues/3286
+ magit = super.magit.override {
+ inherit (self.melpaPackages) magit-popup;
+ };
+
# missing OCaml
merlin = markBroken super.merlin;
@@ -126,6 +156,9 @@ self:
# missing OCaml
ocp-indent = markBroken super.ocp-indent;
+ # upstream issue: missing dependency
+ org-readme = markBroken super.org-readme;
+
# upstream issue: missing file header
perl-completion = markBroken super.perl-completion;
@@ -147,6 +180,9 @@ self:
# upstream issue: missing file footer
seoul256-theme = markBroken super.seoul256-theme;
+ # upstream issue: missing dependency highlight
+ sonic-pi = markBroken super.sonic-pi;
+
spaceline = super.spaceline.override {
inherit (self.melpaPackages) powerline;
};
@@ -157,6 +193,9 @@ self:
# upstream issue: missing file header
stgit = markBroken super.stgit;
+ # upstream issue: missing file header
+ tawny-mode = markBroken super.tawny-mode;
+
# upstream issue: missing file header
textmate = markBroken super.textmate;
@@ -166,6 +205,9 @@ self:
# upstream issue: missing file header
voca-builder = markBroken super.voca-builder;
+ # upstream issue: missing dependency
+ weechat-alert = markBroken super.weechat-alert;
+
# upstream issue: missing file header
window-numbering = markBroken super.window-numbering;
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 7836f12ed912..294414f15ee1 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -125,27 +125,6 @@
license = lib.licenses.free;
};
}) {};
- ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "ac-anaconda";
- version = "0.1.0";
- src = fetchFromGitHub {
- owner = "proofit404";
- repo = "ac-anaconda";
- rev = "d0dec5c026235f65f9fd6594540df8886ed1b6a8";
- sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda";
- sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
- name = "ac-anaconda";
- };
- packageRequires = [ anaconda-mode auto-complete dash ];
- meta = {
- homepage = "https://melpa.org/#/ac-anaconda";
- license = lib.licenses.free;
- };
- }) {};
ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ac-cake";
@@ -233,12 +212,12 @@
ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
melpaBuild {
pname = "ac-clang";
- version = "1.9.2";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "ac-clang";
- rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd";
- sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57";
+ rev = "d14b0898f88c9f2911ebf68c1cbaae09e28b534a";
+ sha256 = "02f8avxvcpr3ns4f0dw72jfx9c89aib5c2j54qcfz66fhka9jnvq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -527,12 +506,12 @@
ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ac-octave";
- version = "0.6";
+ version = "0.7";
src = fetchFromGitHub {
owner = "coldnew";
repo = "ac-octave";
- rev = "f131ed6859a0945ac0c0520d2ab076f16ce7314c";
- sha256 = "0aigfydmfw284qkhajzxhnl5zx41v5z6ip0kjwmwgphqyxay7nih";
+ rev = "6d09b94a86f43de84c60e9a699b5e1be61c0f138";
+ sha256 = "1kg5q0bw0ymynsn3j7bjavb6wr8b0bjwm6jfj254g80y1inn4bp4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave";
@@ -548,12 +527,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "ac-php";
- version = "1.8.1";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
- sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
+ rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d";
+ sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -569,12 +548,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "1.8.1";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
- sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
+ rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d";
+ sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -611,12 +590,12 @@
ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ac-rtags";
- version = "2.15";
+ version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
- sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
+ rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
+ sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -758,12 +737,12 @@
ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-jump-zap";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "waymondo";
repo = "ace-jump-zap";
- rev = "0acdd83a5abd59606495e67a4ee01f7856e5d359";
- sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca";
+ rev = "1a9bf779d8f9225ede9ec482b840942bb58111df";
+ sha256 = "0r875w4aq3p091hcrpkpqsivn1q9hmq2ppa1rvxzdaq0rhl9kfz4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap";
@@ -902,15 +881,36 @@
license = lib.licenses.free;
};
}) {};
+ adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "adafruit-wisdom";
+ version = "0.2.1";
+ src = fetchFromGitHub {
+ owner = "gonewest818";
+ repo = "adafruit-wisdom.el";
+ rev = "2b353f9029f359eb4eb4f0364bd2fbbedf081e42";
+ sha256 = "0zyqnwmrj7yigk1z9baqxmzxnwhpxfjz9r1gl090harl69hdp67d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom";
+ sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad";
+ name = "adafruit-wisdom";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/adafruit-wisdom";
+ license = lib.licenses.free;
+ };
+ }) {};
add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-hooks";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "nickmccurdy";
repo = "add-hooks";
- rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7";
- sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82";
+ rev = "a1043b7cdb1ea98055a2c99f8d37584a553ca362";
+ sha256 = "1jv9fpcsm572zg0j1mbpbfkqgdlqapy89xhhj19pswkhjns1y2wl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1073,12 +1073,12 @@
ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ahungry-theme";
- version = "1.8.0";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "ahungry";
repo = "color-theme-ahungry";
- rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476";
- sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg";
+ rev = "45bf75f17752c8e8dd4c8a4531c0aa419cdccb84";
+ sha256 = "03xypgq6vy7819r42g23kgn7p775bc0v9blzhi0zp5c61p4cw8v3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@@ -1196,22 +1196,22 @@
license = lib.licenses.free;
};
}) {};
- all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
+ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }:
melpaBuild {
pname = "all-the-icons";
- version = "3.1.1";
+ version = "3.2.0";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "bb69345ead914345faad582723a2b61618f13289";
- sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf";
+ rev = "52d1f2d36468146c93aaf11399f581401a233306";
+ sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
name = "all-the-icons";
};
- packageRequires = [ emacs font-lock-plus memoize ];
+ packageRequires = [ emacs memoize ];
meta = {
homepage = "https://melpa.org/#/all-the-icons";
license = lib.licenses.free;
@@ -1523,12 +1523,12 @@
anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anti-zenburn-theme";
- version = "2.4";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "m00natic";
repo = "anti-zenburn-theme";
- rev = "53591a18aee564c6d08a5be69b4060a299903255";
- sha256 = "06cn81sksvl88l1g3cfgp1kf8xzfv00b31j2rf58f45zlbl5ckv9";
+ rev = "c80cc51bb1aaf11dd53b9d08e01d61bc9b32622f";
+ sha256 = "1c97d2jkh7iawgsbcg19gha9ffnxypbcfz0sgcsgf9vy4bvnc350";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f6f803dc99a1b1fdb5b4e79f1c9cf72b702d091/recipes/anti-zenburn-theme";
@@ -1648,12 +1648,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything-tramp";
- version = "0.5.4";
+ version = "0.8.5";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
- rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43";
- sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m";
+ rev = "942affd6b7538d1e829ee257bbd829cb4e860cce";
+ sha256 = "0njynjg7p7i5li668ldpvmnpc5w7bikcs4cmkf26vf5n714fvlc1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -1732,12 +1732,12 @@
apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apiwrap";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
- rev = "5d25972192cd34553997ba193c09eab093a2b870";
- sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0";
+ rev = "7935275ee45f0359d887b8563ffd1d002f0c618e";
+ sha256 = "1p6sj46135dh7fgpzrfzsp5zkmx5si5lndwc7pnk30fbz5pindsw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2002,15 +2002,36 @@
license = lib.licenses.free;
};
}) {};
+ aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "aurora-config-mode";
+ version = "0.0.2";
+ src = fetchFromGitHub {
+ owner = "bdd";
+ repo = "aurora-config-mode.el";
+ rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
+ sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode";
+ sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
+ name = "aurora-config-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/aurora-config-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
melpaBuild {
pname = "auth-password-store";
- version = "2.0.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "auth-password-store";
- rev = "5ca6a838489c1175de3df7af025751559eb13cb3";
- sha256 = "10y6grxwp8sw24fv8i9f50lc83qcdxnkw2bm1v983fw6di4i3a8w";
+ rev = "6af0458a6b586cc5004fa652f23615433304924d";
+ sha256 = "150cx8ida9bl0g84iq051rziy64ic2pxz6hn0blsys1qcp9lf8wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -2026,12 +2047,12 @@
auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
melpaBuild {
pname = "auto-compile";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "auto-compile";
- rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a";
- sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa";
+ rev = "8d117868a0a091389d528428136e60f951e9c550";
+ sha256 = "1qkw8qzhqzk16kvk1200ha10gi6ny0saqvyqm6b1ww0iw3q1ic5c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
@@ -2536,12 +2557,12 @@
base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "base16-theme";
- version = "2.1";
+ version = "2.2";
src = fetchFromGitHub {
owner = "belak";
repo = "base16-emacs";
- rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1";
- sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv";
+ rev = "10180e88d6d9434cec367b6c91222dd2fc3bd8ae";
+ sha256 = "01w89g413s1da6rf94y1xnhw79cjy2bqb01yfjs58cy492cm0vr6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -2575,6 +2596,27 @@
license = lib.licenses.free;
};
}) {};
+ bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "bazel-mode";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "codesuki";
+ repo = "bazel-mode";
+ rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25";
+ sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode";
+ sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586";
+ name = "bazel-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/bazel-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbcode-mode";
@@ -2722,6 +2764,27 @@
license = lib.licenses.free;
};
}) {};
+ benchmark-init = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "benchmark-init";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "dholm";
+ repo = "benchmark-init-el";
+ rev = "7a0f263282bbc86b01b662636306f22813082647";
+ sha256 = "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0/recipes/benchmark-init";
+ sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal";
+ name = "benchmark-init";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/benchmark-init";
+ license = lib.licenses.free;
+ };
+ }) {};
benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "benchstat";
@@ -2767,12 +2830,12 @@
better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "better-shell";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "killdash9";
repo = "better-shell";
- rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7";
- sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd";
+ rev = "f231404b6f8efce33b48e31e5b1566108d0ba000";
+ sha256 = "1g5bljvigga856ksyvgix9hk0pp9nzic088kp0bqx0zqvcl82v0b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell";
@@ -2998,12 +3061,12 @@
bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bog";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "kyleam";
repo = "bog";
- rev = "cf7817de3f37ce2404ee637a655f1a511b829585";
- sha256 = "0h166w8bg864ppwg64m0vhg649mmkclld85zcd0lmbqa9wfml5j5";
+ rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611";
+ sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog";
@@ -3079,6 +3142,27 @@
license = lib.licenses.free;
};
}) {};
+ borg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "borg";
+ version = "2.0.0";
+ src = fetchFromGitHub {
+ owner = "emacscollective";
+ repo = "borg";
+ rev = "34eac585d6829e17ce59b09fe6ad5d675302c096";
+ sha256 = "1q7k2c7pxcywg6xjk8awg73skyw59a6w4aa9sxbsz9vdj2zn04k9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg";
+ sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr";
+ name = "borg";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/borg";
+ license = lib.licenses.free;
+ };
+ }) {};
boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "boxquote";
@@ -3163,22 +3247,22 @@
license = lib.licenses.free;
};
}) {};
- buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
+ buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-flip";
- version = "1.2";
+ version = "2.0";
src = fetchFromGitHub {
owner = "killdash9";
repo = "buffer-flip.el";
- rev = "386067141ca77848b266e068f8c6baf6b4c2ab5b";
- sha256 = "1bch4jk6d60aydvcc624026pwfby29fbcwm3zhrsksqc0d2qxdwq";
+ rev = "868aa9e04438d57746e0b1f5a13bcb9b64061c05";
+ sha256 = "0b069g89b34s76ds3axmpiwl924fjd1jh6z6fdw5x0h0lj20pa87";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip";
sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
name = "buffer-flip";
};
- packageRequires = [ key-chord ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/buffer-flip";
license = lib.licenses.free;
@@ -3292,12 +3376,12 @@
bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bug-reference-github";
- version = "0.2.0";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "arnested";
repo = "bug-reference-github";
- rev = "671d32083aad5cf813a5e61075b70889bc95dec5";
- sha256 = "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v";
+ rev = "f570a0532bfb44f095b42cf68ab1f69799101137";
+ sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github";
@@ -3418,12 +3502,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "1.9";
+ version = "1.11";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "18a887957b0e22d3cc8873796bd27f06b2493a03";
- sha256 = "0y0wg0yqmvqjyhjs4dx8yw44hl19k227krd9mds220w0dx8wmhay";
+ rev = "8d27bb99463bc230a76dee96378dd337622988f5";
+ sha256 = "0s5vfzcfsiqb6bc6jh95a2dyy23b4bvhdpzn2fcq8awldbpx51fh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -3691,12 +3775,12 @@
caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "caml";
- version = "4.6.0";
+ version = "4.6.1";
src = fetchFromGitHub {
owner = "ocaml";
repo = "ocaml";
- rev = "0d68080b95016f747b7cb63dd36ccdd42d40016e";
- sha256 = "1dxg82xqjx4yh4sg2dy48ybn4czv9yq0q3zpr29sxp1grvwvrg2b";
+ rev = "81dc8e8fcf923baa5e5208f9bc4228930c7c3d56";
+ sha256 = "0pn25c3v8xnihnyzk1w297ci5ca05hcdv46m21522sgpcinbvkc7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@@ -3754,12 +3838,12 @@
cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
melpaBuild {
pname = "cask";
- version = "0.8.1";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
- rev = "58f641960bcb152b33fcd27d41111291702e2da6";
- sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b";
+ rev = "ccfe38ae133cc843865f87607d3f4f3960b76870";
+ sha256 = "1bv0lganh5xhjp2r84js596p1sqndvxnhn3q6l7m7lcdxrjckcy8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -3857,12 +3941,12 @@
cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cbm";
- version = "0.5";
+ version = "0.6";
src = fetchFromGitHub {
owner = "akermu";
repo = "cbm.el";
- rev = "bf8cbbcef82e4643c5f0399f0198f606275af08c";
- sha256 = "1p88fx90xwjk7dmd5gmbqyajyxf859kjsjzqmzljwai91skbb3pm";
+ rev = "5b41c936ba9f6d170309a85ffebc9939c1050b31";
+ sha256 = "091ln3d0jhdgahbwfdm1042b19886n3kwipw5gk8d0jnq5vwrkws";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm";
@@ -4193,12 +4277,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "0.15.1";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1";
- sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h";
+ rev = "74f7901b416efbd032bb4f8b5c25f57fdf731115";
+ sha256 = "0n2b6q8r2gzr3ghyvg5sawir47rk7jmsslvxx6by27bn77h4nzil";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -4256,7 +4340,7 @@
circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circadian";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "GuidoSchmidt";
repo = "circadian.el";
@@ -4277,12 +4361,12 @@
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "2.6";
+ version = "2.7";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6";
- sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j";
+ rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484";
+ sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -4604,12 +4688,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
- version = "0.4.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
- rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362";
- sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l";
+ rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d";
+ sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -4688,12 +4772,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "3.10.0pre5";
+ version = "3.11.0pre1";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "78f5d571e4b07cc71d44c78ff36a335693298ccb";
- sha256 = "1wrbpcfmvhmamxbv7iar6w29i7axzi1im99xd4vrhy4fc1rkk566";
+ rev = "02edf08be2b9476f442b702c6c00447912425cc2";
+ sha256 = "1ppq3g1525izfl4d8779rj6lq8jkgqh50wnbyb0cmj6bp7b7c9sz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -5003,12 +5087,12 @@
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "0.9.4";
+ version = "0.9.6";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56";
- sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa";
+ rev = "4711695af3df93f1bbceee165c505fea5bfc49ac";
+ sha256 = "0x8zwq88k85ikzr0klm6nfa6i1wbykzfa790cg9cmi7wrsywimm1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -5315,22 +5399,22 @@
license = lib.licenses.free;
};
}) {};
- company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
+ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
melpaBuild {
pname = "company-lsp";
- version = "1.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "tigersoldier";
repo = "company-lsp";
- rev = "86fda23d29b732ba3987bf20901034da1515b077";
- sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y";
+ rev = "4512d062c38922d8b8cf402ca6043c246e915694";
+ sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
name = "company-lsp";
};
- packageRequires = [ company emacs lsp-mode s ];
+ packageRequires = [ company dash emacs lsp-mode s ];
meta = {
homepage = "https://melpa.org/#/company-lsp";
license = lib.licenses.free;
@@ -5402,12 +5486,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-php";
- version = "1.8.1";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
- sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
+ rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d";
+ sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -5471,12 +5555,12 @@
company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "company-rtags";
- version = "2.15";
+ version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
- sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
+ rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
+ sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -5807,12 +5891,12 @@
copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "copy-as-format";
- version = "0.0.6";
+ version = "0.0.7";
src = fetchFromGitHub {
owner = "sshaw";
repo = "copy-as-format";
- rev = "fba9fe57a310a71c5aac90a26434df4c08214833";
- sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76";
+ rev = "971957166fe64d914ec4be209b4f80efeeabbb19";
+ sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -5828,12 +5912,12 @@
copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "copy-file-on-save";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "emacs-auto-deployment";
- rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84";
- sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs";
+ rev = "aaa847b43af225ccb282aab2d9cddafe500d9f62";
+ sha256 = "0n2z91g7p9i724xqx2qq4s5xnxnf4vjccnvy1i706cddpjn02d6f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
@@ -5912,12 +5996,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
- sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
+ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
+ sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -5930,22 +6014,22 @@
license = lib.licenses.free;
};
}) {};
- counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-bbdb";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-bbdb";
- rev = "f95e4812cd17e5f8069c9209241396780d414680";
- sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73";
+ rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1";
+ sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp";
name = "counsel-bbdb";
};
- packageRequires = [];
+ packageRequires = [ emacs ivy ];
meta = {
homepage = "https://melpa.org/#/counsel-bbdb";
license = lib.licenses.free;
@@ -5975,12 +6059,12 @@
counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-etags";
- version = "1.3.3";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-etags";
- rev = "ad70ab89861d17b648a798c234153269eacf90b5";
- sha256 = "0jzk5sdh6kax1gvrdrldvqlbgbsx8p938qnzn1mpkd2nmjga3v3c";
+ rev = "9d70490b551503aac22241c8089a46e55dd3deba";
+ sha256 = "03yr0y3z0jgh8c1db43nq0888rr561f6ks5fmf254aibh63schff";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -6014,6 +6098,48 @@
license = lib.licenses.free;
};
}) {};
+ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+ melpaBuild {
+ pname = "counsel-projectile";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "ericdanan";
+ repo = "counsel-projectile";
+ rev = "536872f022f449548bdb97faa1776d1d44499d73";
+ sha256 = "0pm5sqhr24n2ffycazxgl3d3dl7gai8svwz01vc0pgx9c0x75kl8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
+ sha256 = "1gshphxaa902kq878rnizn3k1zycakwqkciz92z3xxb3bdyy0hnl";
+ name = "counsel-projectile";
+ };
+ packageRequires = [ counsel projectile ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-projectile";
+ license = lib.licenses.free;
+ };
+ }) {};
+ counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-tramp";
+ version = "0.3.1";
+ src = fetchFromGitHub {
+ owner = "masasam";
+ repo = "emacs-counsel-tramp";
+ rev = "d4c35e1aca724af6a0084362a027fdd70876d2c8";
+ sha256 = "0dflm700n9wzn2nrwlbrh1558zv0c9fzzrs43d1kqvzw98wihfz2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
+ sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5";
+ name = "counsel-tramp";
+ };
+ packageRequires = [ counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-tramp";
+ license = lib.licenses.free;
+ };
+ }) {};
coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
melpaBuild {
pname = "coverage";
@@ -6119,22 +6245,22 @@
license = lib.licenses.free;
};
}) {};
- cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cricbuzz";
- version = "0.2.10";
+ version = "0.3.5";
src = fetchFromGitHub {
owner = "lepisma";
repo = "cricbuzz.el";
- rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69";
- sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3";
+ rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889";
+ sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip";
name = "cricbuzz";
};
- packageRequires = [ dash enlive s ];
+ packageRequires = [ dash enlive f s ];
meta = {
homepage = "https://melpa.org/#/cricbuzz";
license = lib.licenses.free;
@@ -6203,6 +6329,27 @@
license = lib.licenses.free;
};
}) {};
+ crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "crystal-mode";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "crystal-lang-tools";
+ repo = "emacs-crystal-mode";
+ rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
+ sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
+ sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk";
+ name = "crystal-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/crystal-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "csharp-mode";
@@ -6227,12 +6374,12 @@
csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
melpaBuild {
pname = "csound-mode";
- version = "0.1.2";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "hlolli";
repo = "csound-mode";
- rev = "877c7c9d5bdc6a2acf4ac1a10e9e24ba1bd3cc76";
- sha256 = "1vsngs42n8xp72701ppvmwyy6b90vnj39fq12yvp7x9zqf29lmq1";
+ rev = "5a892e6ad72e7844e8e14c0da04fcb6bc125fe5e";
+ sha256 = "1gzg2r7agllz2asp7dbxykydpnw3861whs2pfhr3fwwb39xf1pva";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
@@ -6350,6 +6497,27 @@
license = lib.licenses.free;
};
}) {};
+ cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cubicle-mode";
+ version = "1.1.2";
+ src = fetchFromGitHub {
+ owner = "cubicle-model-checker";
+ repo = "cubicle";
+ rev = "b043b0247bf9b144a5c3360e5096a4b141dd1fb6";
+ sha256 = "0zsfz1h68xpbgdb1ln8l081vwrgd7i01ap4rjlyrsk8j3q3ry5wz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode";
+ sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv";
+ name = "cubicle-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/cubicle-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cuda-mode";
@@ -6374,12 +6542,12 @@
cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "cwl-mode";
- version = "0.2.4";
+ version = "0.2.5";
src = fetchFromGitHub {
owner = "tom-tan";
repo = "cwl-mode";
- rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
- sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
+ rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7";
+ sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
@@ -6500,12 +6668,12 @@
dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "dante";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitHub {
owner = "jyp";
repo = "dante";
- rev = "6b260611dc08468fca9b9af132a00783dd2cf8d9";
- sha256 = "0s5wi010sn3ng9fr7fqbc11kmjqirr28wya3rnnzzb3m5gyxs8id";
+ rev = "1a25bf26ee8d9878ce858cfaff84b083339056d6";
+ sha256 = "0kvsx9n8qm9s2w9bz167jzcb1b3d4fgc807w1miwil9dcyar6rkk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -6560,22 +6728,22 @@
license = lib.licenses.free;
};
}) {};
- dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
melpaBuild {
pname = "dart-mode";
- version = "0.15";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "nex3";
repo = "dart-mode";
- rev = "e6635b390235cf16a8081763768cf925ca2d9133";
- sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx";
+ rev = "f3a7c7b71fb12d02fa02700bc10426cb10010d01";
+ sha256 = "1g0c37qfqki7v1a5rxf6sy7k07i529rw3f1wmjl7g1zhd9bwsml2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla";
name = "dart-mode";
};
- packageRequires = [ cl-lib dash flycheck ];
+ packageRequires = [ cl-lib dash emacs flycheck s ];
meta = {
homepage = "https://melpa.org/#/dart-mode";
license = lib.licenses.free;
@@ -6686,22 +6854,22 @@
license = lib.licenses.free;
};
}) {};
- datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "datetime";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "doublep";
repo = "datetime";
- rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71";
- sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5";
+ rev = "2a92d80cdc7febf620cd184cf1204a68985d0e8b";
+ sha256 = "0lzdgnmvkvap5j8hvn6pidfnc2ax317sj5r6b2nahllhh53mlr4j";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
- sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime";
+ sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj";
name = "datetime";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs extmap ];
meta = {
homepage = "https://melpa.org/#/datetime";
license = lib.licenses.free;
@@ -6836,12 +7004,12 @@
deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "deft";
- version = "0.7";
+ version = "0.8";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "deft";
- rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40";
- sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n";
+ rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4";
+ sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
@@ -6980,6 +7148,27 @@
license = lib.licenses.free;
};
}) {};
+ difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "difflib";
+ version = "0.3.8";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "difflib.el";
+ rev = "b08850251812d71e62fd6956081299590acdf37b";
+ sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib";
+ sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6";
+ name = "difflib";
+ };
+ packageRequires = [ cl-generic emacs ht s ];
+ meta = {
+ homepage = "https://melpa.org/#/difflib";
+ license = lib.licenses.free;
+ };
+ }) {};
diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diffview";
@@ -7085,6 +7274,27 @@
license = lib.licenses.free;
};
}) {};
+ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dimmer";
+ version = "0.3.0";
+ src = fetchFromGitHub {
+ owner = "gonewest818";
+ repo = "dimmer.el";
+ rev = "12fc52a6570ec25020281735f5a0ca780a9105af";
+ sha256 = "1jv9rrv15nb5hpwcaqlpjj932gyisrkwbv11czkg3v0bn7qn6yif";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer";
+ sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r";
+ name = "dimmer";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dimmer";
+ license = lib.licenses.free;
+ };
+ }) {};
dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "dionysos";
@@ -7361,12 +7571,12 @@
direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "direnv";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "wbolster";
repo = "emacs-direnv";
- rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa";
- sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867";
+ rev = "5b55dac12467689083ff995777f54a304ff47be1";
+ sha256 = "0sjrnab8rx1bpnxim268b8jfpyh8h0iy3j38925r0jqjgjb19ksn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -7570,12 +7780,12 @@
docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
melpaBuild {
pname = "docker";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
- rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c";
- sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz";
+ rev = "9ffeff244318ed119279d0a44784b7f690d1393d";
+ sha256 = "13c7x9pf6690w8l1jqnjf0bi9np9ndzmw1n6imy9cks8bpqbkdyd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -7704,12 +7914,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "1.2.5";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-themes";
- rev = "d04875c9c7ce21d5f51dfc541a5d03efddac7728";
- sha256 = "0lfldrsfldrnw9g59dnsmyyp7j3v3kqv0d39h4kzs9dhm5v9dpbr";
+ rev = "98120f9b362b53983e932f126cf92848297b745a";
+ sha256 = "03pnnbqa09iqyypgbgwlkxr6w1j46rla6pivbq7fy366yk2x03x0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -7722,6 +7932,27 @@
license = lib.licenses.free;
};
}) {};
+ dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dotenv-mode";
+ version = "0.2.4";
+ src = fetchFromGitHub {
+ owner = "preetpalS";
+ repo = "emacs-dotenv-mode";
+ rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea";
+ sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode";
+ sha256 = "1lwfzfri6vywcjkc9wassrz0rdrg0kvljxsm6b4smlnphp6pdbbs";
+ name = "dotenv-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dotenv-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "downplay-mode";
@@ -7872,12 +8103,12 @@
dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dtrt-indent";
- version = "0.3";
+ version = "0.6";
src = fetchFromGitHub {
owner = "jscheid";
repo = "dtrt-indent";
- rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c";
- sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq";
+ rev = "3ea5136bde1240f93fbf3ce30fffc4f279a58d27";
+ sha256 = "0lkc8y09lhlpg7vrn2459c5fxn0nvxbzqhwadmkgc046i3aapqpg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@@ -7938,8 +8169,8 @@
version = "0.7";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "9e446540a794";
- sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi";
+ rev = "87db00b912be";
+ sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -8123,12 +8354,12 @@
eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "eacl";
- version = "1.0.3";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "eacl";
- rev = "ef58d13fbff4b5c49f934cfb9e3fd6ee219ef4b2";
- sha256 = "0xxxzdr6iddxwx8z4lfay4n9r1ry8571lj2gadz5ycff6f6bxmhb";
+ rev = "ec601f3a8da331dd0a9e7a93d40ae3925bd06700";
+ sha256 = "1kgayh2q97rxzds5ba1zc9ah08kbah9lqbwhmb7pxxgvgx9yfagg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
@@ -8144,12 +8375,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "2.0.16";
+ version = "2.8.21";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
- sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
+ rev = "61a504616705feae8c3fd8b01bf315e2cb89f699";
+ sha256 = "1lr2hbz4gxcn2r5m3hx4izk8aawgy0fls0isp6cvcgs1s54s2kxi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -8162,6 +8393,27 @@
license = lib.licenses.free;
};
}) {};
+ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "easy-jekyll";
+ version = "1.5.12";
+ src = fetchFromGitHub {
+ owner = "masasam";
+ repo = "emacs-easy-jekyll";
+ rev = "9a66d5c5dddac7d5b924df0c3bb414d3f797d8a5";
+ sha256 = "0qx6lgpg2szjgy1a3a856klm7vh544braq8v2s7f81lq0ks2bjhj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
+ sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv";
+ name = "easy-jekyll";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/easy-jekyll";
+ license = lib.licenses.free;
+ };
+ }) {};
easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-kill";
@@ -8270,12 +8522,12 @@
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
melpaBuild {
pname = "ebib";
- version = "2.11.6";
+ version = "2.11.8";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "ebib";
- rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6";
- sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20";
+ rev = "fb43f9354f9f9c4c65091ae15732b1d941475186";
+ sha256 = "16l6l2qpkq10wkd95vbch2f7qcsb0jw4rjdf0gck2q8si8i2xi9h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -8312,12 +8564,12 @@
ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ecukes";
- version = "0.6.16";
+ version = "0.6.17";
src = fetchFromGitHub {
owner = "ecukes";
repo = "ecukes";
- rev = "c8092db08be5337ff3f3dd2857bfa94e360945d2";
- sha256 = "1dkinyigacb4yxqikd9za4inbh7yz7pl8bhrpihrxzabxirmvw55";
+ rev = "3a77ba9f1064c2bca47b401974c009e65727c46e";
+ sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -8480,12 +8732,12 @@
edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "edit-server";
- version = "1.13";
+ version = "1.15";
src = fetchFromGitHub {
owner = "stsquad";
repo = "emacs_chrome";
- rev = "f0db18f0d6e9885e4aef3ace8342fd6f635fadf6";
- sha256 = "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn";
+ rev = "4e959de2f78268b348d2eaac4e43c846792d345f";
+ sha256 = "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server";
@@ -8627,12 +8879,12 @@
egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "egison-mode";
- version = "3.7.0";
+ version = "3.7.10";
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "accb84375895946f0d0bed3917e0193074bd4131";
- sha256 = "0adxbjbmph186amkyhyl9syypfawarxmyk80zz4c0b6bgxy15rc1";
+ rev = "b7c073e0a29c9632d82b501849e270d62304e22f";
+ sha256 = "13p6nfsjnbhw0cgy1s28ww9dk4hmwmanf2j6ydhcafvbynp964zs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -8649,13 +8901,13 @@
pname = "eide";
version = "2.1.2";
src = fetchgit {
- url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
+ url = "https://git.tuxfamily.org/eide/emacs-ide.git";
rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3";
sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
- sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide";
+ sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni";
name = "eide";
};
packageRequires = [];
@@ -8842,22 +9094,22 @@
license = lib.licenses.free;
};
}) {};
- el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }:
+ el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-spice";
- version = "0.2.2";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "vedang";
repo = "el-spice";
- rev = "53921ffe9a84d9395eea90709309d3d5529921ea";
- sha256 = "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i";
+ rev = "972dace20ec61cd27b9322432d0c7a688c6f061a";
+ sha256 = "1wrb46y4s4v0lwwyriz2qn1j1l804jyb4dmadf462jxln85rml70";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice";
sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
name = "el-spice";
};
- packageRequires = [ thingatpt-plus ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/el-spice";
license = lib.licenses.free;
@@ -8905,6 +9157,27 @@
license = lib.licenses.free;
};
}) {};
+ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "elbank";
+ version = "1.2";
+ src = fetchFromGitHub {
+ owner = "NicolasPetton";
+ repo = "Elbank";
+ rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5";
+ sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank";
+ sha256 = "1ry84aiajyrnrspf7w4yjm0rmdam8ijrz0s7291yr8c70hslc997";
+ name = "elbank";
+ };
+ packageRequires = [ emacs seq ];
+ meta = {
+ homepage = "https://melpa.org/#/elbank";
+ license = lib.licenses.free;
+ };
+ }) {};
eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eldoc-eval";
@@ -8971,12 +9244,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "79077efc34aad25bb43cf46a28a69a308196c972";
- sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
+ rev = "00b25d974abc4f3e61676068397758035bfdfc30";
+ sha256 = "0qivqhz2mhjyqrqkfjrv8q6387cbzwvmyay2jbws5vibwbxjciwz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -8989,15 +9262,36 @@
license = lib.licenses.free;
};
}) {};
+ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "elfeed-protocol";
+ version = "0.5.2";
+ src = fetchFromGitHub {
+ owner = "fasheng";
+ repo = "elfeed-protocol";
+ rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b";
+ sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
+ sha256 = "1gd2ny764qsnnqf3j7rbdqhh7hqd5c0fzwxx6wacd0dpbq4w56qi";
+ name = "elfeed-protocol";
+ };
+ packageRequires = [ cl-lib elfeed emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/elfeed-protocol";
+ license = lib.licenses.free;
+ };
+ }) {};
elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
melpaBuild {
pname = "elfeed-web";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "79077efc34aad25bb43cf46a28a69a308196c972";
- sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
+ rev = "00b25d974abc4f3e61676068397758035bfdfc30";
+ sha256 = "0qivqhz2mhjyqrqkfjrv8q6387cbzwvmyay2jbws5vibwbxjciwz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -9010,6 +9304,27 @@
license = lib.licenses.free;
};
}) {};
+ elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "elisp-lint";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "gonewest818";
+ repo = "elisp-lint";
+ rev = "9d894e99377859171ee54cb7d2b2e7f2cc7c267c";
+ sha256 = "11pvqskjhxxsyxmy8wllqwa0qg0j9280h0m5rzjghgsdcnlisyvq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint";
+ sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63";
+ name = "elisp-lint";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/elisp-lint";
+ license = lib.licenses.free;
+ };
+ }) {};
elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "elisp-refs";
@@ -9202,12 +9517,12 @@
elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elpa-mirror";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "elpa-mirror";
- rev = "9cf096448b69c795b20aab89557e9add6029b13c";
- sha256 = "05la1v1p7wyrjflh8lv3pwr7ywm2rvvzhh8phr24w31jfs2kp4gf";
+ rev = "83a38b5721c459d311833522903de96f874e1a4e";
+ sha256 = "0j2nk1nhbihfqajkmzp3501mhv5617qhb7qbj46qz8azs8a1dvri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -9220,15 +9535,15 @@
license = lib.licenses.free;
};
}) {};
- elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
+ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "1.17.0";
+ version = "1.18.0";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "99f0b6401bff25d40b9f58123533271f7870a286";
- sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j";
+ rev = "30cb5e3c344edef572b6cffac94c6ff80bf6595f";
+ sha256 = "17iwdaly9kw17ih86rk9w1iswn8r6vvj9sh71picsxg6gqdrqnrk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -9237,6 +9552,7 @@
};
packageRequires = [
company
+ emacs
find-file-in-project
highlight-indentation
pyvenv
@@ -9314,12 +9630,12 @@
elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elx";
- version = "1.1.1";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "elx";
- rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5";
- sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh";
+ rev = "9f32e91ebbaebd7f1125107dce2aa979827b26c0";
+ sha256 = "1hc4jw2fy25ri2hh3xw7sp67yfl2jvrgj1a25xa6svchjq3h1yf2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
@@ -9395,85 +9711,85 @@
license = lib.licenses.free;
};
}) {};
- emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
+ emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
melpaBuild {
pname = "emacsql";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
- sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+ rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
+ sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
name = "emacsql";
};
- packageRequires = [ cl-lib emacs finalize ];
+ packageRequires = [ cl-generic cl-lib emacs finalize ];
meta = {
homepage = "https://melpa.org/#/emacsql";
license = lib.licenses.free;
};
}) {};
- emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-mysql";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
- sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+ rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
+ sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
name = "emacsql-mysql";
};
- packageRequires = [ cl-lib emacs emacsql ];
+ packageRequires = [ cl-generic cl-lib emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-mysql";
license = lib.licenses.free;
};
}) {};
- emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
+ emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
melpaBuild {
pname = "emacsql-psql";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
- sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+ rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
+ sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
name = "emacsql-psql";
};
- packageRequires = [ cl-lib emacs emacsql pg ];
+ packageRequires = [ cl-generic cl-lib emacs emacsql pg ];
meta = {
homepage = "https://melpa.org/#/emacsql-psql";
license = lib.licenses.free;
};
}) {};
- emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-sqlite";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
- sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+ rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
+ sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite";
- sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite";
+ sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x";
name = "emacsql-sqlite";
};
- packageRequires = [ cl-lib emacs emacsql ];
+ packageRequires = [ cl-generic cl-lib emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-sqlite";
license = lib.licenses.free;
@@ -9607,12 +9923,12 @@
emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-player-mpv";
- version = "0.0.12";
+ version = "0.0.13";
src = fetchFromGitHub {
owner = "dochang";
repo = "emms-player-mpv";
- rev = "8c72282c98f9b10601e9a6901277040cda4b33aa";
- sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6";
+ rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7";
+ sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv";
@@ -9848,12 +10164,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "34c7719c9739d1e5d55c3f776e8f32a417b4eea6";
- sha256 = "1dpj31krw0vwrb1pimpbpdm3k2ivqmr6kbgaw8p2dwwwqk1s6nbg";
+ rev = "3d3ab18436ad6089496b3bce1d49c64a86965431";
+ sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -9940,12 +10256,12 @@
epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epl";
- version = "0.8";
+ version = "0.9";
src = fetchFromGitHub {
owner = "cask";
repo = "epl";
- rev = "a76ec344a7fee3ca7e7dfb98b86ebc3b8c1a3837";
- sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr";
+ rev = "fd906d3f92d58ecf24169055744409886ceb06ce";
+ sha256 = "0d3z5z90ln8ipk1yds1n1p8fj9yyh2kpspqjs7agl38indra3nb4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl";
@@ -10170,12 +10486,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20.1.5";
+ version = "20.2.4";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "84f29ab803e8f36ef058a47f4c2b224f4dd58220";
- sha256 = "02y02m5cv29nr6icih7f5772657swnwan279scgcw02wm9lnm0vh";
+ rev = "13c6a4bf01d39a5002e09ef1f82619cde9f2c90c";
+ sha256 = "1j8fqzaw36j8naafrrq1s329jlvlb06ra1f03hl76xr0bbxm44ks";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -10334,6 +10650,27 @@
license = lib.licenses.free;
};
}) {};
+ esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "esh-autosuggest";
+ version = "2.0.0";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "esh-autosuggest";
+ rev = "a8a9381e76ea2e0d934bc70caa47f23209bcc155";
+ sha256 = "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest";
+ sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx";
+ name = "esh-autosuggest";
+ };
+ packageRequires = [ company emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/esh-autosuggest";
+ license = lib.licenses.free;
+ };
+ }) {};
esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esh-help";
@@ -10652,12 +10989,12 @@
esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esxml";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchFromGitHub {
owner = "tali713";
repo = "esxml";
- rev = "08fcc5d76abb90c194e181f267cf1d2a149b7a7c";
- sha256 = "034lxfqn5yh78hz7i568vw8kyv3hlb699z2d1dffjiigc1lblgip";
+ rev = "5548ceba17deae0c3c6d0092672edc4de3c75ce3";
+ sha256 = "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml";
@@ -10670,6 +11007,27 @@
license = lib.licenses.free;
};
}) {};
+ eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
+ melpaBuild {
+ pname = "eterm-256color";
+ version = "0.3.12";
+ src = fetchFromGitHub {
+ owner = "dieggsy";
+ repo = "eterm-256color";
+ rev = "89b20de890bc890331abe2d5e27a7e3129cde7b8";
+ sha256 = "1bh0wqz2wkp8i1g8r8wgqzny0f5igflca5hkwq9p8ql84jkwlm69";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color";
+ sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b";
+ name = "eterm-256color";
+ };
+ packageRequires = [ emacs f xterm-color ];
+ meta = {
+ homepage = "https://melpa.org/#/eterm-256color";
+ license = lib.licenses.free;
+ };
+ }) {};
ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ethan-wspace";
@@ -11009,12 +11367,12 @@
evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
- version = "2.2.3";
+ version = "2.2.6";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
- rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b";
- sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp";
+ rev = "50bb88241983f0bf06d35a455a87c04eddc11c83";
+ sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -11072,12 +11430,12 @@
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-nerd-commenter";
- version = "3.1.2";
+ version = "3.1.3";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-nerd-commenter";
- rev = "76fd0c5692e9852a2d6fc6c0ce0e782792c28ddd";
- sha256 = "1bydqdk52q8777m234jxp03y2zz23204r1fyq39ks9h9bpglc561";
+ rev = "41d43709210711c07de69497c5f7db646b7e7a96";
+ sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -11174,6 +11532,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-replace-with-char";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "ninrod";
+ repo = "evil-replace-with-char";
+ rev = "dddbbafdd620cc48dd0a257baf4010e1b415ebe8";
+ sha256 = "0gcmva2q1bxqp3p8cl1nf19kh4nkgfdm64havyzhnkwq18q84pxi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char";
+ sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r";
+ name = "evil-replace-with-char";
+ };
+ packageRequires = [ emacs evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-replace-with-char";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-rsi";
@@ -11279,15 +11658,36 @@
license = lib.licenses.free;
};
}) {};
+ evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }:
+ melpaBuild {
+ pname = "evil-string-inflection";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "ninrod";
+ repo = "evil-string-inflection";
+ rev = "f6a3eca0f0fa8e56e6938e1dd48537eef1fae05f";
+ sha256 = "1akk0yylwcw4f91hprrrsijhbdcmrx1nnpgfyzpl4k5d4b30y8d5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection";
+ sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh";
+ name = "evil-string-inflection";
+ };
+ packageRequires = [ emacs evil string-inflection ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-string-inflection";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-surround";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-surround";
- rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839";
- sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031";
+ rev = "f6162a7b5a65a297c8ebb8a81ce6e1278f958bbc";
+ sha256 = "0kqkji4yn4khfrgghwkzgbh687fs3p07lj61x4i7w1ay1416lvn9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
@@ -11300,6 +11700,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-swap-keys";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "wbolster";
+ repo = "evil-swap-keys";
+ rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a";
+ sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys";
+ sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6";
+ name = "evil-swap-keys";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-swap-keys";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-test-helpers";
@@ -11489,6 +11910,27 @@
license = lib.licenses.free;
};
}) {};
+ exato = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }:
+ melpaBuild {
+ pname = "exato";
+ version = "0.0.5";
+ src = fetchFromGitHub {
+ owner = "ninrod";
+ repo = "exato";
+ rev = "ba21cd2c8d0588e1c70ba89ebad6df247605e03f";
+ sha256 = "12xqysbdnkvz220qf0jz2v40809hcmdmga10ac74yhg00h25nll6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato";
+ sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn";
+ name = "exato";
+ };
+ packageRequires = [ evil thingatpt-plus ];
+ meta = {
+ homepage = "https://melpa.org/#/exato";
+ license = lib.licenses.free;
+ };
+ }) {};
exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "exec-path-from-shell";
@@ -11614,6 +12056,27 @@
license = lib.licenses.free;
};
}) {};
+ extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "extmap";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "doublep";
+ repo = "extmap";
+ rev = "3860b69fb19c962425d4e271ee0a24547b67d323";
+ sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap";
+ sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j";
+ name = "extmap";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/extmap";
+ license = lib.licenses.free;
+ };
+ }) {};
exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
@@ -11638,12 +12101,12 @@
eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eyebrowse";
- version = "0.7.5";
+ version = "0.7.7";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "eyebrowse";
- rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20";
- sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn";
+ rev = "7294ed5fbf5f38407b599a10a335b8c4ec15a8d5";
+ sha256 = "1lhpf88042mg9q328w2d328ka9pild4ppdynbn3rsib9zgxp8waq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -11680,12 +12143,12 @@
f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "f";
- version = "0.19.0";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "rejeep";
repo = "f.el";
- rev = "541cb518afa5010029492847292c248f88b3ea42";
- sha256 = "1j6gc2pp5w3iwyjm4h3d0ahzs0ac3pah8lzfhpg4nkibl0nc1bcg";
+ rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48";
+ sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f";
@@ -11698,6 +12161,27 @@
license = lib.licenses.free;
};
}) {};
+ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "f3";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "cosmicexplorer";
+ repo = "f3";
+ rev = "19120dda2d760d3dd6c6aa620121d1de0a40932d";
+ sha256 = "1qg48zbjdjqimw4516ymrsilz41zkib9321q0caf9474s9xyp2bi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3";
+ sha256 = "099wibgp9k6sgglaqigic5ay6qg7aqijnis5crwjl7b81ddqp610";
+ name = "f3";
+ };
+ packageRequires = [ cl-lib emacs helm ];
+ meta = {
+ homepage = "https://melpa.org/#/f3";
+ license = lib.licenses.free;
+ };
+ }) {};
fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fabric";
@@ -11827,16 +12311,16 @@
faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faust-mode";
- version = "0.3";
+ version = "0.6";
src = fetchFromGitHub {
- owner = "magnetophon";
+ owner = "rukano";
repo = "emacs-faust-mode";
- rev = "5e7390479d6f4c12186b39fd5c642050e1c62e40";
- sha256 = "1g3xzzcnswh03plmrhcn6ib68kcx5b37af3lqfbfa6s0rwwldxap";
+ rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c";
+ sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode";
- sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode";
+ sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z";
name = "faust-mode";
};
packageRequires = [];
@@ -11848,15 +12332,15 @@
faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faustine";
- version = "0.3";
+ version = "0.4";
src = fetchgit {
- url = "https://bitbucket.org/yassinphilip/faustine";
- rev = "43cf31284eabf0d831f8185a5ed217e56fdc2023";
- sha256 = "1v78raszh8scac5m04g10rrc9cdflhgmkpbbqpf28zxk3dxcjpxm";
+ url = "https://bitbucket.org/yphil/faustine";
+ rev = "f186461e2bc38ec8ae38bd5ab727cc769218a168";
+ sha256 = "16p7qmljjki4svci3mxzydmvpxaprbnfq6794b3adyyixkmgr6k7";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine";
- sha256 = "0pkjxfzgdhkjjx38d1c2kw8m5cw5ryhfj7lykpym79wsa471hf9s";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine";
+ sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s";
name = "faustine";
};
packageRequires = [ emacs faust-mode ];
@@ -11910,12 +12394,12 @@
fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fill-column-indicator";
- version = "1.89";
+ version = "1.90";
src = fetchFromGitHub {
owner = "alpaker";
repo = "Fill-Column-Indicator";
- rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779";
- sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y";
+ rev = "f7b3f99b41ff017f50a21ad53eed16f8ef5ab7ee";
+ sha256 = "0snjznxdwwfdgccdcvrnk467416r244r2r5qcm2sga8l0ha9gw9z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@@ -11973,12 +12457,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "5.4.3";
+ version = "5.5.2";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663";
- sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v";
+ rev = "aba912a73d1f3fcff0d184b49008a2fa1655ad7e";
+ sha256 = "145n04lid9alrm8nl6gfnll75jz1ssli48pbsc9zyva00ryk83my";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -12099,12 +12583,12 @@
fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fish-mode";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "wwwjfy";
repo = "emacs-fish";
- rev = "22aabbccd564883684f6d224b8e0a512f334be41";
- sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
+ rev = "cd0387f7f1d5c50e080091f86ca97d8a67d603a6";
+ sha256 = "0q4cq1rkiz5mjxhp7p5awmw59q1yjb2sryc9i54cwhr5dwwqf95k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode";
@@ -12271,27 +12755,48 @@
license = lib.licenses.free;
};
}) {};
- flow-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flow-minor-mode";
- version = "0.1";
+ version = "0.3";
src = fetchFromGitHub {
owner = "an-sh";
repo = "flow-minor-mode";
- rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458";
- sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp";
+ rev = "50dded94ad201fdc9453656a8b15179981cd5acd";
+ sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s";
name = "flow-minor-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/flow-minor-mode";
license = lib.licenses.free;
};
}) {};
+ flower = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flower";
+ version = "0.3.6";
+ src = fetchFromGitHub {
+ owner = "PositiveTechnologies";
+ repo = "flower";
+ rev = "2c89a7b0bc9d7b2e95d98e159a059d41ae43933f";
+ sha256 = "1ilj0wa53qs8863d7ri9k8m57jd4n2zm3ijs3s2i7fn8a3svmmhy";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower";
+ sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd";
+ name = "flower";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/flower";
+ license = lib.licenses.free;
+ };
+ }) {};
flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flx";
@@ -12481,22 +12986,43 @@
license = lib.licenses.free;
};
}) {};
- flycheck-dmd-dub = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-crystal";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "crystal-lang-tools";
+ repo = "emacs-crystal-mode";
+ rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
+ sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal";
+ sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn";
+ name = "flycheck-crystal";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-crystal";
+ license = lib.licenses.free;
+ };
+ }) {};
+ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dmd-dub";
- version = "0.9";
+ version = "0.12";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "flycheck-dmd-dub";
- rev = "e8744adaba010415055ac15c702f780dd6e13e14";
- sha256 = "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh";
+ rev = "41a839e18eb7159175c59a2f8b2f5f283191e33f";
+ sha256 = "0a78np6nb9ciz440n9ks6kybwggkq99knzv7swbmvngvhg96khbx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
name = "flycheck-dmd-dub";
};
- packageRequires = [ flycheck ];
+ packageRequires = [ f flycheck ];
meta = {
homepage = "https://melpa.org/#/flycheck-dmd-dub";
license = lib.licenses.free;
@@ -12691,6 +13217,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-mmark";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "mmark-md";
+ repo = "flycheck-mmark";
+ rev = "b73b40cb9c5cf6bc6fa501aa87a4c30b210c0c5f";
+ sha256 = "1w75accl67i0qwadwp7dgpxaj0i8zwckvv5isyn93vknzw5dz66x";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2fd10423ab80e32245bb494005c8f87a8987fffb/recipes/flycheck-mmark";
+ sha256 = "0lnw7pz40hijcpi9b92vjxvvyh9v50ww2f2r8z9pyhl9mjy2245x";
+ name = "flycheck-mmark";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-mmark";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }:
melpaBuild {
pname = "flycheck-nimsuggest";
@@ -12715,12 +13262,12 @@
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
- rev = "29a9eb320d62400564360986f7ad400b74070d8e";
- sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022";
+ rev = "07f17d1dbe878fdcabac791a8916ddf643571a68";
+ sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -12841,12 +13388,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pycheckers";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "msherry";
repo = "flycheck-pycheckers";
- rev = "a3d39139dbe5cdaa64dda90907bb8653f196c71e";
- sha256 = "1i1kliy0n9b7b0rby419030n35f59xb8952widaszz4z8qb7xw9k";
+ rev = "6f7c6d7db4d3209897c4b15511bfaed4562ac5e4";
+ sha256 = "0mg2165zsrkn8w7anjyrfgkr66ynhm1fv43f5p8wg6g0afss9763";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -12883,12 +13430,12 @@
flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
melpaBuild {
pname = "flycheck-rtags";
- version = "2.15";
+ version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
- sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
+ rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
+ sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -12946,12 +13493,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
- rev = "756833425f51baa9eb0a2fa7493df6e68612c88d";
- sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi";
+ rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d";
+ sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -13762,15 +14309,36 @@
license = lib.licenses.free;
};
}) {};
+ fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "fortune-cookie";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "andschwa";
+ repo = "fortune-cookie";
+ rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6";
+ sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie";
+ sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78";
+ name = "fortune-cookie";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/fortune-cookie";
+ license = lib.licenses.free;
+ };
+ }) {};
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
- version = "2.3.0";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
- rev = "37289bb68f01dd49b1192032ade6b0741d024a54";
- sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5";
+ rev = "ee20f7a3bcb86b661a38480acf853c1da2db6d26";
+ sha256 = "0y7ji7p3blgzbwsz434346g835hzjs896hd7jli1ig0b9b0l43my";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -13983,12 +14551,12 @@
futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "futhark-mode";
- version = "0.1.0";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "2a7d824f7265a35bb928bf4de8e46d02e0a56a12";
- sha256 = "0dkx9xl39k0bcspyx37410rb5ngphw9svinwjw1kgq0pqhc2qxdf";
+ rev = "631c493b97b3e2f928892fb25fa29daca4927f83";
+ sha256 = "1a6qr5r62q84m1jcs1xj36p7jr9c042gh38lb7cmfcxf2x693h68";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -14046,12 +14614,12 @@
fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fwb-cmds";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "tarsius";
repo = "fwb-cmds";
- rev = "57973f99cf4a185b5cccbf941478fad25e8428c3";
- sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b";
+ rev = "7d4abf8aa13b2235e4e2f0bb9049ebd6b491f710";
+ sha256 = "10xjs8gm9l3riffxip1ffg8xhcf8srffh01yn6ifyln5f70b063d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds";
@@ -14109,12 +14677,12 @@
gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gams-mode";
- version = "6.2";
+ version = "6.3";
src = fetchFromGitHub {
owner = "ShiroTakeda";
repo = "gams-mode";
- rev = "ce51aa1afec78bf96aedb4badf33463383b7593e";
- sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5";
+ rev = "900e1788695d91dde2a3d7fee97681a3380285de";
+ sha256 = "1lix0x2gj6lrcx6imr5w3scyix99526fwpx0vzs1dzxfzglscjja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode";
@@ -14382,16 +14950,16 @@
ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ghub";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "magit";
repo = "ghub";
- rev = "da60fa2316bf829cab18676afd5a43088ac06b60";
- sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs";
+ rev = "d8ec78184ec82d363fb0ac5bab724f390ee71d3d";
+ sha256 = "194nf5kjkxgxqjmxlr9q6r4p9kxcsm9qx8pcagxbhvmfyh6km71h";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
- sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub";
+ sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps";
name = "ghub";
};
packageRequires = [ emacs ];
@@ -14403,12 +14971,12 @@
ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
melpaBuild {
pname = "ghub-plus";
- version = "0.2";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "ghub-plus";
- rev = "e04050f81106029c342deb7adbfc67b2a888ec58";
- sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6";
+ rev = "8cfdaf42446a68e6aa4eb0655d43563407cb5636";
+ sha256 = "0acfqf1219bnzyf64sv68fvpi4a13nc0wv8dz5a8h6r1j0ysx6qj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -14484,6 +15052,27 @@
license = lib.licenses.free;
};
}) {};
+ git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "git-attr";
+ version = "0.0.3";
+ src = fetchFromGitHub {
+ owner = "arnested";
+ repo = "emacs-git-attr";
+ rev = "c03078637a00ea301cbcc7ae301ae928b10af889";
+ sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr";
+ sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi";
+ name = "git-attr";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/git-attr";
+ license = lib.licenses.free;
+ };
+ }) {};
git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-auto-commit-mode";
@@ -14736,22 +15325,22 @@
license = lib.licenses.free;
};
}) {};
- git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-timemachine";
- version = "3.0";
+ version = "4.4";
src = fetchFromGitHub {
owner = "pidu";
repo = "git-timemachine";
- rev = "7c66a878ee89861dcd59b5dfc598520daa156052";
- sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
+ rev = "020d02cd77df6bf6f0efd4d4c597aad2083b6302";
+ sha256 = "1g7gxa2snh8ya8r3wim834qszhcmpp154gnvqkc3b1gw8x7jdrql";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
name = "git-timemachine";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/git-timemachine";
license = lib.licenses.free;
@@ -15051,27 +15640,6 @@
license = lib.licenses.free;
};
}) {};
- glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "glab";
- version = "1.1.1";
- src = fetchFromGitLab {
- owner = "tarsius";
- repo = "glab";
- rev = "5ced0214622450930bcea105b9aac785c594609d";
- sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab";
- sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di";
- name = "glab";
- };
- packageRequires = [ emacs ];
- meta = {
- homepage = "https://melpa.org/#/glab";
- license = lib.licenses.free;
- };
- }) {};
gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }:
melpaBuild {
pname = "gmail-message-mode";
@@ -15282,6 +15850,27 @@
license = lib.licenses.free;
};
}) {};
+ go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-dlv";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "benma";
+ repo = "go-dlv.el";
+ rev = "45a9e8a047c9995eb7c802268d96b3e527569f41";
+ sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv";
+ sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8";
+ name = "go-dlv";
+ };
+ packageRequires = [ go-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/go-dlv";
+ license = lib.licenses.free;
+ };
+ }) {};
go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-eldoc";
@@ -15324,6 +15913,27 @@
license = lib.licenses.free;
};
}) {};
+ go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-fill-struct";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "s-kostyaev";
+ repo = "go-fill-struct";
+ rev = "3c97c92e78f3629a7a1069404c7c641881c16d0e";
+ sha256 = "0ara9qqv31pr7dpcby6xp24llf79m0dmwrx4yv6w0bhxi197fmlx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct";
+ sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7";
+ name = "go-fill-struct";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/go-fill-struct";
+ license = lib.licenses.free;
+ };
+ }) {};
go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-guru";
@@ -15450,6 +16060,27 @@
license = lib.licenses.free;
};
}) {};
+ go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-tag";
+ version = "1.0.1";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "emacs-go-tag";
+ rev = "a239f58bbef2629086d9e2cf90a64ba3d389a8a3";
+ sha256 = "1w1m05ypl94xn2qvypbgvjhq7gysi13g42pqwlmppgsdh1kphwha";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag";
+ sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f";
+ name = "go-tag";
+ };
+ packageRequires = [ emacs go-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/go-tag";
+ license = lib.licenses.free;
+ };
+ }) {};
godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "godoctor";
@@ -15621,12 +16252,12 @@
goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "goto-chg";
- version = "1.7";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "goto-chg";
- rev = "171b1331022caf12d8c3593e9b5075f87ee958d4";
- sha256 = "1jcnrin4j1x8p63fd9r37dq1vr5a7a1nvzk6kp0bdsgn9vbjmapc";
+ rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4";
+ sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg";
@@ -15726,12 +16357,12 @@
grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grab-x-link";
- version = "0.4.1";
+ version = "0.5";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "grab-x-link";
- rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76";
- sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1";
+ rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c";
+ sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link";
@@ -15789,12 +16420,12 @@
grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grails-mode";
- version = "1.0.2";
+ version = "2.0";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555";
- sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9";
+ rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24";
+ sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -15831,12 +16462,12 @@
grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grandshell-theme";
- version = "1.1";
+ version = "1.3";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "grandshell-theme";
- rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d";
- sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7";
+ rev = "22c8df52c0fb8899fa748fa2980947ab38b53380";
+ sha256 = "08556ci80iycm4qkvbnrci55wyv91b4fh6sjp0im0ywndmrq3yyc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
@@ -15852,12 +16483,12 @@
graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
melpaBuild {
pname = "graphene";
- version = "0.9.8";
+ version = "0.9.9";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene";
- rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe";
- sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz";
+ rev = "9dbd50e532ca45076e03db0f96a57d21528fc460";
+ sha256 = "0sqxnjmfbr0plahdmp87j8xpl3qkyimf9vkqall4ccljx8irdl6s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -15968,12 +16599,12 @@
green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-is-the-new-black-theme";
- version = "0.0.3";
+ version = "0.0.4";
src = fetchFromGitHub {
owner = "fredcamps";
repo = "green-is-the-new-black-emacs";
- rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122";
- sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka";
+ rev = "374d14b99f4959fa039c0e1ce8e0e7991b726d98";
+ sha256 = "135w5vwbk2468b82v6icc8nh50d9flpi7zd63xch8vpvsri0vpw0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
@@ -15989,12 +16620,12 @@
green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-screen-theme";
- version = "1.0.0.1";
+ version = "1.0.24";
src = fetchFromGitHub {
owner = "rbanffy";
repo = "green-screen-emacs";
- rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e";
- sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn";
+ rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0";
+ sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
@@ -16068,22 +16699,22 @@
license = lib.licenses.free;
};
}) {};
- groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "groovy-mode";
- version = "1.0.2";
+ version = "2.0";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555";
- sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9";
+ rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24";
+ sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
name = "groovy-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs s ];
meta = {
homepage = "https://melpa.org/#/groovy-mode";
license = lib.licenses.free;
@@ -16134,12 +16765,12 @@
gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
- version = "1.12.0";
+ version = "1.22.1";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
- rev = "e57f494fd94e49321a6396f530b8a13bae8b57df";
- sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly";
+ rev = "b6d93d25faff573a7f7712bc33fce1fe422473e0";
+ sha256 = "1j8ivqhzrz5kaq1as4s5vljjpan8adqdc5s2ms8p3p83b2kg55si";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -16218,12 +16849,12 @@
guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "guix";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchFromGitHub {
owner = "alezost";
repo = "guix.el";
- rev = "54bd174b514c5de11e82c4263ac2723addb0fe87";
- sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2";
+ rev = "a43828f6e5d6dc4e623a4b78e0dfdddbf5b20185";
+ sha256 = "0c19njb5cg6g3fav9322hkbl4h9zwcbymhc5wr0k9yqi7pv8gz0v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -16595,12 +17226,12 @@
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "hasky-stack";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-stack";
- rev = "a3f890fb8570369898ee9718b128d4e7123a6585";
- sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c";
+ rev = "17b9facafcff8203012c037c5a589f290169fc33";
+ sha256 = "00k13sl2yjnqjjdqlmz8ril07xw5al2ysbsnpmz81sccqa1kbikr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -16658,12 +17289,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "2.8.5";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "2385b81edc706f7efc74f2aff4854399254cde17";
- sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m";
+ rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69";
+ sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -16886,22 +17517,22 @@
license = lib.licenses.free;
};
}) {};
- helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }:
+ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "helm-cider";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "helm-cider";
- rev = "a24ef274e382c1a158a76eae2570f1f007031cb8";
- sha256 = "062abfb4sfpcc6fx3nrf3j0bisglrhyrg7rxwhhcqm9jhalksmdl";
+ rev = "9a948b834dd31b3f60d4701d6dd0ecfab0adbb72";
+ sha256 = "0wssd9jv6xighjhfh3p8if1anz3rcrjr71a4j063v6gyknb7fv27";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x";
name = "helm-cider";
};
- packageRequires = [ cider emacs helm-core seq ];
+ packageRequires = [ cider emacs helm-core ];
meta = {
homepage = "https://melpa.org/#/helm-cider";
license = lib.licenses.free;
@@ -16973,12 +17604,12 @@
helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-company";
- version = "0.2.0";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "Sodel-the-Vociferous";
repo = "helm-company";
- rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048";
- sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90";
+ rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d";
+ sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
@@ -16994,12 +17625,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "2.8.5";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "2385b81edc706f7efc74f2aff4854399254cde17";
- sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m";
+ rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69";
+ sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -17645,12 +18276,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "1.4.2";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "26749ff9f34b2abddf7c47ff71b1046942e38398";
- sha256 = "1q969rlqj706wdzd3s54pqpfpqkg18bzl5srl7xkw43cfzxpcpj2";
+ rev = "68f01726795ca3054cfc6327dcdb22c9c83dfdfa";
+ sha256 = "0vak9phqgxz5dk1zj3i4cs94y797h77qadirsf33gl073cg95l8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -17684,27 +18315,6 @@
license = lib.licenses.free;
};
}) {};
- helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
- melpaBuild {
- pname = "helm-package";
- version = "0.3";
- src = fetchFromGitHub {
- owner = "syohex";
- repo = "emacs-helm-package";
- rev = "117f5f26c96c0854aadaf9c52aaec961195d5798";
- sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package";
- sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
- name = "helm-package";
- };
- packageRequires = [ cl-lib helm ];
- meta = {
- homepage = "https://melpa.org/#/helm-package";
- license = lib.licenses.free;
- };
- }) {};
helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-pages";
@@ -17957,6 +18567,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-rg";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "cosmicexplorer";
+ repo = "helm-rg";
+ rev = "96dcbeb366caa0b158668384113458ee5f7c4dfd";
+ sha256 = "1k9yv9iw694alf5w7555ygk2i1b26i90rqq7ny63a4nd3y5cbs5f";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg";
+ sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v";
+ name = "helm-rg";
+ };
+ packageRequires = [ cl-lib dash emacs helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-rg";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-robe";
@@ -17981,12 +18612,12 @@
helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
melpaBuild {
pname = "helm-rtags";
- version = "2.15";
+ version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
- sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
+ rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
+ sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -18086,12 +18717,12 @@
helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-swoop";
- version = "1.7.2";
+ version = "1.7.4";
src = fetchFromGitHub {
owner = "ShingoFukuyama";
repo = "helm-swoop";
- rev = "6d3fdcfb6dea06242efc8ff4cafff9917e558bfc";
- sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72";
+ rev = "c66336b8245ddc51c4206f19c119f1081920985c";
+ sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop";
@@ -18104,6 +18735,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "helm-system-packages";
+ version = "1.8.0";
+ src = fetchFromGitHub {
+ owner = "emacs-helm";
+ repo = "helm-system-packages";
+ rev = "beb7e488454402a122b9dec9a019ea190b9b7dc3";
+ sha256 = "0wclsv69v84d7bknnlralham94s7iqal7aczsvfxgj97hpwgywfz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
+ sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4";
+ name = "helm-system-packages";
+ };
+ packageRequires = [ emacs helm seq ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-system-packages";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-themes";
@@ -18128,12 +18780,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-tramp";
- version = "0.5.4";
+ version = "0.8.5";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
- rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1";
- sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y";
+ rev = "ee7f6a2c09df5fdc28b4d910840a7c56922059c3";
+ sha256 = "0lkzi6h6wkm19mn7v6wjy50kd96k6hw7jhx7pxwgfp577816c7c2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -18230,22 +18882,22 @@
license = lib.licenses.free;
};
}) {};
- helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "helpful";
- version = "0.2";
+ version = "0.7";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "helpful";
- rev = "b9a06978b6ffcd7f0ea213a6f534fa39318f0050";
- sha256 = "1czqvmlca3w7n28c04dl3ljn8gbvfc565lysxlrhvgmv08iagnxm";
+ rev = "3ae20551fb0ce199deff47534a475cab50f19237";
+ sha256 = "1zb2zfyflabhar8smvpxcdmkla7camaq2srq6dk2xc66226vj9rn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
name = "helpful";
};
- packageRequires = [ dash elisp-refs emacs s ];
+ packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ];
meta = {
homepage = "https://melpa.org/#/helpful";
license = lib.licenses.free;
@@ -18485,12 +19137,12 @@
hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hindent";
- version = "5.2.4";
+ version = "5.2.5";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "e18ec3f55e288883f8042065190572e91651733d";
- sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z";
+ rev = "cba1110ca413a41a443b8368d63d295d7d36de7a";
+ sha256 = "020dj6q483b7fabspgvnjqw0rhrgj3q1ncdcpafmyn1fgip5y0zq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -19007,6 +19659,27 @@
license = lib.licenses.free;
};
}) {};
+ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ialign";
+ version = "0.4.1";
+ src = fetchFromGitHub {
+ owner = "mkcms";
+ repo = "interactive-align";
+ rev = "523df320197b587abd8c0ec4e9fbc763aeab1cf6";
+ sha256 = "04jak5j4yywl7fn5sggc125yh6cy0livf55194mfxs2kmbs5wm0h";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign";
+ sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j";
+ name = "ialign";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ialign";
+ license = lib.licenses.free;
+ };
+ }) {};
ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "ibuffer-projectile";
@@ -19028,6 +19701,27 @@
license = lib.licenses.free;
};
}) {};
+ ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ibuffer-tramp";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "svend";
+ repo = "ibuffer-tramp";
+ rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3";
+ sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp";
+ sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32";
+ name = "ibuffer-tramp";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ibuffer-tramp";
+ license = lib.licenses.free;
+ };
+ }) {};
ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ibuffer-vc";
@@ -19136,12 +19830,12 @@
ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
melpaBuild {
pname = "ido-completing-read-plus";
- version = "4.5";
+ version = "4.7";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
- rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345";
- sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih";
+ rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7";
+ sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
@@ -19238,22 +19932,22 @@
license = lib.licenses.free;
};
}) {};
- ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
+ ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ido-ubiquitous";
- version = "4.5";
+ version = "4.7";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
- rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345";
- sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih";
+ rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7";
+ sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz";
name = "ido-ubiquitous";
};
- packageRequires = [ cl-lib emacs ido-completing-read-plus ];
+ packageRequires = [ cl-lib ido-completing-read-plus ];
meta = {
homepage = "https://melpa.org/#/ido-ubiquitous";
license = lib.licenses.free;
@@ -19367,12 +20061,12 @@
iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iflipb";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitHub {
owner = "jrosdahl";
repo = "iflipb";
- rev = "2e0d1719abeec7982341761ee5dabb01574e6862";
- sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
+ rev = "a5ad1fbd1173cff5228dab265515c92c0778f86a";
+ sha256 = "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb";
@@ -19469,6 +20163,27 @@
license = lib.licenses.free;
};
}) {};
+ imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "imake";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "imake";
+ rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca";
+ sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake";
+ sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34";
+ name = "imake";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/imake";
+ license = lib.licenses.free;
+ };
+ }) {};
imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imapfilter";
@@ -19579,14 +20294,14 @@
pname = "impatient-mode";
version = "1.0.0";
src = fetchFromGitHub {
- owner = "netguy204";
- repo = "imp.el";
+ owner = "skeeto";
+ repo = "impatient-mode";
rev = "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0";
sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode";
- sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode";
+ sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j";
name = "impatient-mode";
};
packageRequires = [ cl-lib htmlize simple-httpd ];
@@ -19682,12 +20397,12 @@
indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "indium";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Indium";
- rev = "c15f5a2b4a48fd53b446e0fa291bdb8323b80c27";
- sha256 = "07fzsjmbbq4nx2w23pbb0z88iqmclm156yd87nxsdivndmzvsgw2";
+ rev = "5ece767ea30a350dcdb1a4defaca174e85efedc5";
+ sha256 = "1djkzjxv7idqg5pmbqf60lmvibp3ccvgdkdwb48wzn2yvnqr2vw6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -19703,12 +20418,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "2.0.1";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "956b22e7941d71216799ca4e8d5244e94fad9558";
- sha256 = "1wakfwmb43na3g2yqign764kwi791x7ikzmf76pkdpky70a5dkhz";
+ rev = "247ca70f8ba5104be292aea20fbde6adb37e359f";
+ sha256 = "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -19721,6 +20436,27 @@
license = lib.licenses.free;
};
}) {};
+ inf-crystal = callPackage ({ crystal-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "inf-crystal";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "inf-crystal.el";
+ rev = "71a330f2d29e2fb4f51d223cf6230b88620a80af";
+ sha256 = "0vija33n2j4j5inzm29qk1bjzaxjm97zn263j15258pqxwkbddv3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ff84c742eebb84577f362b2739f4bcf1434d58ac/recipes/inf-crystal";
+ sha256 = "09ssq7i5c2fxxbrsp3nn1f1ah1yv2nb19n5s1iqyykkk316k2q26";
+ name = "inf-crystal";
+ };
+ packageRequires = [ crystal-mode emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/inf-crystal";
+ license = lib.licenses.free;
+ };
+ }) {};
inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-ruby";
@@ -19784,6 +20520,27 @@
license = lib.licenses.free;
};
}) {};
+ info-colors = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "info-colors";
+ version = "0.2";
+ src = fetchFromGitHub {
+ owner = "ubolonton";
+ repo = "info-colors";
+ rev = "13dd9b6a7288e6bb692b210bcb9cd72016658dae";
+ sha256 = "1h2q19574sc1lrxm9k78668pwcg3z17bnbgykmah01zlmbs264sx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors";
+ sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x";
+ name = "info-colors";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/info-colors";
+ license = lib.licenses.free;
+ };
+ }) {};
inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inherit-local";
@@ -19996,12 +20753,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "0.1.23";
+ version = "0.1.26";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "3865aad923559bee140eaede20c3510890979930";
- sha256 = "1q6q2hnqf78kxd61nic4zjx7crbv8p25p4aq0h4vihamm8r0v7vm";
+ rev = "f85e1b47df3bb328be0de34120950cecb3465055";
+ sha256 = "1zng4sliygg1l0jamprx9pfs85jiy19gwxpcy2hs3s4hc7yxjdds";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -20056,6 +20813,27 @@
license = lib.licenses.free;
};
}) {};
+ ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ipython-shell-send";
+ version = "1.0.2";
+ src = fetchFromGitHub {
+ owner = "jackkamm";
+ repo = "ipython-shell-send-el";
+ rev = "36523a387c15ee1652a5b0e291d4d4838da5e912";
+ sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send";
+ sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8";
+ name = "ipython-shell-send";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ipython-shell-send";
+ license = lib.licenses.free;
+ };
+ }) {};
ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ir-black-theme";
@@ -20122,12 +20900,12 @@
iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iter2";
- version = "0.9.5";
+ version = "0.9.6";
src = fetchFromGitHub {
owner = "doublep";
repo = "iter2";
- rev = "ac1b4f10203d8093ae9f897039be97fd5ec65969";
- sha256 = "098bsm5wc7nqk06awak2ar4nwd3xpqsdc9pb2n0px20ql6lxh4bh";
+ rev = "b0e8ecebe2d6807403a5eb1c75d68a4706259d4e";
+ sha256 = "038z7scy572n6cx0z59kiz59v7zqvn70wg2bwka5f3pglr67wzhp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
@@ -20143,12 +20921,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
- sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
+ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
+ sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -20248,12 +21026,12 @@
ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-hydra";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
- sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
+ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
+ sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -20311,12 +21089,12 @@
ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ivy-rtags";
- version = "2.15";
+ version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
- sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
+ rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
+ sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -20666,12 +21444,12 @@
jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jq-mode";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "ljos";
repo = "jq-mode";
- rev = "3237634ab42566eb50f54e4b7f3896ffd20a8e53";
- sha256 = "063j0kfp2ybaw5r9hvn9rrksh874xpm9xvpiycv33lf7kdsp5lh3";
+ rev = "8384a1926cc22000e5e42f86f28d807fd6149f8e";
+ sha256 = "0fa84jln0vddrc218s8scz6hx12ym0wimh6dm58wqxias7gm9fgk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode";
@@ -20687,12 +21465,12 @@
js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-auto-format-mode";
- version = "1.0.2";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "ybiquitous";
repo = "js-auto-format-mode";
- rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb";
- sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j";
+ rev = "6bd44162ac422304803f606278bb0c08ab940a5d";
+ sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@@ -20705,22 +21483,22 @@
license = lib.licenses.free;
};
}) {};
- js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "js-comint";
- rev = "2c19fafed953ea0972ff086614f86614f4d5dc13";
- sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp";
+ rev = "83e932e4a83d1a69098ee87e0ab911d299368e60";
+ sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
name = "js-comint";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/js-comint";
license = lib.licenses.free;
@@ -21128,12 +21906,12 @@
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-themes";
- version = "1.0.5";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "ogdenwebb";
repo = "emacs-kaolin-themes";
- rev = "08e13adfab07c9cf7b0df313c77eac8fb393b284";
- sha256 = "0wijf5493wmp219ypbvhp0c4q76igrxijzdalbgkyp2gf8xvq6b4";
+ rev = "8a229fcd1d73876920a063f0eba906a5080275a7";
+ sha256 = "0w35862sjyizj7grb9ixjns8kpxq2wgdgn1n06jdhmnnaqdyq911";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -21506,12 +22284,12 @@
kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "kubernetes";
- version = "0.11.3";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
- rev = "560b65baef1c4f2bedffd8e767774b55dfc35594";
- sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw";
+ rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c";
+ sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -21527,12 +22305,12 @@
kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
melpaBuild {
pname = "kubernetes-evil";
- version = "0.11.3";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
- rev = "560b65baef1c4f2bedffd8e767774b55dfc35594";
- sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw";
+ rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c";
+ sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -21692,6 +22470,27 @@
license = lib.licenses.free;
};
}) {};
+ lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "lcr";
+ version = "0.9";
+ src = fetchFromGitHub {
+ owner = "jyp";
+ repo = "lcr";
+ rev = "3bc341205bba437c8fec4fefefaf39793c0405ae";
+ sha256 = "0jvdnb3fn33wq7ixb7ayrallq1j5gc9nh3i3nmy03yg11h60h1am";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr";
+ sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k";
+ name = "lcr";
+ };
+ packageRequires = [ dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/lcr";
+ license = lib.licenses.free;
+ };
+ }) {};
leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }:
melpaBuild {
pname = "leanote";
@@ -21839,6 +22638,27 @@
license = lib.licenses.free;
};
}) {};
+ line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "line-up-words";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "janestreet";
+ repo = "line-up-words";
+ rev = "54d2c51c1c3da7e06be47b829bf465bf467ab53f";
+ sha256 = "0qda9i5yjjf2x5cpg6nxkzqwa8fzzjxk0yyc4295kbawwd83vglr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words";
+ sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79";
+ name = "line-up-words";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/line-up-words";
+ license = lib.licenses.free;
+ };
+ }) {};
lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lingr";
@@ -21905,12 +22725,12 @@
linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "linum-relative";
- version = "0.5";
+ version = "0.6";
src = fetchFromGitHub {
owner = "coldnew";
repo = "linum-relative";
- rev = "b8a99dcfe38a491172a8193053fb7849634b43c0";
- sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s";
+ rev = "896df4b40c1e1eb59f55fcee48a1543f0ccd724e";
+ sha256 = "0b3n1gk2w1p72x0zfdz9l70winq2fnjpjrgq0awxx730xk7ypp5n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative";
@@ -22122,12 +22942,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "2.19.0";
+ version = "2.21.1";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "f5da8df21ae2aa704ddca4473b6f9400ba12d30c";
- sha256 = "1w0xc0bc5jl0q9yi9jhvy4xgdyrz9l402v9qv8mmrp2iqf5cdblm";
+ rev = "e0a5627e6591e1cbb9f93aabc44adbdc50b346c9";
+ sha256 = "0dhm7gdd1smlibj5jmzps97kwkpzcigbdp0l26baa2mkc6155y66";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -22289,12 +23109,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "0.8.2";
+ version = "0.9";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f";
- sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63";
+ rev = "9ec279d933923dab2d8d1f140adc43073dab6433";
+ sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -22478,12 +23298,12 @@
magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "magic-filetype";
- version = "0.2.1";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "magic-filetype.el";
- rev = "0dfe3d9e0e22c7b06e34c8338f110e337306e3fd";
- sha256 = "1yjn2w0ykczhlj4q3dnfw2z4q66201dn3jz31yw7hh8bxjlsvwfh";
+ rev = "019494add5ff02dd36cb3f500142fc51125522cc";
+ sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype";
@@ -22507,8 +23327,8 @@
sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
- sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit";
+ sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga";
name = "magit";
};
packageRequires = [
@@ -22611,12 +23431,12 @@
magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
melpaBuild {
pname = "magit-gh-pulls";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "sigma";
repo = "magit-gh-pulls";
- rev = "e4a73781e3c1c7e4a09232b25e3474463cdf77b6";
- sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z";
+ rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7";
+ sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls";
@@ -22674,16 +23494,16 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
- version = "2.11.0";
+ version = "2.12.2";
src = fetchFromGitHub {
owner = "magit";
- repo = "magit";
- rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5";
- sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym";
+ repo = "magit-popup";
+ rev = "ab75385a1fb8c0fba0769d448b13ba8324835261";
+ sha256 = "0ky4l3k3camh1paa5ap9frr9hcadj7nj40l3imiiqfcvgyl8ijp6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
- sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup";
+ sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv";
name = "magit-popup";
};
packageRequires = [ async dash emacs ];
@@ -22695,12 +23515,12 @@
magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-rockstar";
- version = "1.0.6";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "tarsius";
repo = "magit-rockstar";
- rev = "a65042e3445008b55190f1258ae54bd78e12174b";
- sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn";
+ rev = "c8320472e8a50c8299140ba0943bb1fe485d294a";
+ sha256 = "1xjym51z0v7ibxw059f6k3zljli6z390rmxvrywbfzkb8hqms0l1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
@@ -22797,22 +23617,22 @@
license = lib.licenses.free;
};
}) {};
- magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
+ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794";
- sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i";
+ rev = "08a1c1341d0982248ec86e1697fa1b6418cd80f5";
+ sha256 = "062xghazkm8lh207fpqp7csd3nwgkz47g831hqa94iz28n97x0pq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
name = "magithub";
};
- packageRequires = [ emacs ghub-plus magit s ];
+ packageRequires = [ emacs ghub-plus git-commit magit markdown-mode s ];
meta = {
homepage = "https://melpa.org/#/magithub";
license = lib.licenses.free;
@@ -23143,12 +23963,12 @@
mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mastodon";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "jdenen";
repo = "mastodon.el";
- rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac";
- sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7";
+ rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318";
+ sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -23164,12 +23984,12 @@
material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "material-theme";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "cpaulik";
repo = "emacs-material-theme";
- rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40";
- sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0";
+ rev = "b66838d220ad380a16da1d8878936974b26f815d";
+ sha256 = "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme";
@@ -23332,12 +24152,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "0.8.3";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5";
- sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8";
+ rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0";
+ sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -23416,7 +24236,7 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "3.0.4";
+ version = "3.0.5";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
@@ -23479,12 +24299,12 @@
metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "metaweblog";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "punchagan";
repo = "metaweblog";
- rev = "2200eacde17edb66bbdde9c0b6b65481f40d498b";
- sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k";
+ rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a";
+ sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
@@ -23961,12 +24781,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "019e07947426f0192fc3458f3f72c19031b607de";
- sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz";
+ rev = "bb5cbbd5895b8b3fbc6af572b1fd0aacd4988a8a";
+ sha256 = "1f0jl4a3b6i9skbcym0qzpszy620385m947l2ba2wxf1na7rc626";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -24087,12 +24907,12 @@
mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mowedline";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "retroj";
repo = "mowedline";
- rev = "832e81b7f90f6c2e753f89737c0b57a260544424";
- sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5";
+ rev = "c17501b48ded8261d815ab60bf14cddf7040be72";
+ sha256 = "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -24192,12 +25012,12 @@
msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "msvc";
- version = "1.3.5";
+ version = "1.3.7";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "msvc";
- rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577";
- sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk";
+ rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3";
+ sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -24315,6 +25135,26 @@
license = lib.licenses.free;
};
}) {};
+ multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "multi-project";
+ version = "0.0.26";
+ src = fetchhg {
+ url = "https://bitbucket.com/ellisvelo/multi-project";
+ rev = "a6e7c1542c0b";
+ sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
+ sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
+ name = "multi-project";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/multi-project";
+ license = lib.licenses.free;
+ };
+ }) {};
multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi-term";
@@ -24864,12 +25704,12 @@
nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-buffer";
- version = "3.0.1";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "shlevy";
repo = "nix-buffer";
- rev = "749f48b510d0fd47dac67850f4089119fbff142a";
- sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25";
+ rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099";
+ sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -24927,12 +25767,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "0.5.11";
+ version = "0.5.12";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "no-littering";
- rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2";
- sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g";
+ rev = "8e321f1036770c20637a0f946b655805cd070e25";
+ sha256 = "11hxf0fkka4mv1qsw0nx3ymvgcav95r2bvk1gwyj5m5cbwb4a1n9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -25029,15 +25869,15 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "0.25.2";
+ version = "0.26";
src = fetchgit {
- url = "git://git.notmuchmail.org/git/notmuch";
- rev = "83f266136369452b859393429b8530efac2e09fb";
- sha256 = "0idim2yslpjzbzy5hh9qhw1gy0h9p92rs0jrr8d2l9y8nsnh6zzr";
+ url = "https://git.notmuchmail.org/git/notmuch";
+ rev = "3c4e64d976eb561ac5157df1bbe5882e3e65b583";
+ sha256 = "00a9ggrc63n88g7vp57c09r859pl2dbxnqgf543ks94lm0jzyz3f";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
- sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch";
+ sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7";
name = "notmuch";
};
packageRequires = [];
@@ -25070,12 +25910,12 @@
nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nov";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "nov.el";
- rev = "19ab463864f137b43704b4f34173349c88e84d8e";
- sha256 = "00f5hhw157nwdwy26yn6l3z2hgk6xxvx5xl0hasskj1l9rg0zgh2";
+ rev = "4ef20ebb587ffb0ab73c85ad5748d41af1071596";
+ sha256 = "03s0qjvwk1f7y3i4wh2p5y3z4hdv00adgz8za3vphzc0q8i1kjzb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov";
@@ -25298,6 +26138,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-coffeescript";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "ob-coffeescript";
+ rev = "b70f3d822c707cb02333fcb739ba4874614cad2a";
+ sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
+ sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p";
+ name = "ob-coffeescript";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ob-coffeescript";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-http";
@@ -25319,6 +26180,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-hy";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "ob-hy";
+ rev = "a3512f274709dc4ab6c18d7955d361f8715505f0";
+ sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy";
+ sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7";
+ name = "ob-hy";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ob-hy";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-prolog";
@@ -25382,27 +26264,6 @@
license = lib.licenses.free;
};
}) {};
- ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }:
- melpaBuild {
- pname = "ob-spice";
- version = "0.4.2";
- src = fetchFromGitHub {
- owner = "stardiviner";
- repo = "ob-spice";
- rev = "790faa67b0c57ca76e8814a1fa60b4dd774412c0";
- sha256 = "0rn3j88ry38500vfaj0myx148nd5kh1jwja6j221ydd6v5wqws6d";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice";
- sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2";
- name = "ob-spice";
- };
- packageRequires = [ org spice-mode ];
- meta = {
- homepage = "https://melpa.org/#/ob-spice";
- license = lib.licenses.free;
- };
- }) {};
ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-translate";
@@ -25550,22 +26411,22 @@
license = lib.licenses.free;
};
}) {};
- olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "1.5.8";
+ version = "1.5.9";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "9bd41082a593ba90f3e9e34d3ffc29bbb276b674";
- sha256 = "0j33wn2kda5fi906h6y0zd5d0ygw0jg576kdndc3zyb4pxby96dn";
+ rev = "35d275d8bdfc5107c25db5a4995b65ba936f1d56";
+ sha256 = "00havcpsbk54xfcys9lhm9sv1d753jk3cmvssa2c52pp5frpxz3i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
name = "olivetti";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/olivetti";
license = lib.licenses.free;
@@ -25679,12 +26540,12 @@
omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
melpaBuild {
pname = "omnisharp";
- version = "4.1";
+ version = "4.2";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "ad4a19c60f7dc3d52a5b11febdcc9b78930a1e7d";
- sha256 = "0jc2ap9l0cc636kssld1bqalbriib57sw1rzz45s8r19jqa8w5gm";
+ rev = "7a6fe00e841106b17e7554f8a21f8457d12c5197";
+ sha256 = "1vrgj2irm87pykfjyx27a46g5xam7rxwjdfqh4jl6p8cgzgprrrg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -26212,22 +27073,22 @@
license = lib.licenses.free;
};
}) {};
- org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
melpaBuild {
pname = "org-jira";
- version = "2.7.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "ahungry";
repo = "org-jira";
- rev = "ab86b343634acaaa04b81ecea511a38e975977d1";
- sha256 = "19sd42w91gzhd0qxgymi09ms0kn6yhv3kdpky1n6l5mkpbv3kp39";
+ rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7";
+ sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
name = "org-jira";
};
- packageRequires = [ cl-lib emacs request ];
+ packageRequires = [ cl-lib emacs request s ];
meta = {
homepage = "https://melpa.org/#/org-jira";
license = lib.licenses.free;
@@ -26299,12 +27160,12 @@
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mime";
- version = "0.0.9";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "org-mime";
repo = "org-mime";
- rev = "62791db188fa6a9a6b4e53c5c29fb4fa46582b98";
- sha256 = "1l1fyyyyyi8nj4vpkyhpvz1yyqa2vn7042kp9443kqcswdfc9660";
+ rev = "0752659f7a19cead182584fabc9544464f69b83e";
+ sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -26529,12 +27390,12 @@
org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-random-todo";
- version = "0.5";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-random-todo";
- rev = "14a065e1d376838f16a6ba32ed8710304542a4e6";
- sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir";
+ rev = "60364c18725d2f3898a9099e7e546ae406dd6578";
+ sha256 = "0k86hqmqilvkam886mb85v991ivwnglallwj4l9ghszl7awy207m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -26603,12 +27464,12 @@
org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-repo-todo";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "waymondo";
repo = "org-repo-todo";
- rev = "904a26089d87db59a40421d6f857b189e70dfbe3";
- sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
+ rev = "cba6145c6821fd2bbd96a1c9ef2346c281b76ad2";
+ sha256 = "0b57qy87sa8qcki16rgh16ldziay57yd7f98cpinaq0adcrqywy0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo";
@@ -26621,6 +27482,27 @@
license = lib.licenses.free;
};
}) {};
+ org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-rich-yank";
+ version = "0.1.1";
+ src = fetchFromGitHub {
+ owner = "unhammer";
+ repo = "org-rich-yank";
+ rev = "ffa90b29604e27a60ad341c06d0e43769af19715";
+ sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank";
+ sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y";
+ name = "org-rich-yank";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org-rich-yank";
+ license = lib.licenses.free;
+ };
+ }) {};
org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-static-blog";
@@ -26894,22 +27776,43 @@
license = lib.licenses.free;
};
}) {};
- org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
+ org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-wild-notifier";
+ version = "0.2.4";
+ src = fetchFromGitHub {
+ owner = "akhramov";
+ repo = "org-wild-notifier.el";
+ rev = "5da63fc00db20b60eb46a241cc8308547d85b3ad";
+ sha256 = "1269az078d6d0x7ims2qa6wdv8ql2hn70fwigfqw116v9602ywjr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier";
+ sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp";
+ name = "org-wild-notifier";
+ };
+ packageRequires = [ alert dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org-wild-notifier";
+ license = lib.licenses.free;
+ };
+ }) {};
+ org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }:
melpaBuild {
pname = "org2blog";
- version = "1.0.0";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "punchagan";
repo = "org2blog";
- rev = "e266ff4296661de520b73e6e18f201fb6378ba05";
- sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461";
+ rev = "bd2028b6a79daa63fc5481deaed63c4efc681be0";
+ sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
name = "org2blog";
};
- packageRequires = [ metaweblog org xml-rpc ];
+ packageRequires = [ htmlize metaweblog org xml-rpc ];
meta = {
homepage = "https://melpa.org/#/org2blog";
license = lib.licenses.free;
@@ -26990,12 +27893,12 @@
orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "orgit";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "magit";
repo = "orgit";
- rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663";
- sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf";
+ rev = "976f3c7d25ad92c57341b52dad9af89b49c37f0c";
+ sha256 = "0m8mghh0iydbvlsrg0zd2xajfhdxgxk79dm4gwircrh6zv8194ax";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
@@ -27305,12 +28208,12 @@
ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-epub";
- version = "0.2.4";
+ version = "0.3";
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
- rev = "4b4585264a28152f2eda0f7e5ceed132f9d23e16";
- sha256 = "1k3lv4qqkp87piwlwl3gahac1zpjzv397f65g4khbpby2kgg8dpi";
+ rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d";
+ sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -27347,12 +28250,12 @@
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-hugo";
- version = "0.6";
+ version = "0.8";
src = fetchFromGitHub {
owner = "kaushalmodi";
repo = "ox-hugo";
- rev = "1213df6c6d9adcd706306523a5ce0c66d118b4c7";
- sha256 = "1j4b7f5bgpc8vhmxprqriy3688i3lp3fgvxcnnnb2v0sjq1pbac8";
+ rev = "9751d34e1133b89a533a978c085b0715f85db648";
+ sha256 = "11h464cyc28ld0b0zridgm4drydc1qjxbm1y24zrwlkyqqjk6yr7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -27452,12 +28355,12 @@
package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-build";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "melpa";
repo = "package-build";
- rev = "940c991ccd0dab53bd7c120601b3db35669c5e73";
- sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp";
+ rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00";
+ sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -27617,6 +28520,27 @@
license = lib.licenses.free;
};
}) {};
+ panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "panda-theme";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "jamiecollinson";
+ repo = "emacs-panda-theme";
+ rev = "ae24179e7a8a9667b169f00dbd891257530c1d22";
+ sha256 = "05vv4idl9h59jd089hpd09xcy1ix30bq0c4fif2b66170aychvii";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme";
+ sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7";
+ name = "panda-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/panda-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pandoc";
@@ -27744,12 +28668,12 @@
paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "paren-face";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "tarsius";
repo = "paren-face";
- rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf";
- sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7";
+ rev = "166975683225367c866e6ae6f6acb88d24e21a35";
+ sha256 = "02mh8w2na6qa94p3bh6pvdvmg36p2vrbp5hpjnwjcayrb92dskgy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face";
@@ -27807,12 +28731,12 @@
parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parsebib";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "parsebib";
- rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3";
- sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh";
+ rev = "c8d59deb20552f9a1885297b5ae0b8f753d191a5";
+ sha256 = "1b1iiiy184czp014gg1bb3jks9frmkw8hs5z2l2lnzjmfjr6jm6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
@@ -27996,12 +28920,12 @@
pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "pastery";
- version = "0.1.15";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "diasbruno";
repo = "pastery.el";
- rev = "245779100e7d1c1a10b67fe7b9055343d3a8229c";
- sha256 = "1wn53ncs0nivmdqlryvidqkksky8w4ymmfsqm1ha62jkxcwqf26h";
+ rev = "4493be98b743b4d062cb4e00760125e394a55022";
+ sha256 = "0bmm18d84lrkclg4md46k1ma03w7a97s10hrvjcm9yj8xbrjqqsc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery";
@@ -28519,12 +29443,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
- version = "1.18.2";
+ version = "1.18.4";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-mode";
- rev = "e41a44f39d5d78acc2bd59d2a614f5fc9ff80cd3";
- sha256 = "0ykdi8k6qj97r6nx9icd5idakksw1p10digfgl8r8z4qgwb00gcr";
+ rev = "ad7d1092e1d66602482c5b54ed0609c6171dcae1";
+ sha256 = "03yp07dxmxmhm8p5qcxsfdidhvnrpls20nr234cz6yamjl5zszh6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -28537,6 +29461,27 @@
license = lib.licenses.free;
};
}) {};
+ php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "php-runtime";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "emacs-php";
+ repo = "php-runtime.el";
+ rev = "fa4312863245511462b75cb31df2f8558288f4df";
+ sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime";
+ sha256 = "0dvnwajrjsgyqzglzpkx9vwx3f55mrag6dsbdjqc9vvpvxhmgfwb";
+ name = "php-runtime";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/php-runtime";
+ license = lib.licenses.free;
+ };
+ }) {};
phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "phpcbf";
@@ -28561,12 +29506,12 @@
phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "phpunit";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "phpunit.el";
- rev = "5ca5ee53e16b2cf0939dbeacbf1dffa13b41b48f";
- sha256 = "0gmb5fxnllkjg45cmqpr2gy2k6qhg1r6j2w67qbpir0x4h3q2x6x";
+ rev = "a13706733f98be3639c47311fc820b3b50f4bc33";
+ sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
@@ -28726,22 +29671,22 @@
license = lib.licenses.free;
};
}) {};
- plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ plain-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plain-theme";
- version = "7";
+ version = "8";
src = fetchFromGitHub {
owner = "yegortimoshenko";
repo = "plain-theme";
- rev = "7c376f5bf9d653bf12e414176284736cbdd19108";
- sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a";
+ rev = "2609a811335d58cfb73a65d6307c156fe09037d3";
+ sha256 = "0g5vl4xigdm2pn2mnkwgj1kxdjr66w7ynr77bchy3ij6qvzdzkqd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8";
name = "plain-theme";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/plain-theme";
license = lib.licenses.free;
@@ -28789,6 +29734,27 @@
license = lib.licenses.free;
};
}) {};
+ play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "play-crystal";
+ version = "0.1.2";
+ src = fetchFromGitHub {
+ owner = "veelenga";
+ repo = "play-crystal.el";
+ rev = "86b54346e7c832c14f8e5654a462f6490a6b11d7";
+ sha256 = "0kvkr24f8r21pahm2lsvbr9bg53770wxwpdfmmjljs2zmgxf2c40";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal";
+ sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf";
+ name = "play-crystal";
+ };
+ packageRequires = [ dash emacs request ];
+ meta = {
+ homepage = "https://melpa.org/#/play-crystal";
+ license = lib.licenses.free;
+ };
+ }) {};
play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "play-routes-mode";
@@ -29596,12 +30562,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
- version = "3.4.1";
+ version = "3.5.1.1";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "b04e5cba356212e4e8c66c61bbe0c3a20537c5b9";
- sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
+ rev = "860bd12fec5c69e6529565165532b3d5108a7d97";
+ sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -29971,22 +30937,22 @@
license = lib.licenses.free;
};
}) {};
- pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
+ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }:
melpaBuild {
pname = "pyim";
- version = "1.6.4";
+ version = "1.7";
src = fetchFromGitHub {
owner = "tumashu";
repo = "pyim";
- rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a";
- sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w";
+ rev = "3b1c5fbdf3b910f96771935785e28cf33d8d54cc";
+ sha256 = "1ijfsnjvyys941kgcq00d5dgnkbzj14gb7c9pks0x11bsdl0vr6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
name = "pyim";
};
- packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ];
+ packageRequires = [ async cl-lib emacs popup pyim-basedict ];
meta = {
homepage = "https://melpa.org/#/pyim";
license = lib.licenses.free;
@@ -30055,6 +31021,27 @@
license = lib.licenses.free;
};
}) {};
+ pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "pynt";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "ebanner";
+ repo = "pynt";
+ rev = "bc750cd244141005ea3b7bb87f75c6f6c5a5778f";
+ sha256 = "0mj8lkc40iv8d6afl4dba7gsbi0mgnx9ivanvczq6pxp5d4kgfsn";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt";
+ sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3";
+ name = "pynt";
+ };
+ packageRequires = [ deferred ein emacs epc helm ];
+ meta = {
+ homepage = "https://melpa.org/#/pynt";
+ license = lib.licenses.free;
+ };
+ }) {};
python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-environment";
@@ -30097,6 +31084,34 @@
license = lib.licenses.free;
};
}) {};
+ python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }:
+ melpaBuild {
+ pname = "python-pytest";
+ version = "0.2.2";
+ src = fetchFromGitHub {
+ owner = "wbolster";
+ repo = "emacs-python-pytest";
+ rev = "0ed385f7e8edd1a7d0aee72f5112459ea9054cbe";
+ sha256 = "1wpvgx8ldrnq0pjr8iq65f3m0kmh1c9hnv1lkrgrglqazs2c6hbm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest";
+ sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4";
+ name = "python-pytest";
+ };
+ packageRequires = [
+ dash
+ dash-functional
+ emacs
+ magit-popup
+ projectile
+ s
+ ];
+ meta = {
+ homepage = "https://melpa.org/#/python-pytest";
+ license = lib.licenses.free;
+ };
+ }) {};
python-x = callPackage ({ fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
melpaBuild {
pname = "python-x";
@@ -30142,12 +31157,12 @@
pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pyvenv";
- version = "1.10";
+ version = "1.12";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "pyvenv";
- rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55";
- sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh";
+ rev = "71eec02c25006737444dec7dfd004285f6cff6a8";
+ sha256 = "1j62qf4llrbmwwi7ynrhnzvh0g4razbc21vdlaa8jkjg6y5id95m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -30562,12 +31577,12 @@
rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rdf-prefix";
- version = "1.9";
+ version = "1.10";
src = fetchFromGitHub {
owner = "simenheg";
repo = "rdf-prefix";
- rev = "25cc3c8902f16191496b549705b00ffc7dff51f1";
- sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy";
+ rev = "164136d05505275d42d1ca3a390f55fcc89694b8";
+ sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -30622,22 +31637,28 @@
license = lib.licenses.free;
};
}) {};
- realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
+ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild {
pname = "realgud";
- version = "1.4.3";
+ version = "1.4.4";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-dbgr";
- rev = "6dc971269f6f9435e5159c2cfe66fc5e4b296df2";
- sha256 = "1pl758xp2gfy8h313ggpmqv7sjb8h6qdrqj68ypxch70k9vq76z8";
+ rev = "3804711863630affe79614a1527bc12c0955ec7c";
+ sha256 = "0fi48xh6rc7z146rafkabqhg6wy3zv85apn1bciw9pysazblq8pb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
name = "realgud";
};
- packageRequires = [ load-relative loc-changes test-simple ];
+ packageRequires = [
+ cl-lib
+ emacs
+ load-relative
+ loc-changes
+ test-simple
+ ];
meta = {
homepage = "https://melpa.org/#/realgud";
license = lib.licenses.free;
@@ -30982,12 +32003,12 @@
req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
melpaBuild {
pname = "req-package";
- version = "1.0";
+ version = "1.2";
src = fetchFromGitHub {
owner = "edvorg";
repo = "req-package";
- rev = "30f76a9c52994562191c90c315002410706f6c0b";
- sha256 = "0qdr2pshfq6v75s9hx9wgvn56pd7b65vaqaa64dryr7v4yzd4r15";
+ rev = "0c0ac7451149dac6bfda2adfe959d1df1c273de6";
+ sha256 = "0sx3kw1gpliifbc0gh2z1lvig68v3gwqjbj0izgn77js8kqxad84";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
@@ -31171,12 +32192,12 @@
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "rg";
- version = "1.4.0";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14";
- sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g";
+ rev = "562ac6fd6291f828ee6116db62982c77ddd52956";
+ sha256 = "0r5pqjmjwn5qpm8kns1730a6cq3bqxjp8ha63w0n1hnrd4gb24sw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -31444,12 +32465,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "2.15";
+ version = "2.18";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
- sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
+ rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
+ sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -31462,6 +32483,27 @@
license = lib.licenses.free;
};
}) {};
+ rubik = callPackage ({ calc, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "rubik";
+ version = "1.2";
+ src = fetchFromGitHub {
+ owner = "Kurvivor19";
+ repo = "rubik-mode";
+ rev = "7ec955639865ca8e99a941843e19b12be5015a47";
+ sha256 = "0fdjg6gpg45m5myq517vkprmvh50xw10dqa8vwr9hfz2z8dy18ja";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik";
+ sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267";
+ name = "rubik";
+ };
+ packageRequires = [ calc cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/rubik";
+ license = lib.licenses.free;
+ };
+ }) {};
rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rubocop";
@@ -32240,12 +33282,12 @@
shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shackle";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "shackle";
- rev = "55df581cdb3cfaf9ebf9c54d8849f8f5775cf74b";
- sha256 = "1s59v6fnyzvgnbjcd1gpll4xp8316dqmdpi77382w0vjfcrsvbih";
+ rev = "4189c1c773aab533969b587f7801ffbcd1d7d613";
+ sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -32618,12 +33660,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "0.0.12";
+ version = "0.0.13";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "aa45e7b586b1215ca1af05c14984ce872571b5f7";
- sha256 = "0ya7vbp71vmvli35rwcwspbclss5ngr1ck9074i2gg1dzrqyxijn";
+ rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8";
+ sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -33059,12 +34101,12 @@
smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
melpaBuild {
pname = "smart-mode-line";
- version = "2.10.1";
+ version = "2.11.0";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "smart-mode-line";
- rev = "8fd76a66abe4d37925e3d6152c6bd1e8648a293a";
- sha256 = "1176fxrzzk4fyp4wjyp0xyqrga74j5csr5x37mlgplh9790248dx";
+ rev = "5aca51956fae55d7310c1f96b5d128201087864a";
+ sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -33080,12 +34122,12 @@
smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }:
melpaBuild {
pname = "smart-mode-line-powerline-theme";
- version = "2.10.1";
+ version = "2.11.0";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "smart-mode-line";
- rev = "8fd76a66abe4d37925e3d6152c6bd1e8648a293a";
- sha256 = "1176fxrzzk4fyp4wjyp0xyqrga74j5csr5x37mlgplh9790248dx";
+ rev = "5aca51956fae55d7310c1f96b5d128201087864a";
+ sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
@@ -33143,12 +34185,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "1.10.1";
+ version = "1.11.0";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "7841b2f02a1a99e1cb166d595f24f16a514ccbb5";
- sha256 = "062g6y8an4kvfym2w56qy2iqd4ngxdxba38136ph0ckkzl0yrl7l";
+ rev = "4873352b5d0a1c5142658122de1b6950b8fe7e4d";
+ sha256 = "0zij2f2rjjym98w68jkp10n1ckpfprlkk217c3fg16hz5nq4vnm6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -33332,12 +34374,12 @@
snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "snakemake-mode";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "kyleam";
repo = "snakemake-mode";
- rev = "22b3efd741e26f59e18c9fd28691d8b84c9130ab";
- sha256 = "0hjp5ci7miggw0gs2y8q867gi7p3dq2yyfkckkh52isrp0yvz0wf";
+ rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7";
+ sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -33437,12 +34479,12 @@
solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solaire-mode";
- version = "1.0.2";
+ version = "1.0.4";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-solaire-mode";
- rev = "0f467e5f309e5a36280e06b40c0e6bbe90e06358";
- sha256 = "1jka6213sw3rqan6s31s1ndyd0h2gwxvl0rcfm4jqc68mfyikzma";
+ rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2";
+ sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -33476,6 +34518,27 @@
license = lib.licenses.free;
};
}) {};
+ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "solidity-mode";
+ version = "0.1.8";
+ src = fetchFromGitHub {
+ owner = "ethereum";
+ repo = "emacs-solidity";
+ rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048";
+ sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
+ sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx";
+ name = "solidity-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/solidity-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "sos";
@@ -33668,12 +34731,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
- version = "3.0.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
- rev = "e220a0c0c478fee0be3622442651981cdd82090c";
- sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
+ rev = "0ca89a2186ac35d7323ac45c0bea2e1c9ecd61ea";
+ sha256 = "0a0vy1pg9s6vh3z52bahhcls9b5p4hhqi075cqsif0ld2l4a4am2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -33959,22 +35022,22 @@
license = lib.licenses.free;
};
}) {};
- ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "1.3";
+ version = "1.5";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23";
- sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw";
+ rev = "aef539bb4feefe927fa48d01736dfadb7b3d7930";
+ sha256 = "0vra7y2icid9sdyp7iygwkp4xaas249nm1lcbcyfpaad250g2pn4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm";
name = "ssh-deploy";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/ssh-deploy";
license = lib.licenses.free;
@@ -34064,6 +35127,27 @@
license = lib.licenses.free;
};
}) {};
+ stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "stgit";
+ version = "0.18";
+ src = fetchFromGitHub {
+ owner = "ctmarinas";
+ repo = "stgit";
+ rev = "3df606d14f6673fede6cdf5fad921a664c03e108";
+ sha256 = "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit";
+ sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g";
+ name = "stgit";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/stgit";
+ license = lib.licenses.free;
+ };
+ }) {};
string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "string-edit";
@@ -34088,12 +35172,12 @@
string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "string-inflection";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "akicho8";
repo = "string-inflection";
- rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5";
- sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5";
+ rev = "a150e7bdda60b7824d3a936750ce23f73b0e4edd";
+ sha256 = "1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -34252,6 +35336,48 @@
license = lib.licenses.free;
};
}) {};
+ sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sudden-death";
+ version = "0.2.1";
+ src = fetchFromGitHub {
+ owner = "yewton";
+ repo = "sudden-death.el";
+ rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb";
+ sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death";
+ sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
+ name = "sudden-death";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/sudden-death";
+ license = lib.licenses.free;
+ };
+ }) {};
+ sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sudo-edit";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "nflath";
+ repo = "sudo-edit";
+ rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b";
+ sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
+ sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4";
+ name = "sudo-edit";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/sudo-edit";
+ license = lib.licenses.free;
+ };
+ }) {};
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
@@ -34357,27 +35483,6 @@
license = lib.licenses.free;
};
}) {};
- swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "swbuff";
- version = "3.3";
- src = fetchFromGitHub {
- owner = "emacsorphanage";
- repo = "swbuff";
- rev = "8d5b2bec12503509554f9dd83b97c198b259db2b";
- sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff";
- sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk";
- name = "swbuff";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/swbuff";
- license = lib.licenses.free;
- };
- }) {};
sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
melpaBuild {
pname = "sweetgreen";
@@ -34402,12 +35507,12 @@
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "swift-mode";
- version = "3.0";
+ version = "4.1.1";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0";
- sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc";
+ rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29";
+ sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -34444,12 +35549,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
- sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
+ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
+ sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -34465,12 +35570,12 @@
swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }:
melpaBuild {
pname = "swiper-helm";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper-helm";
- rev = "f3d6dba865629eed8fb14f92dab1fad50734891b";
- sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64";
+ rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008";
+ sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm";
@@ -34671,6 +35776,27 @@
license = lib.licenses.free;
};
}) {};
+ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "system-packages";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "jabranham";
+ repo = "system-packages";
+ rev = "149c253583e8b4d56a851b1e91e456260749cdea";
+ sha256 = "1c0q9c0wq9kskg8p6mnh6mnkivlabb46aqfcs7ms21497ndlmlsv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
+ sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1";
+ name = "system-packages";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/system-packages";
+ license = lib.licenses.free;
+ };
+ }) {};
system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "system-specific-settings";
@@ -35325,12 +36451,12 @@
thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thrift";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "b2a4d4ae21c789b689dd162deb819665567f481c";
- sha256 = "1b1fnzhy5qagbzhphgjxysad64kcq9ggcvp0wb7c7plrps72xfjh";
+ rev = "327ebb6c2b6df8bf075da02ef45a2a034e9b79ba";
+ sha256 = "1scv403g5a2081awg5za5d3parj1lg63llnnac11d6fn7j7ms99p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -35346,12 +36472,12 @@
tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tickscript-mode";
- version = "0.4";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "msherry";
repo = "tickscript-mode";
- rev = "9acf389dd055ae77c92170802769838810472490";
- sha256 = "1v60y244papzrirwqk9c2wcwgz4qp9h7m3887kvgr5ffn5imjss8";
+ rev = "6e7564593d7735acc9f3fa670ec6512991cb73a1";
+ sha256 = "173zk9nzjds0rkypmaq8xv5qianivgk16jpzgk0msdsn9kjbd8s9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
@@ -35364,15 +36490,36 @@
license = lib.licenses.free;
};
}) {};
+ tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tidal";
+ version = "0.9.6";
+ src = fetchFromGitHub {
+ owner = "tidalcycles";
+ repo = "Tidal";
+ rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406";
+ sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal";
+ sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a";
+ name = "tidal";
+ };
+ packageRequires = [ emacs haskell-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/tidal";
+ license = lib.licenses.free;
+ };
+ }) {};
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "2.6.1";
+ version = "2.7.1";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "e7ffcdcf9f68205d1498137e84a731c7ffb86263";
- sha256 = "0lym5jb2fxv4zjhik4q5miazrsi96pljl6fw5jjh0i9p8xs0yp4x";
+ rev = "6ca5319cdd581d323944584242a1ba45a115ee3d";
+ sha256 = "1jcnzx8g742pfh9nv3gcsxdj31kfpjzl202by30pzg2xz54i48gb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -35469,6 +36616,27 @@
license = lib.licenses.free;
};
}) {};
+ total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "total-lines";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "hinrik";
+ repo = "total-lines";
+ rev = "58a9fb0ffca63e3dfb3b27c7d91b4630e422903b";
+ sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines";
+ sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh";
+ name = "total-lines";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/total-lines";
+ license = lib.licenses.free;
+ };
+ }) {};
tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tox";
@@ -35513,12 +36681,12 @@
tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tracking";
- version = "2.6";
+ version = "2.7";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6";
- sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j";
+ rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484";
+ sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -35534,12 +36702,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "0.12";
+ version = "0.12.1";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "0de5a5fa2438890ae9c2ca61999042ab175df3e9";
- sha256 = "1wqlbbm71s1hvglsdp1qs7nvj6gnkjkai4rr8hhp1lliiyd5vmia";
+ rev = "03a36853f141387654b7cb9217c7417db096a083";
+ sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -35573,22 +36741,22 @@
license = lib.licenses.free;
};
}) {};
- treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
+ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "1.12.3";
+ version = "1.18.1";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "8959ef2546b7124a3e8d41cfba2912b748149d0c";
- sha256 = "1xy8r0cp7c5zc4xzqmzcp7g4pr09xkfii9xh8mkmpqf27sghj5rd";
+ rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
+ sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs";
- sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs";
+ sha256 = "0zbnw48wrbq9g7vlwxapxpq9xz8cqyr63814w0pqnh6j40ia7r2a";
name = "treemacs";
};
- packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ];
+ packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ];
meta = {
homepage = "https://melpa.org/#/treemacs";
license = lib.licenses.free;
@@ -35597,16 +36765,16 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
- version = "1.12.3";
+ version = "1.18.1";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "8959ef2546b7124a3e8d41cfba2912b748149d0c";
- sha256 = "1xy8r0cp7c5zc4xzqmzcp7g4pr09xkfii9xh8mkmpqf27sghj5rd";
+ rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
+ sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
- sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil";
+ sha256 = "1b02dybvp2fs9n1f80gpnqaxic45wwykny7vdyfay11ds5xzfpsg";
name = "treemacs-evil";
};
packageRequires = [ evil treemacs ];
@@ -35618,16 +36786,16 @@
treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
melpaBuild {
pname = "treemacs-projectile";
- version = "1.12.3";
+ version = "1.18.1";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "8959ef2546b7124a3e8d41cfba2912b748149d0c";
- sha256 = "1xy8r0cp7c5zc4xzqmzcp7g4pr09xkfii9xh8mkmpqf27sghj5rd";
+ rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
+ sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile";
- sha256 = "0y7mq466c9cigyd6imzjnh54aq9kcsikhr7llga5gsclf35fc5ld";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile";
+ sha256 = "0q3rj0g03423ql0d1ssp928x5f4540kxqlg51584aw57dlyy2z3n";
name = "treemacs-projectile";
};
packageRequires = [ projectile treemacs ];
@@ -35636,6 +36804,27 @@
license = lib.licenses.free;
};
}) {};
+ treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "treepy";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "volrath";
+ repo = "treepy.el";
+ rev = "282fbc94747fe2a00d36e2a74d147c8fa0ac4be7";
+ sha256 = "0acw6c073h2a0fy8gx2xc2d1fw0yhaqikqrvs2iq53fqcqrrq81r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy";
+ sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72";
+ name = "treepy";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/treepy";
+ license = lib.licenses.free;
+ };
+ }) {};
trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "trr";
@@ -35783,22 +36972,22 @@
license = lib.licenses.free;
};
}) {};
- turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "turing-machine";
- version = "0.1.4";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "therockmandolinist";
repo = "turing-machine";
- rev = "41bfe79ecf8a44dcbaf308c33cbdf324f7c806ae";
- sha256 = "04j4nw526mxlm4fd2a28p0pa2ss4b4vznjvpk0f0wlf61ymvy884";
+ rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047";
+ sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
name = "turing-machine";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/turing-machine";
license = lib.licenses.free;
@@ -36170,12 +37359,12 @@
unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unify-opening";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "unify-opening";
- rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf";
- sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a";
+ rev = "502469ddba6d8d52159f53976265f7d956b6b17c";
+ sha256 = "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
@@ -36241,8 +37430,8 @@
sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
- sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package";
+ sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp";
name = "use-package";
};
packageRequires = [ bind-key diminish ];
@@ -36251,6 +37440,27 @@
license = lib.licenses.free;
};
}) {};
+ usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "usql";
+ version = "0.0.1";
+ src = fetchFromGitHub {
+ owner = "nickbarnwell";
+ repo = "usql.el";
+ rev = "4cd8f4cf5c2e75485343321f02d621915aef10e8";
+ sha256 = "0cw25g8jvfjpzq3sabc3zbp0qynknzc0mq5psspcbxffk2qalbb9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql";
+ sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84";
+ name = "usql";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/usql";
+ license = lib.licenses.free;
+ };
+ }) {};
utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "utop";
@@ -36653,12 +37863,12 @@
vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vlf";
- version = "1.7";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "m00natic";
repo = "vlfi";
- rev = "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43";
- sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
+ rev = "a01e9ed416cd81ccddebebbf05d4ca80060b07dc";
+ sha256 = "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
@@ -36989,12 +38199,12 @@
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "aed3e00b6332a068d53ce482f5139a95c3dcd245";
- sha256 = "1p4sgn0rh8a5f0f6f1njq329zwgs6yp8j3zqs0yfz4kaikw1xw10";
+ rev = "2da60b8857d107721b089346121a7d51296a58bf";
+ sha256 = "1r945qz7z5z80qvzlqvz985mz51zy3pj3fk36y0flc380y4ap6hd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -37007,22 +38217,22 @@
license = lib.licenses.free;
};
}) {};
- websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "websocket";
- version = "1.8";
+ version = "1.9";
src = fetchFromGitHub {
owner = "ahyatt";
repo = "emacs-websocket";
- rev = "a9b8e74fa190024cd450ef4f832482e8438674fa";
- sha256 = "0yi6g7wmjsgv0dmpyf8cpin0icw3ymb7vbr3f9s01xs2w6kp8p13";
+ rev = "7d2adf218743c52578c8e8fd5584a5e54732e256";
+ sha256 = "0k8n710ip4av51n6l9ap1254qkifj987a6k86pgj3y6bw76ry08f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
name = "websocket";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/websocket";
license = lib.licenses.free;
@@ -37178,12 +38388,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "3.0.2";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031";
- sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88";
+ rev = "7559a79e95aada65601f7413a1c3f08bfa34557b";
+ sha256 = "1l9m04hypk8j5qkg7rlhsknj9hx5l3zjy97s3kv7wbcwvcx3yxhz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -37475,8 +38685,8 @@
version = "0.9.8";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "e80659fcc896";
- sha256 = "01cmwv6xafk19gg6ixgiw9szmhmqk19i2jha5yafaa93pwgnc40v";
+ rev = "d04938232934";
+ sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -37513,12 +38723,12 @@
with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "2.7.0";
+ version = "2.7.1";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "99d3278b1c79718de16dd4f57dcc8c4aa31a4051";
- sha256 = "1mcfinr1wv87hqn2787dcyn7lkgfni4xfgsji50pwj3zfgg0yqyr";
+ rev = "04d59d68dab58a7cf3034c84d8ba0553b78ae30c";
+ sha256 = "080f39m9nmi163arpmxw45xwadb7q7w7p385yi1jy62bzvqnk0pm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -37996,12 +39206,12 @@
xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xterm-color";
- version = "1.6";
+ version = "1.7";
src = fetchFromGitHub {
owner = "atomontage";
repo = "xterm-color";
- rev = "ed3d0f4ccb2b28ff034192c50f244a97197d3911";
- sha256 = "0djh18lm3xn9h4fa5ra0jrlzdzwhvhcalipj73j5gmmfaif4ya9q";
+ rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c";
+ sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
@@ -38101,12 +39311,12 @@
yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yang-mode";
- version = "0.9.4";
+ version = "0.9.7";
src = fetchFromGitHub {
owner = "mbj4668";
repo = "yang-mode";
- rev = "bcf698acbdb4df91f587942348739b407a8b0807";
- sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs";
+ rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695";
+ sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -38140,6 +39350,27 @@
license = lib.licenses.free;
};
}) {};
+ yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "yapfify";
+ version = "0.0.6";
+ src = fetchFromGitHub {
+ owner = "JorisE";
+ repo = "yapfify";
+ rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f";
+ sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
+ sha256 = "0scl8lk1c5i7jp1qj5gg8zf3zyi8lkb57ijkmvcs4czzlyv3y9bm";
+ name = "yapfify";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/yapfify";
+ license = lib.licenses.free;
+ };
+ }) {};
yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yard-mode";
@@ -38224,22 +39455,22 @@
license = lib.licenses.free;
};
}) {};
- yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+ yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "yatemplate";
- version = "2.0";
+ version = "3.0";
src = fetchFromGitHub {
owner = "mineo";
repo = "yatemplate";
- rev = "90c14d2e2b8247eeba464a52560af484f8542558";
- sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is";
+ rev = "c1de31d2b16d98af197a4392b6481346ab4e8d57";
+ sha256 = "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
name = "yatemplate";
};
- packageRequires = [ yasnippet ];
+ packageRequires = [ emacs yasnippet ];
meta = {
homepage = "https://melpa.org/#/yatemplate";
license = lib.licenses.free;
@@ -38249,13 +39480,13 @@
pname = "yatex";
version = "1.80";
src = fetchhg {
- url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "16763e5b7481";
- sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
+ url = "https://www.yatex.org/hgrepos/yatex";
+ rev = "af4601ee3c6a";
+ sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
- sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex";
+ sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0";
name = "yatex";
};
packageRequires = [];
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 03121edada0a..a2ba794933ea 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -38,6 +38,9 @@ self:
# upstream issue: mismatched filename
ack-menu = markBroken super.ack-menu;
+ # Expects bash to be at /bin/bash
+ ac-rtags = markBroken super.ac-rtags;
+
airline-themes = super.airline-themes.override {
inherit (self.melpaPackages) powerline;
};
@@ -45,10 +48,16 @@ self:
# upstream issue: missing file header
bufshow = markBroken super.bufshow;
+ # part of a larger package
+ caml = dontConfigure super.caml;
+
# part of a larger package
# upstream issue: missing package version
cmake-mode = markBroken (dontConfigure super.cmake-mode);
+ # Expects bash to be at /bin/bash
+ company-rtags = markBroken super.company-rtags;
+
# upstream issue: missing file header
connection = markBroken super.connection;
@@ -65,6 +74,9 @@ self:
# upstream issue: missing file header
elmine = markBroken super.elmine;
+ # upstream issue: missing dependency redshank
+ emr = markBroken super.emr;
+
ess-R-data-view = super.ess-R-data-view.override {
inherit (self.melpaPackages) ess ctable popup;
};
@@ -73,9 +85,21 @@ self:
inherit (self.melpaPackages) ess popup;
};
+ # upstream issue: doesn't build
+ eterm-256color = markBroken super.eterm-256color;
+
+ # upstream issue: missing dependency highlight
+ evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
+
+ # upstream issue: missing dependency highlight
+ floobits = markBroken super.floobits;
+
# missing OCaml
flycheck-ocaml = markBroken super.flycheck-ocaml;
+ # Expects bash to be at /bin/bash
+ flycheck-rtags = markBroken super.flycheck-rtags;
+
# upstream issue: missing file header
fold-dwim = markBroken super.fold-dwim;
@@ -85,12 +109,21 @@ self:
# upstream issue: mismatched filename
helm-lobsters = markBroken super.helm-lobsters;
+ # Expects bash to be at /bin/bash
+ helm-rtags = markBroken super.helm-rtags;
+
# upstream issue: missing file header
ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
# upstream issue: missing file header
initsplit = markBroken super.initsplit;
+ # upstream issue: recipe fails
+ insert-shebang = markBroken super.insert-shebang;
+
+ # Expects bash to be at /bin/bash
+ ivy-rtags = markBroken super.ivy-rtags;
+
# upstream issue: missing file header
jsfmt = markBroken super.jsfmt;
@@ -119,6 +152,9 @@ self:
# missing OCaml
ocp-indent = markBroken super.ocp-indent;
+ # upstream issue: missing file header
+ po-mode = markBroken super.po-mode;
+
# upstream issue: truncated file
powershell = markBroken super.powershell;
@@ -134,6 +170,9 @@ self:
# upstream issue: missing file header
stgit = markBroken super.stgit;
+ # upstream issue: missing file header
+ tawny-mode = markBroken super.tawny-mode;
+
# upstream issue: missing file header
textmate = markBroken super.textmate;
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index a5624490b96e..f6349089be1e 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
- version = "20171113";
+ version = "20180226";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-20171113.tar";
- sha256 = "0lip21hxq912ya2cgfls3c4clks9knsf2cma9dabbdkiz9jmw1xq";
+ url = "https://orgmode.org/elpa/org-20180226.tar";
+ sha256 = "0jqvry6gah1bwnryha4asynj13jyds3qim0xcy7s01rxk99m2ziy";
};
packageRequires = [];
meta = {
@@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
- version = "20171113";
+ version = "20180226";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-plus-contrib-20171113.tar";
- sha256 = "1yy24rgdfvs99rj0zi74djb7l4wmj3w1i6m6j8z6xkqnhixwg5w7";
+ url = "https://orgmode.org/elpa/org-plus-contrib-20180226.tar";
+ sha256 = "034wp70hcqnpidji5k1k80mj35iyyy098nbvc2sl7i2aca4m03zc";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
index 1cdcb9b85544..de72b24f87ac 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (rec {
name = "ProofGeneral-unstable-${version}";
- version = "2017-11-06";
+ version = "2018-01-30";
src = fetchFromGitHub {
owner = "ProofGeneral";
repo = "PG";
- rev = "2eab72c33751768c8a6cde36b978ea4a36b91843";
- sha256 = "1l3n48d6d4l5q3wkhdyp8dc6hzdw1ckdzr57dj8rdm78j87vh2cg";
+ rev = "945cada601c5729edd16fcc989a3969c8b34d20a";
+ sha256 = "1zjmbhq6c8g8b93nnsvr5pxx6mlcndb0fz152b2h80vfh9663cn8";
};
buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive;
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index af3298a5883e..ba243629cc3e 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -4,8 +4,8 @@
, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, 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
+, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
+, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null
, withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
}:
@@ -36,9 +36,19 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- patches =
- [ ./clean-env.patch ]
- ++ lib.optional stdenv.isDarwin ./at-fdcwd.patch;
+ patches = [
+ ./clean-env.patch
+ ] ++ lib.optionals stdenv.isDarwin [
+ ./at-fdcwd.patch
+
+ # Backport of the fix to
+ # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html
+ # Should be removed when switching to Emacs 26.1
+ (fetchurl {
+ url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
+ sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
+ })
+ ];
nativeBuildInputs = [ pkgconfig ]
++ lib.optionals srcRepo [ autoconf automake texinfo ]
@@ -51,9 +61,9 @@ stdenv.mkDerivation rec {
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
imagemagick gconf ]
++ lib.optional (withX && withGTK2) gtk2
- ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ]
+ ++ 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) [ webkitgtk24x-gtk3 glib-networking ];
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el
index b41ca92db086..cc1ab1d0e303 100644
--- a/pkgs/applications/editors/emacs/site-start.el
+++ b/pkgs/applications/editors/emacs/site-start.el
@@ -1,18 +1,39 @@
-;;; NixOS specific load-path
-(setq load-path
- (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
- (split-string (or (getenv "NIX_PROFILES") ""))))
- load-path))
+(defun nix--profile-paths ()
+ "Returns a list of all paths in the NIX_PROFILES environment
+variable, ordered from more-specific (the user profile) to the
+least specific (the system profile)"
+ (reverse (split-string (or (getenv "NIX_PROFILES") ""))))
+
+;;; Extend `load-path' to search for elisp files in subdirectories of
+;;; all folders in `NIX_PROFILES'. Also search for one level of
+;;; subdirectories in these directories to handle multi-file libraries
+;;; like `mu4e'.'
+(require 'seq)
+(let* ((subdirectory-sites (lambda (site-lisp)
+ (when (file-exists-p site-lisp)
+ (seq-filter (lambda (f) (file-directory-p (file-truename f)))
+ ;; Returns all files in `site-lisp', excluding `.' and `..'
+ (directory-files site-lisp 'full "^\\([^.]\\|\\.[^.]\\|\\.\\..\\)")))))
+ (paths (apply #'append
+ (mapcar (lambda (profile-dir)
+ (let ((site-lisp (concat profile-dir "/share/emacs/site-lisp/")))
+ (cons site-lisp (funcall subdirectory-sites site-lisp))))
+ (nix--profile-paths)))))
+ (setq load-path (append paths load-path)))
+
;;; Make `woman' find the man pages
(eval-after-load 'woman
'(setq woman-manpath
- (append (reverse (mapcar (lambda (x) (concat x "/share/man/"))
- (split-string (or (getenv "NIX_PROFILES") ""))))
+ (append (mapcar (lambda (x) (concat x "/share/man/"))
+ (nix--profile-paths))
woman-manpath)))
;;; Make tramp work for remote NixOS machines
(eval-after-load 'tramp
+ ;; TODO: We should also add the other `NIX_PROFILES' to this path.
+ ;; However, these are user-specific, so we would need to discover
+ ;; them dynamically after connecting via `tramp'
'(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
;;; C source directory
@@ -22,9 +43,9 @@
;;; from: /nix/store/-emacs-/share/emacs/site-lisp/site-start.el
;;; to: /nix/store/-emacs-/share/emacs//src/
(let ((emacs
- (file-name-directory ;; .../emacs/
- (directory-file-name ;; .../emacs/site-lisp
- (file-name-directory load-file-name)))) ;; .../emacs/site-lisp/
+ (file-name-directory ; .../emacs/
+ (directory-file-name ; .../emacs/site-lisp
+ (file-name-directory load-file-name)))) ; .../emacs/site-lisp/
(version
(file-name-as-directory
(concat
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 10816e0a283f..7be55b873bc5 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "focuswriter-${version}";
- version = "1.6.7";
+ version = "1.6.10";
src = fetchurl {
url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
- sha256 = "10rqzinr6yd6ca06rklg34kdc08a3xgygfzmprsfg7gdsybfay5z";
+ sha256 = "0hrbycy5lapdkaa2xm90j45sgsiqdnlk9wry41kxxpdln9msabxs";
};
nativeBuildInputs = [ pkgconfig qmake qttools ];
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 5ff5c0845d00..23478758efe5 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
let
- version = "1.32";
+ version = "1.33";
in
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.geany.org/${name}.tar.bz2";
- sha256 = "8b7be10b95d0614eb07f845ba2280f7c026eacd5739d8fac4d5d26606f8c3c2d";
+ sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2";
};
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
- Simple project management
- Plugin interface
'';
- homepage = http://www.geany.org/;
+ homepage = https://www.geany.org/;
license = "GPL";
maintainers = [];
platforms = platforms.all;
diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
new file mode 100644
index 000000000000..491fc0ca2a8d
--- /dev/null
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, qmake, pkgconfig, qtwebkit, hunspell }:
+
+stdenv.mkDerivation rec {
+ pname = "ghostwriter";
+ version = "1.5.0";
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "wereturtle";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0ixw2w2526836lwj4pc0vp7prp1gls7iq37v8m9ql1508b33b9pq";
+ };
+
+ nativeBuildInputs = [ qmake pkgconfig ];
+
+ buildInputs = [ qtwebkit hunspell ];
+
+ meta = with stdenv.lib; {
+ description = "A cross-platform, aesthetic, distraction-free Markdown editor";
+ homepage = src.meta.homepage;
+ license = licenses.gpl3Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
index 5c0f2ee18e1f..22cc4d47e680 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, ncurses }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, ncurses }:
stdenv.mkDerivation rec {
name = "hexcurse-${version}";
@@ -11,6 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk";
};
buildInputs = [ ncurses ];
+ patches = [
+ # gcc7 compat
+ (fetchpatch {
+ url = https://github.com/LonnyGomes/hexcurse/commit/d808cb7067d1df067f8b707fabbfaf9f8931484c.patch;
+ sha256 = "0h8345blmc401c6bivf0imn4cwii67264yrzxg821r46wrnfvyi2";
+ })
+ # gcc7 compat
+ (fetchpatch {
+ url = https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch;
+ sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix";
+ })
+ ];
meta = with lib; {
description = "ncurses-based console hexeditor written in C";
diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
index 112eebfaf6f6..63864bc581df 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
+ patches = [ ./gcc7.patch ];
+
meta = with lib; {
description = "File editor/viewer/analyzer for executables";
homepage = http://hte.sourceforge.net;
diff --git a/pkgs/applications/editors/ht/gcc7.patch b/pkgs/applications/editors/ht/gcc7.patch
new file mode 100644
index 000000000000..a90deaac698d
--- /dev/null
+++ b/pkgs/applications/editors/ht/gcc7.patch
@@ -0,0 +1,11 @@
+--- ht-2.1.0.org/htapp.cc 2014-09-14 16:55:26.000000000 +0100
++++ ht-2.1.0/htapp.cc 2018-03-10 12:48:07.158533800 +0000
+@@ -3023,7 +3023,7 @@
+ {
+ uint a = 2;
+ uint b = u/a;
+- while (abs(a - b) > 1) {
++ while (abs((int)(a - b)) > 1) {
+ a = (a+b)/2;
+ b = u/a;
+ }
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index a7ac367f048a..7715de153981 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip
-, coreutils, gnugrep, which, git, python, unzip }:
+, coreutils, gnugrep, which, git, python, unzip, libsecret
+}:
{ name, product, version, src, wmClass, jdk, meta } @ attrs:
@@ -65,7 +66,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
--prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
# Some internals want libstdc++.so.6
- stdenv.cc.cc.lib
+ stdenv.cc.cc.lib libsecret
]}" \
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 746da7534e68..3c5574388236 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
, coreutils, gnugrep, which, git, python, unzip, p7zip
-, androidsdk, jdk, cmake, libxml2, zlib, python2, ncurses
+, androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses
}:
assert stdenv.isLinux;
@@ -41,11 +41,19 @@ let
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \
bin/lldb/bin/lldb-server
- patchelf --set-interpreter $interp \
- --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
- bin/lldb/LLDBFrontend
+
+ for i in LLDBFrontend lldb lldb-argdumper; do
+ patchelf --set-interpreter $interp \
+ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
+ "bin/lldb/bin/$i"
+ done
+
patchelf \
- --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python2 ]}:$lldbLibPath" \
+ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
+ bin/lldb/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so
+
+ patchelf \
+ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \
bin/lldb/lib/liblldb.so
patchelf --set-interpreter $interp bin/gdb/bin/gdb
@@ -77,15 +85,15 @@ let
};
});
- buildGogland = { name, version, src, license, description, wmClass, update-channel }:
+ buildGoland = { name, version, src, license, description, wmClass, update-channel }:
lib.overrideDerivation (mkJetBrainsProduct {
inherit name version src wmClass jdk;
- product = "Gogland";
+ product = "Goland";
meta = with stdenv.lib; {
homepage = https://www.jetbrains.com/go/;
inherit description license;
longDescription = ''
- Gogland is the codename for a new commercial IDE by JetBrains
+ Goland is the codename for a new commercial IDE by JetBrains
aimed at providing an ergonomic environment for Go development.
The new IDE extends the IntelliJ platform with the coding assistance
and tool integrations specific for the Go language
@@ -96,9 +104,9 @@ let
}) (attrs: {
postFixup = (attrs.postFixup or "") + ''
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
- patchelf --set-interpreter $interp $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
+ patchelf --set-interpreter $interp $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
- chmod +x $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
+ chmod +x $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
'';
});
@@ -203,7 +211,7 @@ let
});
buildWebStorm = { name, version, src, license, description, wmClass, update-channel }:
- (mkJetBrainsProduct {
+ lib.overrideDerivation (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "WebStorm";
meta = with stdenv.lib; {
@@ -217,8 +225,13 @@ let
maintainers = with maintainers; [ abaldeau ];
platforms = platforms.linux;
};
+ }) (attrs: {
+ patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) ''
+ # Webstorm tries to use bundled jre if available.
+ # Lets prevent this for the moment
+ rm -r jre64
+ '';
});
-
in
{
@@ -226,12 +239,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2017.2.3"; /* updated by script */
+ version = "2017.3.4"; /* 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 = "02hyndyfcrvfbi4q8vmmj0xh2bggwc2azggm24g3m03iffa7j6fx"; /* updated by script */
+ sha256 = "1yxjvsp89mkk7gghbz5lqh7bbqi6l1ihg876c60bhqg0f5m98zcg"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -239,38 +252,38 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
- version = "2017.2.2"; /* updated by script */
+ version = "2017.3.7"; /* 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 = "1l8y65fw9g5ckzwpcgigm2qwy8fhpw2hil576rphsnx6qvnh4swn"; /* updated by script */
+ sha256 = "1pmkv1yd8xwqa4kdffg0vvk3whmnvrs9js7vnq4ilm39zzksqmpa"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
- update-channel = "datagrip_2017_2";
+ update-channel = "datagrip_2017_3";
};
- gogland = buildGogland rec {
- name = "gogland-${version}";
- version = "173.2696.28"; /* updated by script */
+ goland = buildGoland rec {
+ name = "goland-${version}";
+ version = "2017.3.3"; /* 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 = "07nz2pf7fnjxsvc82vihk2i880cji349czxzshr1dk50ixlydq7n"; /* updated by script */
+ sha256 = "073wwhg58hkd8w4jazvwngl78gbhnmilm63jhpirr98jk7i7a4mq"; /* updated by script */
};
- wmClass = "jetbrains-gogland";
- update-channel = "gogland_1.0_EAP";
+ wmClass = "jetbrains-goland";
+ update-channel = "goland_release";
};
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2017.2.6"; /* updated by script */
+ version = "2017.3.5"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "150zq3wk7gsn1ibx5nkq9smfcf9n1lk347vj47yb1nwzcq0vmj2p"; /* updated by script */
+ sha256 = "124rzc46f4bqyhllwyb26lkavh7zwbj62axrwhif34rayl2rcmpm"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IDEA_Release";
@@ -278,12 +291,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2017.2.6"; /* updated by script */
+ version = "2017.3.5"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
- sha256 = "1g0qcv14rn9kzf0yv17ca3w1ihl1274216n7niwkqwcjp5mvj030"; /* updated by script */
+ sha256 = "10r3z37mhr8daxi14k011bhx3pxpx3lsj7jvikwll4wjlv1znhiw"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IDEA_Release";
@@ -291,25 +304,25 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2017.2.4"; /* updated by script */
+ version = "2017.3.5"; /* 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 = "0hn3x5wid2z7s2mhnxfqh2yhdkscccpbz7qgsxkjvmkxcynazrvy"; /* updated by script */
+ sha256 = "1mcq8n7rd074aghmiyqf1yg3qvs28w97kk4dygj2a46y3s1ha4cd"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
- update-channel = "PS2017.2";
+ update-channel = "PS2017.3";
};
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2017.2.4"; /* updated by script */
+ version = "2017.3.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 = "193f44s9vh5ksd7hs586h0j66lcqsh29wwxr5yhl05lq931la857"; /* updated by script */
+ sha256 = "027w73qrrj7aml2kdj3sx890q7jyj2jfnsg0pivi7i4kh8i11204"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm_Release";
@@ -317,12 +330,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2017.2.4"; /* updated by script */
+ version = "2017.3.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 = "0n1nps8jfk77i796yr90bvrx9j1vcdnl25sr4b5n4xznjrix4gki"; /* updated by script */
+ sha256 = "0040ryx7kj64vwc10gvns43f1c97dvrgnwlmdm1m1506ldvaw0si"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm_Release";
@@ -330,38 +343,38 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2017.1.2"; /* updated by script */
+ version = "2017.3.1"; /* 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/resharper/JetBrains.Rider-${version}.tar.gz";
- sha256 = "0kphjxibrs4ss6hpxbssvs3n35xh9zzw7a1q09x79ibvvk73gwqh"; /* updated by script */
+ sha256 = "0k9yc00lmk826pylfs9jyxqnlczk9vhq7bs61b8nyfam1dqbgikv"; /* updated by script */
};
wmClass = "jetbrains-rider";
- update-channel = "rider_2017_1";
+ update-channel = "rider_2017_3";
};
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2017.1.5"; /* updated by script */
+ version = "2017.3.3"; /* 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 = "198eb3d7914529ce3a6857e038167e194fb838c4b94242048ae45e8413458d66"; /* updated by script */
+ sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
- update-channel = "rm2017.1";
+ update-channel = "rm2017.3";
};
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2017.2.5"; /* updated by script */
+ version = "2017.3.5"; /* 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 = "0apsfwcj8qfjwya794848h5iqfg9fay3h8bxqwclkw7lid9qwv7n"; /* updated by script */
+ sha256 = "123v4m8p7acndj8p8frn1bjvycijlx904pa84ka9pv18c90qiym9"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WS_Release";
diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix
index d6c87c4991b9..b2ace8accd8a 100644
--- a/pkgs/applications/editors/joe/default.nix
+++ b/pkgs/applications/editors/joe/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl } :
stdenv.mkDerivation rec {
- version = "4.4";
+ version = "4.6";
name = "joe-${version}";
src = fetchurl {
url = "mirror://sourceforge/joe-editor/${name}.tar.gz";
- sha256 = "0y898r1xlrv75m00y598rvwwsricabplyh80wawsqafapcl4hw55";
+ sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9";
};
meta = with stdenv.lib; {
description = "A full featured terminal-based screen editor";
- homepage = http://joe-editor.sourceforge.net;
+ homepage = https://joe-editor.sourceforge.io;
license = licenses.gpl2;
platforms = platforms.unix;
};
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index 3d623d3f3bda..c24866671f9b 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx,
+{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
openssl
libxml2
gnome3.gtksourceview
- at_spi2_core
+ at-spi2-core
pcre
epoxy
boost
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 067aff5ee69b..868dfaf3d12a 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt }:
+{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt, pkgconfig }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "kakoune-unstable-${version}";
- version = "2017-04-12";
+ version = "2018-03-22";
src = fetchFromGitHub {
repo = "kakoune";
owner = "mawww";
- rev = "7482d117cc85523e840dff595134dcb9cdc62207";
- sha256 = "08j611y192n9vln9i94ldlvz3k0sg79dkmfc0b1vczrmaxhpgpfh";
+ rev = "f8e297acef1be0657b779fea5256f606a6c6a3a3";
+ sha256 = "14xmw3lkwzppm9bns55nmyb1lfihzhdyisf6xjqlszdj4mcf94jl";
};
- buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];
postPatch = ''
export PREFIX=$out
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 1a164ec08de9..41d1a6262ed5 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -3,7 +3,7 @@
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
, threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons
-, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info
+, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info
, libksysguard, konsole, llvmPackages, makeWrapper
}:
@@ -34,7 +34,7 @@ mkDerivation rec {
kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
- kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons
+ kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons
];
postInstall = ''
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index 78881b21018c..88164c2c4585 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
libkomparediff2
];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
maintainers = [ maintainers.ambrop72 ];
platforms = platforms.linux;
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
index a0e941289099..b03abc2146aa 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper
, # Patchelf dependencies:
- alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, mesa
-, openssl, xlibs, xorg, zlib
+ alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined
+, openssl, xorg, zlib
}:
let
@@ -55,7 +55,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:${mesa}/lib:${openssl.out}/lib" \
+ --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGLU_combined}/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/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index b05bbd053c1f..2084a047a086 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -1,20 +1,29 @@
-{ stdenv, python3Packages, fetchFromGitHub, makeWrapper, makeDesktopItem }:
+{ stdenv, python3, libsForQt56, fetchFromGitHub, makeWrapper, makeDesktopItem }:
+let
+ packageOverrides = self: super: {
+ pyqt56 = libsForQt56.callPackage ../../../development/python-modules/pyqt/5.x.nix {
+ pythonPackages = self;
+ };
+ };
+
+ pythonPackages = (python3.override { inherit packageOverrides; }).pkgs;
+in
stdenv.mkDerivation rec {
name = "leo-editor-${version}";
- version = "5.5";
+ version = "5.6";
src = fetchFromGitHub {
owner = "leo-editor";
repo = "leo-editor";
rev = version;
- sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr";
+ sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j";
};
dontBuild = true;
- nativeBuildInputs = [ makeWrapper python3Packages.python ];
- propagatedBuildInputs = with python3Packages; [ pyqt5 ];
+ nativeBuildInputs = [ makeWrapper python3 ];
+ propagatedBuildInputs = with pythonPackages; [ pyqt56 docutils ];
desktopItem = makeDesktopItem rec {
name = "leo-editor";
@@ -50,7 +59,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/leo-editor
mv * $out/share/leo-editor
- makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \
+ makeWrapper ${python3.interpreter} $out/bin/leo \
--set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \
--add-flags "-O $out/share/leo-editor/launchLeo.py"
'';
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index 74a83c1278af..c5f8278f649d 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
-, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
+, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify
}:
let
libPath = stdenv.lib.makeLibraryPath [
- stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss
+ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index f4bdee830e19..d0367d7c3051 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mg-${version}";
- version = "20170828";
+ version = "20171014";
src = fetchurl {
url = "http://homepage.boetes.org/software/mg/${name}.tar.gz";
- sha256 = "139nc58l5ifj3d3478nhqls0lic52skmxfxggznzxaz9camqd20z";
+ sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix
new file mode 100644
index 000000000000..f1c1e3dcac70
--- /dev/null
+++ b/pkgs/applications/editors/micro/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "micro-${version}";
+ version = "1.4.0";
+
+ goPackagePath = "github.com/zyedidia/micro";
+
+ src = fetchFromGitHub {
+ owner = "zyedidia";
+ repo = "micro";
+ rev = "v${version}";
+ sha256 = "0w1rmh81h28n1jlb05k89i751h498i6p883hrsjr70hvrwq5zjpb";
+ fetchSubmodules = true;
+ };
+
+ subPackages = [ "cmd/micro" ];
+
+ buildFlagsArray = [ "-ldflags=" "-X main.Version=${version}" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://micro-editor.github.io;
+ description = "Modern and intuitive terminal-based text editor";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
+
diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix
index a1506eb9d6cc..751b78ab674b 100644
--- a/pkgs/applications/editors/moe/default.nix
+++ b/pkgs/applications/editors/moe/default.nix
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "1wsfzy0iia0c89wnx1ilzw54wqcmlp2nz8mkpvc393z0zagrx48q";
};
+ prePatch = ''
+ substituteInPlace window_vector.cc --replace \
+ "insert( 0U, 1," \
+ "insert( 0U, 1U,"
+ '';
+
nativeBuildInputs = [ lzip ];
buildInputs = [ ncurses ];
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 53ea9741c03c..e8e529b63abc 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, fetchNuGet
-, autoconf, automake, pkgconfig, shared_mime_info, intltool
+, autoconf, automake, pkgconfig, shared-mime-info, intltool
, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip
, dotnetPackages
}:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- autoconf automake shared_mime_info intltool
+ autoconf automake shared-mime-info intltool
mono gtk-sharp-2_0 gnome-sharp unzip
dotnetPackages.NUnit
dotnetPackages.NUnitRunners
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 0663cca53b9f..9ff1c44dceb0 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
name = "nano-${version}";
- version = "2.9.0";
+ version = "2.9.4";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
- sha256 = "17hjgvig59a2ha2b0494bprrci3d33sayjqvxjhsnlzgr8whrlyj";
+ sha256 = "0nm3zy4azr5rkxjq7jfybbj3cnddmvxc49rxyqm9cp2zfdp75y9c";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
@@ -42,6 +42,8 @@ in stdenv.mkDerivation rec {
cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/
'';
+ enableParallelBuilding = true;
+
meta = {
homepage = https://www.nano-editor.org/;
description = "A small, user-friendly console text editor";
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index ba3abe6a221f..149f7804a799 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,15 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
, libtool, libuv, luaPackages, ncurses, perl, pkgconfig
-, unibilium, makeWrapper, vimUtils, xsel, gperf, callPackage
-
-, withPython ? true, pythonPackages, extraPythonPackages ? []
-, withPython3 ? true, python3Packages, extraPython3Packages ? []
+, unibilium, vimUtils, xsel, gperf, callPackage
, withJemalloc ? true, jemalloc
-, withRuby ? true, bundlerEnv, ruby
-
-, withPyGUI ? false
-, vimAlias ? false
-, configure ? null
}:
with stdenv.lib;
@@ -40,59 +32,20 @@ let
description = "VT220/xterm/ECMA-48 terminal emulator library";
homepage = http://www.leonerd.org.uk/code/libvterm/;
license = licenses.mit;
- maintainers = with maintainers; [ nckx garbas ];
+ maintainers = with maintainers; [ garbas ];
platforms = platforms.unix;
};
};
- rubyEnv = bundlerEnv {
- name = "neovim-ruby-env";
- gemdir = ./ruby_provider;
- postBuild = ''
- ln -s ${ruby}/bin/* $out/bin
- '';
- };
- rubyWrapper = ''--cmd \"let g:ruby_host_prog='$out/bin/nvim-ruby'\" '';
-
- pluginPythonPackages = if configure == null then [] else builtins.concatLists
- (map ({ pythonDependencies ? [], ...}: pythonDependencies)
- (vimUtils.requiredPlugins configure));
- pythonEnv = pythonPackages.python.buildEnv.override {
- extraLibs = (
- if withPyGUI
- then [ pythonPackages.neovim_gui ]
- else [ pythonPackages.neovim ]
- ) ++ extraPythonPackages ++ pluginPythonPackages;
- ignoreCollisions = true;
- };
- pythonWrapper = ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '';
-
- pluginPython3Packages = if configure == null then [] else builtins.concatLists
- (map ({ python3Dependencies ? [], ...}: python3Dependencies)
- (vimUtils.requiredPlugins configure));
- python3Env = python3Packages.python.buildEnv.override {
- extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages ++ pluginPython3Packages;
- ignoreCollisions = true;
- };
- python3Wrapper = ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" '';
-
- additionalFlags =
- optionalString (withPython || withPython3 || withRuby)
- ''--add-flags "${(optionalString withPython pythonWrapper) +
- (optionalString withPython3 python3Wrapper) +
- (optionalString withRuby rubyWrapper)}" --unset PYTHONPATH '' +
- optionalString (withRuby)
- ''--suffix PATH : \"${rubyEnv}/bin\" --set GEM_HOME \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" '';
-
neovim = stdenv.mkDerivation rec {
- name = "neovim-${version}";
- version = "0.2.1";
+ name = "neovim-unwrapped-${version}";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
- sha256 = "19ppj0i59kk70j09gap6azm0jm4y95fr5fx7n9gx377y3xjs8h03";
+ sha256 = "1dxr29d0hyag7snbww5s40as90412qb61rgj7gd9rps1iccl9gv4";
};
enableParallelBuilding = true;
@@ -112,7 +65,6 @@ let
nativeBuildInputs = [
cmake
gettext
- makeWrapper
pkgconfig
];
@@ -139,17 +91,6 @@ let
install_name_tool -change libjemalloc.1.dylib \
${jemalloc}/lib/libjemalloc.1.dylib \
$out/bin/nvim
- '' + optionalString withPython ''
- ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
- '' + optionalString withPython3 ''
- ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3
- '' + optionalString withPython3 ''
- ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
- '' + optionalString withPyGUI ''
- makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \
- --prefix PATH : "$out/bin"
- '' + optionalString (withPython || withPython3 || withRuby) ''
- wrapProgram $out/bin/nvim ${additionalFlags}
'';
meta = {
@@ -174,20 +115,5 @@ let
};
};
-in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation {
- name = "neovim-${neovim.version}-configured";
- inherit (neovim) version meta;
-
- nativeBuildInputs = [ makeWrapper ];
-
- buildCommand = ''
- mkdir -p $out/bin
- for item in ${neovim}/bin/*; do
- ln -s $item $out/bin/
- done
- '' + optionalString vimAlias ''
- ln -s $out/bin/nvim $out/bin/vim
- '' + optionalString (configure != null) ''
- wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}"
- '';
-}
+in
+ neovim
diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
index 61df9ed79323..87b011c4f8b4 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
+++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
@@ -1,9 +1,9 @@
GEM
remote: https://rubygems.org/
specs:
- msgpack (1.1.0)
- multi_json (1.12.2)
- neovim (0.6.1)
+ msgpack (1.2.2)
+ multi_json (1.13.1)
+ neovim (0.6.2)
msgpack (~> 1.0)
multi_json (~> 1.0)
diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
index 85bff42b64dd..aefecbf5ba83 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
+++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
@@ -2,26 +2,26 @@
msgpack = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ck7w17d6b4jbb8inh1q57bghi9cjkiaxql1d3glmj1yavbpmlh7";
+ sha256 = "1ai0sfdv9jnr333fsvkn7a8vqvn0iwiw83yj603a3i68ds1x6di1";
type = "gem";
};
- version = "1.1.0";
+ version = "1.2.2";
};
multi_json = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";
+ sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
type = "gem";
};
- version = "1.12.2";
+ version = "1.13.1";
};
neovim = {
dependencies = ["msgpack" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dnv2pdl8lwwy4av8bqc6kdlgxw88dmajm4fkdk6hc7qdx1sw234";
+ sha256 = "15r3j9bwlpm1ry7cp6059xb0irvsvvlmw53i28z6sf2khwfj5j53";
type = "gem";
};
- version = "0.6.1";
+ version = "0.6.2";
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
new file mode 100644
index 000000000000..a27b5a41ac70
--- /dev/null
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -0,0 +1,110 @@
+{ stdenv, lib, makeDesktopItem, makeWrapper
+, vimUtils
+, bundlerEnv, ruby
+, pythonPackages
+, python3Packages
+}:
+with stdenv.lib;
+
+neovim:
+
+let
+ wrapper = {
+ name ? "neovim"
+ , withPython ? true, extraPythonPackages ? []
+ , withPython3 ? true, extraPython3Packages ? []
+ , withRuby ? true
+ , withPyGUI ? false
+ , vimAlias ? false
+ , viAlias ? false
+ , configure ? null
+ }:
+ let
+
+ rubyEnv = bundlerEnv {
+ name = "neovim-ruby-env";
+ gemdir = ./ruby_provider;
+ postBuild = ''
+ ln -sf ${ruby}/bin/* $out/bin
+ '';
+ };
+
+ pluginPythonPackages = if configure == null then [] else builtins.concatLists
+ (map ({ pythonDependencies ? [], ...}: pythonDependencies)
+ (vimUtils.requiredPlugins configure));
+ pythonEnv = pythonPackages.python.buildEnv.override {
+ extraLibs = (
+ if withPyGUI
+ then [ pythonPackages.neovim_gui ]
+ else [ pythonPackages.neovim ]
+ ) ++ extraPythonPackages ++ pluginPythonPackages;
+ ignoreCollisions = true;
+ };
+
+ pluginPython3Packages = if configure == null then [] else builtins.concatLists
+ (map ({ python3Dependencies ? [], ...}: python3Dependencies)
+ (vimUtils.requiredPlugins configure));
+ python3Env = python3Packages.python.buildEnv.override {
+ extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages ++ pluginPython3Packages;
+ ignoreCollisions = true;
+ };
+
+ in
+ stdenv.mkDerivation {
+ inherit name;
+ buildCommand = let bin="${neovim}/bin/nvim"; in ''
+ if [ ! -x "${bin}" ]
+ then
+ echo "cannot find executable file \`${bin}'"
+ exit 1
+ fi
+
+ makeWrapper "$(readlink -v --canonicalize-existing "${bin}")" \
+ "$out/bin/nvim" --add-flags " \
+ --cmd \"${if withPython then "let g:python_host_prog='$out/bin/nvim-python'" else "let g:loaded_python_provider = 1"}\" \
+ --cmd \"${if withPython3 then "let g:python3_host_prog='$out/bin/nvim-python3'" else "let g:loaded_python3_provider = 1"}\" \
+ --cmd \"${if withRuby then "let g:ruby_host_prog='$out/bin/nvim-ruby'" else "let g:loaded_ruby_provider=1"}\" " \
+ --unset PYTHONPATH \
+ ${optionalString withRuby '' --suffix PATH : ${rubyEnv}/bin --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' }
+
+ ''
+ + optionalString (!stdenv.isDarwin) ''
+ # copy and patch the original neovim.desktop file
+ mkdir -p $out/share/applications
+ substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \
+ --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \
+ --replace 'Name=Neovim' 'Name=WrappedNeovim'
+ ''
+ + optionalString withPython ''
+ ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
+ '' + optionalString withPython3 ''
+ ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3
+ '' + optionalString withRuby ''
+ ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
+ ''
+ + optionalString withPyGUI ''
+ makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \
+ --prefix PATH : "$out/bin"
+ '' + optionalString vimAlias ''
+ ln -s $out/bin/nvim $out/bin/vim
+ '' + optionalString viAlias ''
+ ln -s $out/bin/nvim $out/bin/vi
+ '' + optionalString (configure != null) ''
+ wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}"
+ ''
+ ;
+
+ preferLocalBuild = true;
+
+ buildInputs = [makeWrapper];
+ passthru = { unwrapped = neovim; };
+
+ meta = neovim.meta // {
+ description = neovim.meta.description;
+ hydraPlatforms = [];
+ # prefer wrapper over the package
+ priority = (neovim.meta.priority or 0) - 1;
+ };
+ };
+in
+ lib.makeOverridable wrapper
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index b508521790bf..6b7881c490cf 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,10 +1,13 @@
-{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl
-, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts, unzip, ant, jdk
-, gnumake, makeWrapper, pandoc
+{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost
+, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts
+, unzip, ant, jdk, gnumake, makeWrapper, pandoc
}:
let
- version = "1.1.383";
+ verMajor = "1";
+ verMinor = "1";
+ verPatch = "423";
+ version = "${verMajor}.${verMinor}.${verPatch}";
ginVer = "1.5";
gwtVer = "2.7.0";
in
@@ -15,50 +18,34 @@ stdenv.mkDerivation rec {
buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ];
- src = fetchurl {
- url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
- sha256 = "06680l9amq03b4jarmzfr605bijhb79fip9rk464zab6hgwqbp3f";
+ src = fetchFromGitHub {
+ owner = "rstudio";
+ repo = "rstudio";
+ rev = "v${version}";
+ sha256 = "02kpmzh0vr0gb5dhiwcm4gwjbc3biwz0km655mgzmx9j64cyd3nf";
};
# Hack RStudio to only use the input R.
- patches = [
- ./r-location.patch
- (fetchpatch {
- url = https://aur.archlinux.org/cgit/aur.git/plain/socketproxy-openssl.patch?h=rstudio-desktop-git;
- sha256 = "0ywq9rk14s5961l6hvd3cw70jsm73r16h0bsh4yp52vams7cwy9d";
- })
- ];
+ patches = [ ./r-location.patch ];
postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}";
- inherit ginVer;
ginSrc = fetchurl {
url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip";
sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm";
};
- inherit gwtVer;
gwtSrc = fetchurl {
url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip";
sha256 = "1cs78z9a1jg698j2n35wsy07cy4fxcia9gi00x0r0qc3fcdhcrda";
};
- hunspellDictionaries = builtins.attrValues hunspellDicts;
+ hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts);
mathJaxSrc = fetchurl {
url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip;
sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk";
};
- rmarkdownSrc = fetchurl {
- url = "https://github.com/rstudio/rmarkdown/archive/95b8b1fa64f78ca99f225a67fff9817103be56.zip";
- sha256 = "12fa65qr04rwsprkmyl651mkaqcbn1znwsmcjg4qsk9n5nxg0fah";
- };
-
- rsconnectSrc = fetchurl {
- url = "https://github.com/rstudio/rsconnect/archive/425f3767b3142bc6b81c9eb62c4722f1eedc9781.zip";
- sha256 = "1sgf9dj9wfk4c6n5p1jc45386pf0nj2alg2j9qx09av3can1dy9p";
- };
-
rstudiolibclang = fetchurl {
url = https://s3.amazonaws.com/rstudio-buildtools/libclang-3.5.zip;
sha256 = "1sl5vb8misipwbbbykdymw172w9qrh8xv3p29g0bf3nzbnv6zc7c";
@@ -71,29 +58,31 @@ stdenv.mkDerivation rec {
preConfigure =
''
+ export RSTUDIO_VERSION_MAJOR=${verMajor}
+ export RSTUDIO_VERSION_MINOR=${verMinor}
+ export RSTUDIO_VERSION_PATCH=${verPatch}
+
GWT_LIB_DIR=src/gwt/lib
- mkdir -p $GWT_LIB_DIR/gin/$ginVer
- unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer
+ mkdir -p $GWT_LIB_DIR/gin/${ginVer}
+ unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer}
- unzip $gwtSrc
+ unzip ${gwtSrc}
mkdir -p $GWT_LIB_DIR/gwt
- mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer
+ mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer}
mkdir dependencies/common/dictionaries
- for dict in $hunspellDictionaries; do
- for i in "$dict/share/hunspell/"*
- do ln -sv $i dependencies/common/dictionaries/
- done
+ for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do
+ for i in "$dict/share/hunspell/"*; do
+ ln -sv $i dependencies/common/dictionaries/
+ done
done
- unzip $mathJaxSrc -d dependencies/common/mathjax-26
- unzip $rmarkdownSrc -d dependencies/common/rmarkdown
- unzip $rsconnectSrc -d dependencies/common/rsconnect
+ unzip ${mathJaxSrc} -d dependencies/common/mathjax-26
mkdir -p dependencies/common/libclang/3.5
- unzip $rstudiolibclang -d dependencies/common/libclang/3.5
+ unzip ${rstudiolibclang} -d dependencies/common/libclang/3.5
mkdir -p dependencies/common/libclang/builtin-headers
- unzip $rstudiolibclangheaders -d dependencies/common/libclang/builtin-headers
+ unzip ${rstudiolibclangheaders} -d dependencies/common/libclang/builtin-headers
mkdir -p dependencies/common/pandoc
cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
@@ -124,7 +113,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib;
{ description = "Set of integrated tools for the R language";
- homepage = http://www.rstudio.com/;
+ homepage = https://www.rstudio.com/;
license = licenses.agpl3;
maintainers = with maintainers; [ ehmry changlinli ciil ];
platforms = platforms.linux;
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 0c716ed63c14..a6f454deaf5c 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -6,10 +6,10 @@
stdenv.mkDerivation rec {
name = "sigil-${version}";
- version = "0.9.7";
+ version = "0.9.9";
src = fetchFromGitHub {
- sha256 = "17m2f7pj2sx5rxrbry6wk1lvviy8fi2m270h47sisywnrhddarh7";
+ sha256 = "01pvc7k54mx5c7h1qiw92d4j459psv7n9xg94qbinf8vmpvkrcbw";
rev = version;
repo = "Sigil";
owner = "Sigil-Ebook";
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 76c8e4ae0e44..c5f691e95c24 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -1,23 +1,26 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig, poppler }:
+{ stdenv, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }:
stdenv.mkDerivation rec {
pname = "texmaker";
- version = "4.5";
+ version = "5.0.2";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
- sha256 = "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c";
+ sha256 = "0y81mjm89b99pr9svcwpaf4iz2q9pc9hjas5kiwd1pbgl5vqskm9";
};
- buildInputs = [ qt4 poppler_qt4 zlib ];
- nativeBuildInputs = [ pkgconfig poppler qmake4Hook ];
+ buildInputs = [ qtbase qtscript poppler zlib ];
+ nativeBuildInputs = [ pkgconfig poppler qmake ];
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
preConfigure = ''
- qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps"
+ qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps METAINFODIR=$out/share/metainfo"
'';
+
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "TeX and LaTeX editor";
longDescription=''
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 52223dafeb7f..03505ec11a5f 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig}:
+{ stdenv, fetchurl, qt5, poppler_qt5, zlib, pkgconfig}:
stdenv.mkDerivation rec {
pname = "texstudio";
- version = "2.12.4";
+ version = "2.12.6";
name = "${pname}-${version}";
altname="Texstudio";
src = fetchurl {
url = "mirror://sourceforge/texstudio/${name}.tar.gz";
- sha256 = "03917faqyy0a1k6b86blc2fcards5a1819ydgkc4jlhwiaym4iyw";
+ sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd";
};
- nativeBuildInputs = [ qmake4Hook pkgconfig ];
- buildInputs = [ qt4 poppler_qt4 zlib ];
+ nativeBuildInputs = [ qt5.qmake pkgconfig ];
+ buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ];
qmakeFlags = [ "NO_APPDATA=True" ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://texstudio.sourceforge.net;
license = licenses.gpl2Plus;
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ cfouche ];
};
}
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index d1c0ab274f06..bd08d599755a 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,17 +1,15 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake
, python, qtbase, qttools, zlib }:
-let
-# qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "tiled-${version}";
- version = "1.0.3";
+ version = "1.1.3";
src = fetchFromGitHub {
owner = "bjorn";
repo = "tiled";
rev = "v${version}";
- sha256 = "1j8307h7xkxqwr8rpr9fn1svm5h10k61w6zxr4sgph1hiv8x33aa";
+ sha256 = "0rf50w7nkdm70999q1mj7sy5hyjj41qjf4izi849q9a7xnhddv44";
};
nativeBuildInputs = [ pkgconfig qmake ];
@@ -26,7 +24,7 @@ in stdenv.mkDerivation rec {
bsd2 # libtiled and tmxviewer
gpl2Plus # all the rest
];
+ maintainers = with maintainers; [ dywedir ];
platforms = platforms.linux;
- maintainers = [ maintainers.nckx ];
};
}
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index b20a6e5ec45c..7c6d186b8830 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -3,18 +3,18 @@
stdenv.mkDerivation rec {
name = "typora-${version}";
- version = "0.9.38";
+ version = "0.9.44";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "bf6a069c5da4a7dc289bdb3c8d27e7a81daeaee99488d4d3b512c6b673780557";
+ sha256 = "9442c090bf2619d270890228abd7dabb9e217c0b200615f8ed3cb255efd122d5";
}
else
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_i386.deb";
- sha256 = "edd092e96ebf69503cf6b39b77a61ec5e3185f8a1447da0bed063fa11861c1b9";
+ sha256 = "ae228ca946d03940b85df30c995c4de3f942a780e32d4dcab872dec671c66ef3";
}
;
diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix
index 273ef33250fc..98f45f6be02d 100644
--- a/pkgs/applications/editors/vanubi/default.nix
+++ b/pkgs/applications/editors/vanubi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, vala_0_26, which, autoconf, automake
+{ stdenv, fetchurl, pkgconfig, vala_0_28, which, autoconf, automake
, libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ vala_0_26 which autoconf automake
+ buildInputs = [ vala_0_28 which autoconf automake
libtool glib gtk3 libwnck3 asciidoc
gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ];
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix
index becb5ccc29a1..8d3a5353c989 100644
--- a/pkgs/applications/editors/vbindiff/default.nix
+++ b/pkgs/applications/editors/vbindiff/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
name = "vbindiff-${version}";
- version = "3.0_beta4";
+ version = "3.0_beta5";
buildInputs = [ ncurses ];
src = fetchurl {
- url = "http://www.cjmweb.net/vbindiff/${name}.tar.gz";
- sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx";
+ url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz";
+ sha256 = "1f1kj4jki08bnrwpzi663mjfkrx4wnfpzdfwd2qgijlkx5ysjkgh";
};
meta = {
description = "A terminal visual binary diff viewer";
- homepage = http://www.cjmweb.net/vbindiff/;
+ homepage = https://www.cjmweb.net/vbindiff/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 417f2d805163..00b2b23c6f47 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
- version = "8.0.1257";
+ version = "8.0.1605";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
- sha256 = "1y4c7wn5gr7n4c2ni36kadr26aldydxlf06yj7nsmw22ywwg78ig";
+ sha256 = "0a8zf43q806py14vq1frm350wycn47cmanj1hn1i7bqx1gdgcal9";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 2f110749277c..067179974b1e 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
"vim_cv_toupper_broken=no"
"--with-tlib=ncurses"
"vim_cv_terminfo=yes"
+ "vim_cv_tgetent=zero" # it does on native anyway
"vim_cv_tty_group=tty"
"vim_cv_tty_mode=0660"
"vim_cv_getcwd_broken=no"
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 144fb5428a51..b6c03a57b561 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -103,6 +103,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
+ broken = true; # needs ruby 2.2
description = "Vim - the text editor - for macOS";
homepage = https://github.com/b4winckler/macvim;
license = licenses.vim;
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index eef1746ff380..0db93f78781d 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "vis-${version}";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
rev = "v${version}";
- sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk";
+ sha256 = "1crsg3ssqv4xix9z16hwl0zyx7hxk686s52zmrp7yfak3m5igf9k";
repo = "vis";
owner = "martanne";
};
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 66ff8b5a91c8..a8b38012a131 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
let
- version = "1.18.0";
+ version = "1.21.1";
channel = "stable";
plat = {
@@ -12,9 +12,9 @@ let
}.${stdenv.system};
sha256 = {
- "i686-linux" = "0xwfnw15792lxr5npc71yyw5yyaqi3nifqgv6vpi8ibl6c8zs97d";
- "x86_64-linux" = "0qzj2qrzbdk27mggh0f9fs3s99bffvnrnbsparbzdag5jjmry2py";
- "x86_64-darwin" = "1g5rf6g9q9hh4gzg6nb37pyq9dpjj0wapivv5dsvmn0j3cp69cv4";
+ "i686-linux" = "0c5wh6i4yl601hg0r1c8y25lz7j2p4vhisdnvnx9nzd6v4ib27cj";
+ "x86_64-linux" = "19i0wkl0qccq2cm10khy0xxb53a6g2m061g71y54s4cxb4wimc9l";
+ "x86_64-darwin" = "0d1ws4c3n80gypiarqbylyipg273ssc0m29jnrg7hx1mcy5ljb1i";
}.${stdenv.system};
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
@@ -79,7 +79,7 @@ in
patchelf \
--set-rpath "${rpath}" \
- $out/lib/vscode/resources/app/node_modules/keytar/build/Release/keytar.node
+ $out/lib/vscode/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node
ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0
'';
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index ad294480e60b..85d9b0546d62 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -1,25 +1,35 @@
-{ stdenv, fetchurl, wxGTK, autoconf, automake, libtool, python, gettext, bash }:
+{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext, bash }:
stdenv.mkDerivation rec {
name = "wxHexEditor-${version}";
- version = "v0.22";
+ version = "v0.24";
- src = fetchurl {
- url = "mirror://sourceforge/wxhexeditor/${name}-src.tar.bz2";
- sha256 = "15ir038g4lyw1q5bsay974hvj0nkg2yd9kccwxz808cd45fp411w";
+ src = fetchFromGitHub {
+ repo = "wxHexEditor";
+ owner = "EUA";
+ rev = version;
+ sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
};
buildInputs = [ wxGTK autoconf automake libtool python gettext ];
- patchPhase = ''
- substituteInPlace Makefile --replace "/usr/local" "$out"
+ preConfigure = "patchShebangs .";
+
+ prePatch = ''
+ substituteInPlace Makefile --replace "/usr" "$out"
substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out"
- substituteInPlace udis86/autogen.sh --replace "/bin/bash" "${bash}/bin/bash"
'';
+ patches = [
+ # https://github.com/EUA/wxHexEditor/issues/90
+ (fetchpatch {
+ url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch;
+ sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj";
+ })
+ ];
+
buildPhase = ''
make OPTFLAGS="-fopenmp"
-
'';
meta = {
diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix
deleted file mode 100644
index bcf262957bc5..000000000000
--- a/pkgs/applications/editors/zed/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ stdenv, buildEnv, fetchgit, makeWrapper, writeScript, fetchurl, zip, pkgs
-, node_webkit }:
-
-let
- name = "zed-${version}";
- version = "1.1.0";
-
- nodePackages = import ./node.nix {
- inherit pkgs;
- system = stdenv.system;
- };
-
- node_env = buildEnv {
- name = "node_env";
- paths = [ nodePackages."body-parser-~1.6.3" nodePackages."express-~4.8.3"
- nodePackages."request-~2.34.0" nodePackages."tar-~0.1.19"
- nodePackages."ws-~0.4.32" ];
- pathsToLink = [ "/lib" ];
- ignoreCollisions = true;
- };
-
- zed = stdenv.mkDerivation rec {
- inherit name version;
-
- src = fetchgit {
- url = "git://github.com/zedapp/zed";
- rev = "refs/tags/v${version}";
- sha256 = "1zvlngv73h968jd2m42ylr9vfhf35n80wzy616cv2ic7gmr1fl9p";
- };
-
- buildInputs = [ makeWrapper zip ];
-
- dontBuild = true;
-
- installPhase = ''
- export NWPATH="${node_webkit}/share/node-webkit";
-
- mkdir -p $out/zed
-
- cd ${src}/app; zip -r $out/zed/app.nw *; cd ..
-
- cat $NWPATH/nw $out/zed/app.nw > $out/zed/zed-bin
- cp $NWPATH/nw.pak $out/zed/
- cp nw/zed-linux $out/zed/zed
- chmod +x $out/zed/zed*
- cp Zed.desktop.tmpl Zed.svg Zed.png $out/zed
- rm $out/zed/app.nw
- '';
-
- postFixup = ''
- wrapProgram $out/zed/zed-bin \
- --prefix NODE_PATH : ${node_env}/lib/node_modules
- '';
- };
-
- zed_script = writeScript "zed.sh" ''
- if [[ $1 == http://* ]] || [[ $1 == https://* ]]; then
- PROJECT=$1
- elif [ "" != "$1" ]; then
- PROJECT=$(readlink -f $1)
- fi
- ${zed}/zed/zed-bin $PROJECT
- '';
-
-in stdenv.mkDerivation rec {
- inherit name version;
-
- src = zed;
-
- installPhase = ''
- mkdir -p $out/bin
- ln -s ${zed_script} $out/bin/zed
- '';
-
- meta = with stdenv.lib; {
- description = "A fully offline-capable, open source, keyboard-focused, text and code editor for power users";
- license = licenses.mit;
- homepage = http://zedapp.org/;
- maintainers = with maintainers; [ matejc ma27 ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/editors/zed/deps.json b/pkgs/applications/editors/zed/deps.json
deleted file mode 100644
index d3a7708d156f..000000000000
--- a/pkgs/applications/editors/zed/deps.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[ { "body-parser": "~1.6.3" }
-, { "express": "~4.8.3" }
-, { "request": "~2.34.0" }
-, { "tar": "~0.1.19" }
-, { "ws": "~0.4.32" }
-]
diff --git a/pkgs/applications/editors/zed/deps.sh b/pkgs/applications/editors/zed/deps.sh
deleted file mode 100755
index 6d2bf29532e9..000000000000
--- a/pkgs/applications/editors/zed/deps.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix
-
-node2nix -6 -i deps.json \
- -e ../../../development/node-packages/node-env.nix \
- --no-copy-node-env \
- -c node.nix
diff --git a/pkgs/applications/editors/zed/node-packages.nix b/pkgs/applications/editors/zed/node-packages.nix
deleted file mode 100644
index 5aaa75b6c914..000000000000
--- a/pkgs/applications/editors/zed/node-packages.nix
+++ /dev/null
@@ -1,877 +0,0 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
-
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
-
-let
- sources = {
- "bytes-1.0.0" = {
- name = "bytes";
- packageName = "bytes";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
- sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
- };
- };
- "depd-0.4.4" = {
- name = "depd";
- packageName = "depd";
- version = "0.4.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
- sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
- };
- };
- "iconv-lite-0.4.4" = {
- name = "iconv-lite";
- packageName = "iconv-lite";
- version = "0.4.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
- sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
- };
- };
- "media-typer-0.2.0" = {
- name = "media-typer";
- packageName = "media-typer";
- version = "0.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
- sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
- };
- };
- "on-finished-2.1.0" = {
- name = "on-finished";
- packageName = "on-finished";
- version = "2.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
- sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
- };
- };
- "qs-2.2.2" = {
- name = "qs";
- packageName = "qs";
- version = "2.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz";
- sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c";
- };
- };
- "raw-body-1.3.0" = {
- name = "raw-body";
- packageName = "raw-body";
- version = "1.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
- sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
- };
- };
- "type-is-1.3.2" = {
- name = "type-is";
- packageName = "type-is";
- version = "1.3.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
- sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
- };
- };
- "ee-first-1.0.5" = {
- name = "ee-first";
- packageName = "ee-first";
- version = "1.0.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
- sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
- };
- };
- "mime-types-1.0.2" = {
- name = "mime-types";
- packageName = "mime-types";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
- sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
- };
- };
- "accepts-1.0.7" = {
- name = "accepts";
- packageName = "accepts";
- version = "1.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
- sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
- };
- };
- "buffer-crc32-0.2.3" = {
- name = "buffer-crc32";
- packageName = "buffer-crc32";
- version = "0.2.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
- sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
- };
- };
- "debug-1.0.4" = {
- name = "debug";
- packageName = "debug";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
- sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
- };
- };
- "escape-html-1.0.1" = {
- name = "escape-html";
- packageName = "escape-html";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
- sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
- };
- };
- "finalhandler-0.1.0" = {
- name = "finalhandler";
- packageName = "finalhandler";
- version = "0.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz";
- sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa";
- };
- };
- "methods-1.1.0" = {
- name = "methods";
- packageName = "methods";
- version = "1.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
- sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
- };
- };
- "parseurl-1.3.2" = {
- name = "parseurl";
- packageName = "parseurl";
- version = "1.3.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz";
- sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
- };
- };
- "path-to-regexp-0.1.3" = {
- name = "path-to-regexp";
- packageName = "path-to-regexp";
- version = "0.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
- sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
- };
- };
- "proxy-addr-1.0.1" = {
- name = "proxy-addr";
- packageName = "proxy-addr";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
- sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
- };
- };
- "range-parser-1.0.0" = {
- name = "range-parser";
- packageName = "range-parser";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
- sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
- };
- };
- "send-0.8.5" = {
- name = "send";
- packageName = "send";
- version = "0.8.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/send/-/send-0.8.5.tgz";
- sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7";
- };
- };
- "serve-static-1.5.4" = {
- name = "serve-static";
- packageName = "serve-static";
- version = "1.5.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz";
- sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782";
- };
- };
- "vary-0.1.0" = {
- name = "vary";
- packageName = "vary";
- version = "0.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
- sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
- };
- };
- "cookie-0.1.2" = {
- name = "cookie";
- packageName = "cookie";
- version = "0.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
- sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
- };
- };
- "fresh-0.2.2" = {
- name = "fresh";
- packageName = "fresh";
- version = "0.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
- sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
- };
- };
- "cookie-signature-1.0.4" = {
- name = "cookie-signature";
- packageName = "cookie-signature";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
- sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
- };
- };
- "merge-descriptors-0.0.2" = {
- name = "merge-descriptors";
- packageName = "merge-descriptors";
- version = "0.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
- sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
- };
- };
- "utils-merge-1.0.0" = {
- name = "utils-merge";
- packageName = "utils-merge";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
- sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
- };
- };
- "negotiator-0.4.7" = {
- name = "negotiator";
- packageName = "negotiator";
- version = "0.4.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
- sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
- };
- };
- "ms-0.6.2" = {
- name = "ms";
- packageName = "ms";
- version = "0.6.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
- sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
- };
- };
- "ipaddr.js-0.1.2" = {
- name = "ipaddr.js";
- packageName = "ipaddr.js";
- version = "0.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
- sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
- };
- };
- "destroy-1.0.3" = {
- name = "destroy";
- packageName = "destroy";
- version = "1.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
- sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
- };
- };
- "mime-1.2.11" = {
- name = "mime";
- packageName = "mime";
- version = "1.2.11";
- src = fetchurl {
- url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
- sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
- };
- };
- "qs-0.6.6" = {
- name = "qs";
- packageName = "qs";
- version = "0.6.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
- sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
- };
- };
- "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";
- };
- };
- "forever-agent-0.5.2" = {
- name = "forever-agent";
- packageName = "forever-agent";
- version = "0.5.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
- sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
- };
- };
- "node-uuid-1.4.8" = {
- name = "node-uuid";
- packageName = "node-uuid";
- version = "1.4.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
- sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
- };
- };
- "tough-cookie-2.3.3" = {
- name = "tough-cookie";
- packageName = "tough-cookie";
- version = "2.3.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
- sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
- };
- };
- "form-data-0.1.4" = {
- name = "form-data";
- packageName = "form-data";
- version = "0.1.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
- sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
- };
- };
- "tunnel-agent-0.3.0" = {
- name = "tunnel-agent";
- packageName = "tunnel-agent";
- version = "0.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
- sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
- };
- };
- "http-signature-0.10.1" = {
- name = "http-signature";
- packageName = "http-signature";
- version = "0.10.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
- sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
- };
- };
- "oauth-sign-0.3.0" = {
- name = "oauth-sign";
- packageName = "oauth-sign";
- version = "0.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
- sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
- };
- };
- "hawk-1.0.0" = {
- name = "hawk";
- packageName = "hawk";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
- sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
- };
- };
- "aws-sign2-0.5.0" = {
- name = "aws-sign2";
- packageName = "aws-sign2";
- version = "0.5.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
- sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
- };
- };
- "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";
- };
- };
- "combined-stream-0.0.7" = {
- name = "combined-stream";
- packageName = "combined-stream";
- version = "0.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
- sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
- };
- };
- "async-0.9.2" = {
- name = "async";
- packageName = "async";
- version = "0.9.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
- sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
- };
- };
- "delayed-stream-0.0.5" = {
- name = "delayed-stream";
- packageName = "delayed-stream";
- version = "0.0.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
- sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
- };
- };
- "assert-plus-0.1.5" = {
- name = "assert-plus";
- packageName = "assert-plus";
- version = "0.1.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
- sha1 = "ee74009413002d84cec7219c6ac811812e723160";
- };
- };
- "asn1-0.1.11" = {
- name = "asn1";
- packageName = "asn1";
- version = "0.1.11";
- src = fetchurl {
- url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
- sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
- };
- };
- "ctype-0.5.3" = {
- name = "ctype";
- packageName = "ctype";
- version = "0.5.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
- sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
- };
- };
- "hoek-0.9.1" = {
- name = "hoek";
- packageName = "hoek";
- version = "0.9.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
- sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
- };
- };
- "boom-0.4.2" = {
- name = "boom";
- packageName = "boom";
- version = "0.4.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
- sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
- };
- };
- "cryptiles-0.2.2" = {
- name = "cryptiles";
- packageName = "cryptiles";
- version = "0.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
- sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
- };
- };
- "sntp-0.2.4" = {
- name = "sntp";
- packageName = "sntp";
- version = "0.2.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
- sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
- };
- };
- "block-stream-0.0.9" = {
- name = "block-stream";
- packageName = "block-stream";
- version = "0.0.9";
- src = fetchurl {
- url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
- sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
- };
- };
- "fstream-0.1.31" = {
- name = "fstream";
- packageName = "fstream";
- version = "0.1.31";
- src = fetchurl {
- url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
- sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
- };
- };
- "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";
- };
- };
- "graceful-fs-3.0.11" = {
- name = "graceful-fs";
- packageName = "graceful-fs";
- version = "3.0.11";
- src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
- sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
- };
- };
- "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";
- };
- };
- "rimraf-2.6.2" = {
- name = "rimraf";
- packageName = "rimraf";
- version = "2.6.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
- sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
- };
- };
- "natives-1.1.0" = {
- name = "natives";
- packageName = "natives";
- version = "1.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz";
- sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31";
- };
- };
- "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";
- };
- };
- "glob-7.1.2" = {
- name = "glob";
- packageName = "glob";
- version = "7.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
- sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
- };
- };
- "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";
- };
- };
- "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";
- };
- };
- "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 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
- };
- };
- "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";
- };
- };
- "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";
- };
- };
- "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";
- };
- };
- "brace-expansion-1.1.8" = {
- name = "brace-expansion";
- packageName = "brace-expansion";
- version = "1.1.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
- sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
- };
- };
- "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";
- };
- };
- "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";
- };
- };
- "commander-2.1.0" = {
- name = "commander";
- packageName = "commander";
- version = "2.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
- sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
- };
- };
- "nan-1.0.0" = {
- name = "nan";
- packageName = "nan";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
- sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
- };
- };
- "tinycolor-0.0.1" = {
- name = "tinycolor";
- packageName = "tinycolor";
- version = "0.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
- sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
- };
- };
- "options-0.0.6" = {
- name = "options";
- packageName = "options";
- version = "0.0.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
- sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
- };
- };
- };
-in
-{
- "body-parser-~1.6.3" = nodeEnv.buildNodePackage {
- name = "body-parser";
- packageName = "body-parser";
- version = "1.6.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz";
- sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
- };
- dependencies = [
- sources."bytes-1.0.0"
- sources."depd-0.4.4"
- sources."iconv-lite-0.4.4"
- sources."media-typer-0.2.0"
- sources."on-finished-2.1.0"
- sources."qs-2.2.2"
- sources."raw-body-1.3.0"
- sources."type-is-1.3.2"
- sources."ee-first-1.0.5"
- sources."mime-types-1.0.2"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "Node.js body parsing middleware";
- homepage = https://github.com/expressjs/body-parser;
- license = "MIT";
- };
- production = true;
- };
- "express-~4.8.3" = nodeEnv.buildNodePackage {
- name = "express";
- packageName = "express";
- version = "4.8.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/express/-/express-4.8.8.tgz";
- sha1 = "6aba348ccdfa87608040b12ca0010107a0aac28e";
- };
- dependencies = [
- sources."accepts-1.0.7"
- sources."buffer-crc32-0.2.3"
- sources."debug-1.0.4"
- sources."depd-0.4.4"
- sources."escape-html-1.0.1"
- sources."finalhandler-0.1.0"
- sources."media-typer-0.2.0"
- sources."methods-1.1.0"
- sources."parseurl-1.3.2"
- sources."path-to-regexp-0.1.3"
- sources."proxy-addr-1.0.1"
- sources."qs-2.2.2"
- sources."range-parser-1.0.0"
- sources."send-0.8.5"
- sources."serve-static-1.5.4"
- sources."type-is-1.3.2"
- sources."vary-0.1.0"
- sources."cookie-0.1.2"
- sources."fresh-0.2.2"
- sources."cookie-signature-1.0.4"
- sources."merge-descriptors-0.0.2"
- sources."utils-merge-1.0.0"
- sources."mime-types-1.0.2"
- sources."negotiator-0.4.7"
- sources."ms-0.6.2"
- sources."ipaddr.js-0.1.2"
- sources."destroy-1.0.3"
- sources."mime-1.2.11"
- sources."on-finished-2.1.0"
- sources."ee-first-1.0.5"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "Fast, unopinionated, minimalist web framework";
- homepage = http://expressjs.com/;
- license = "MIT";
- };
- production = true;
- };
- "request-~2.34.0" = nodeEnv.buildNodePackage {
- name = "request";
- packageName = "request";
- version = "2.34.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.34.0.tgz";
- sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
- };
- dependencies = [
- sources."qs-0.6.6"
- sources."json-stringify-safe-5.0.1"
- sources."forever-agent-0.5.2"
- sources."node-uuid-1.4.8"
- sources."mime-1.2.11"
- sources."tough-cookie-2.3.3"
- sources."form-data-0.1.4"
- sources."tunnel-agent-0.3.0"
- sources."http-signature-0.10.1"
- sources."oauth-sign-0.3.0"
- sources."hawk-1.0.0"
- sources."aws-sign2-0.5.0"
- sources."punycode-1.4.1"
- sources."combined-stream-0.0.7"
- sources."async-0.9.2"
- sources."delayed-stream-0.0.5"
- sources."assert-plus-0.1.5"
- sources."asn1-0.1.11"
- sources."ctype-0.5.3"
- sources."hoek-0.9.1"
- sources."boom-0.4.2"
- sources."cryptiles-0.2.2"
- sources."sntp-0.2.4"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "Simplified HTTP request client.";
- homepage = https://github.com/mikeal/request;
- license = "Apache, Version 2.0";
- };
- production = true;
- };
- "tar-~0.1.19" = nodeEnv.buildNodePackage {
- name = "tar";
- packageName = "tar";
- version = "0.1.20";
- src = fetchurl {
- url = "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
- sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
- };
- dependencies = [
- sources."block-stream-0.0.9"
- sources."fstream-0.1.31"
- sources."inherits-2.0.3"
- sources."graceful-fs-3.0.11"
- sources."mkdirp-0.5.1"
- sources."rimraf-2.6.2"
- sources."natives-1.1.0"
- sources."minimist-0.0.8"
- sources."glob-7.1.2"
- sources."fs.realpath-1.0.0"
- sources."inflight-1.0.6"
- sources."minimatch-3.0.4"
- sources."once-1.4.0"
- sources."path-is-absolute-1.0.1"
- sources."wrappy-1.0.2"
- sources."brace-expansion-1.1.8"
- sources."balanced-match-1.0.0"
- sources."concat-map-0.0.1"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "tar for node";
- homepage = https://github.com/isaacs/node-tar;
- license = "BSD";
- };
- production = true;
- };
- "ws-~0.4.32" = nodeEnv.buildNodePackage {
- name = "ws";
- packageName = "ws";
- version = "0.4.32";
- src = fetchurl {
- url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
- sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
- };
- dependencies = [
- sources."commander-2.1.0"
- sources."nan-1.0.0"
- sources."tinycolor-0.0.1"
- sources."options-0.0.6"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "simple to use, blazing fast and thoroughly tested websocket client, server and console for node.js, up-to-date against RFC-6455";
- homepage = https://github.com/einaros/ws;
- };
- production = true;
- };
-}
\ No newline at end of file
diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix
deleted file mode 100644
index ff0bf1eb8056..000000000000
--- a/pkgs/applications/editors/zed/node.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
-
-{pkgs ? import {
- inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
-
-let
- nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
- inherit nodejs;
- };
-in
-import ./node-packages.nix {
- inherit (pkgs) fetchurl fetchgit;
- inherit nodeEnv;
-}
\ No newline at end of file
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 3382bb3e56d7..987b544c5565 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -4,15 +4,15 @@
}:
stdenv.mkDerivation {
- name = "grass-7.0.2";
+ name = "grass-7.2.2";
src = fetchurl {
- url = http://grass.osgeo.org/grass70/source/grass-7.0.2.tar.gz;
- sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf";
+ url = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz;
+ sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo
- readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ]
+ readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ]
++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
configureFlags = [
@@ -22,9 +22,12 @@ stdenv.mkDerivation {
"--with-wxwidgets"
"--with-netcdf"
"--with-geos"
- "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/"
+ "--with-postgres"
+ "--with-postgres-libs=${postgresql.lib}/lib/"
# it complains about missing libmysqld but doesn't really seem to need it
- "--with-mysql" "--with-mysql-includes=${stdenv.lib.getDev mysql.client}/include/mysql"
+ "--with-mysql"
+ "--with-mysql-includes=${mysql.connector-c}/include/mysql"
+ "--with-mysql-libs=${mysql.connector-c}/lib/mysql"
"--with-blas"
];
@@ -40,17 +43,20 @@ stdenv.mkDerivation {
scripts/r.pack/r.pack.py \
scripts/r.tileset/r.tileset.py \
scripts/r.unpack/r.unpack.py \
- scripts/v.krige/v.krige.py \
scripts/v.rast.stats/v.rast.stats.py \
scripts/v.to.lines/v.to.lines.py \
scripts/v.what.strds/v.what.strds.py \
scripts/v.unpack/v.unpack.py \
scripts/wxpyimgview/*.py \
gui/wxpython/animation/g.gui.animation.py \
+ gui/wxpython/datacatalog/g.gui.datacatalog.py \
gui/wxpython/rlisetup/g.gui.rlisetup.py \
gui/wxpython/vdigit/g.gui.vdigit.py \
temporal/t.rast.accumulate/t.rast.accumulate.py \
temporal/t.rast.accdetect/t.rast.accdetect.py \
+ temporal/t.rast.algebra/t.rast.algebra.py \
+ temporal/t.rast3d.algebra/t.rast3d.algebra.py \
+ temporal/t.vect.algebra/t.vect.algebra.py \
temporal/t.select/t.select.py
for d in gui lib scripts temporal tools; do
patchShebangs $d
@@ -58,7 +64,7 @@ stdenv.mkDerivation {
'';
postInstall = ''
- wrapProgram $out/bin/grass70 \
+ wrapProgram $out/bin/grass72 \
--set PYTHONPATH $PYTHONPATH \
--set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \
--suffix LD_LIBRARY_PATH ':' '${gdal}/lib'
@@ -72,6 +78,5 @@ stdenv.mkDerivation {
description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
- broken = true;
};
}
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index a008835f59ff..c2a09a507cc5 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "qgis-2.18.13";
+ name = "qgis-2.18.16";
buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
@@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ];
+ # `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`:
# fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory
- #enableParallelBuilding = true;
+ enableParallelBuilding = false;
# To handle the lack of 'local' RPATH; required, as they call one of
# their built binaries requiring their libs, in the build process.
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://qgis.org/downloads/${name}.tar.bz2";
- sha256 = "033l3wg3l7hv4642wmsdycjca1dw8p89sk9xyc51wpb3id17vgv2";
+ sha256 = "0d880m013kzi4qiyr27yjx6hzpb652slp66gyqgw9ziw03wy12c9";
};
cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 4d229450a4a7..847421de3b1f 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -2,15 +2,15 @@
libharu, opencv, vigra, postgresql }:
stdenv.mkDerivation rec {
- name = "saga-5.0.0";
+ name = "saga-6.2.0";
buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ];
enableParallelBuilding = true;
src = fetchurl {
- url = "mirror://sourceforge/project/saga-gis/SAGA%20-%205/SAGA%20-%205.0.0/saga-5.0.0.tar.gz";
- sha256 = "9be997209737e80262d9f13fd9b9797194a9f2facb10e5b9bd756d8cda675089";
+ url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.2.0/saga-6.2.0.tar.gz";
+ sha256 = "91b030892c894ba02eb4292ebfc9ccbf4acf3062118f2a89a9a11208773fa280";
};
meta = {
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 973e7f88e800..e716146ec7a9 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
, ApplicationServices
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "7.0.7-9";
- sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w";
+ version = "7.0.7-22";
+ sha256 = "1ad7mwx48xrkvm3v060n2f67kmi0qk7gfql1shiwbkkjvzzaaiam";
patches = [];
};
in
@@ -24,13 +24,10 @@ stdenv.mkDerivation rec {
name = "imagemagick-${version}";
inherit (cfg) version;
- src = fetchurl {
- urls = [
- "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
- # the original source above removes tarballs quickly
- "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
- "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz"
- ];
+ src = fetchFromGitHub {
+ owner = "ImageMagick";
+ repo = "ImageMagick";
+ rev = cfg.version;
inherit (cfg) sha256;
};
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 507912ee43ea..be3a369c28b6 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
, ApplicationServices
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "6.9.9-21";
- sha256 = "0241g3c207rawn61bz8rc5gz55k5mi2b0n3zlwa0jv9xczlkd6a9";
+ version = "6.9.9-34";
+ sha256 = "0sqrgyfi7i7x1akna95c1qhk9sxxswzm3pkssfi4w6v7bn24g25g";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
@@ -36,13 +36,10 @@ stdenv.mkDerivation rec {
name = "imagemagick-${version}";
inherit (cfg) version;
- src = fetchurl {
- urls = [
- "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
- # the original source above removes tarballs quickly
- "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
- "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz"
- ];
+ src = fetchFromGitHub {
+ owner = "ImageMagick";
+ repo = "ImageMagick";
+ rev = cfg.version;
inherit (cfg) sha256;
};
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 2d42a479999b..b7647803b3d3 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -37,7 +37,9 @@ stdenv.mkDerivation rec {
description = "A GTK2 image viewer, manga reader, and booru browser";
maintainers = with maintainers; [ skrzyp xzfc ];
license = licenses.mit;
- platforms = platforms.allBut [ "darwin" "cygwin" ];
+ # Unintentionally not working on Darwin:
+ # https://github.com/ahodesuka/ahoviewer/issues/62
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index b7d9f4a81599..334a5a33dadf 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, libpng, python3, boost, mesa, qtbase, ncurses, cmake, flex, lemon }:
+{ stdenv, fetchFromGitHub, libpng, python3, boost, libGLU_combined, qtbase, ncurses, cmake, flex, lemon }:
let
- gitRev = "e8480c718e8c49ae3cc2d7af10ea93ea4c2fff9a";
+ gitRev = "020910c25614a3752383511ede5a1f5551a8bd39";
gitBranch = "master";
- gitTag = "0.9.2";
-in
+ gitTag = "0.9.3";
+in
stdenv.mkDerivation rec {
name = "antimony-${version}";
version = gitTag;
@@ -13,7 +13,7 @@ in
owner = "mkeeter";
repo = "antimony";
rev = gitTag;
- sha256 = "0fpgy5cb4knz2z9q078206k8wzxfs8b9g76mf4bz1ic77931ykjz";
+ sha256 = "1vm5h5py8l3b8h4pbmm8s3wlxvlw492xfwnlwx0nvl0cjs8ba6r4";
};
patches = [ ./paths-fix.patch ];
@@ -24,7 +24,7 @@ in
buildInputs = [
libpng python3 (boost.override { python = python3; })
- mesa qtbase ncurses
+ libGLU_combined qtbase ncurses
];
nativeBuildInputs = [ cmake flex lemon ];
diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix
index 990fee8cc37c..d415df1bae80 100644
--- a/pkgs/applications/graphics/ao/default.nix
+++ b/pkgs/applications/graphics/ao/default.nix
@@ -1,5 +1,5 @@
{stdenv, fetchgit, cmake, ninja, boost, libpng, glfw3, epoxy, guile, pkgconfig
-, mesa, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext
+, libGLU_combined, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext
, libXinerama, libXxf86vm, libXcursor, libXfixes
}:
stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake ninja boost libpng glfw3 epoxy guile mesa libX11
+ cmake ninja boost libpng glfw3 epoxy guile libGLU_combined libX11
libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm
libXcursor libXfixes
];
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index 9b1dd4c25aeb..459e07f9838b 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -22,6 +22,5 @@ stdenv.mkDerivation rec {
description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs";
license = licenses.mit;
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index f190b421b056..f7a813f36061 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -15,6 +15,7 @@ let
name = "qtnproperty";
inherit src;
sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
+ patches = [ ./qtnproperty-parallel-building.patch ];
buildInputs = [ qtscript qtbase qtdeclarative ];
nativeBuildInputs = [ qmake flex bison ];
postInstall = ''
@@ -46,6 +47,10 @@ in stdenv.mkDerivation rec {
--run "cd $d"
'';
+ # $ cd Sources; qmake; make ../workdir/linux-g++-dgb-gl4/obj/glwidget.o
+ # fatal error: properties/ImageProperties.peg.h: No such file or directory
+ enableParallelBuilding = false;
+
meta = {
homepage = https://github.com/kmkolasinski/AwesomeBump;
description = "A program to generate normal, height, specular or ambient occlusion textures from a single image";
diff --git a/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch b/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch
new file mode 100644
index 000000000000..b3f8e68dd1ad
--- /dev/null
+++ b/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch
@@ -0,0 +1,9 @@
+--- a/PEG/Flex.pri
++++ b/PEG/Flex.pri
+@@ -1,5 +1,6 @@
+ flex.name = Flex ${QMAKE_FILE_IN}
+ flex.input = FLEX_SOURCES
++flex.depends = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp
+ flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp
+
+ win32:flex.commands = win_flex --wincompat -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}
diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix
index 22ac473bdd95..d46128c62c02 100644
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ b/pkgs/applications/graphics/cinepaint/default.nix
@@ -2,7 +2,7 @@
flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
perlXMLParser, pythonPackages, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
- mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
+ libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
let
inherit (pythonPackages) python pygtk;
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg
libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
- gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
+ gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined
libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
];
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 8c1db9c039e7..14659d796fc3 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -1,34 +1,28 @@
-{ stdenv, fetchurl, libsoup, graphicsmagick, SDL, json_glib
-, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
-, libgnome_keyring, gtk3, ilmbase, intltool, lcms, lcms2
-, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
-, libpng, libpthreadstubs, librsvg, libtiff, libxcb
-, openexr, osm-gps-map, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg
-, mesa, lua, pugixml, colord, colord-gtk, libxshmfence, libxkbcommon
-, epoxy, at_spi2_core, libwebp, libsecret, wrapGAppsHook, gnome3
+{ stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook
+, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib
+, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg
+, libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt
+, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3
}:
-assert stdenv ? glibc;
-
stdenv.mkDerivation rec {
- version = "2.2.5";
+ version = "2.4.1";
name = "darktable-${version}";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
- sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3";
+ sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32";
};
- buildInputs =
- [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk3
- ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
- libglade libgphoto2 libjpeg libpng libpthreadstubs
- librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
- libsoup graphicsmagick SDL json_glib openjpeg mesa lua pugixml
- colord colord-gtk libxshmfence libxkbcommon epoxy at_spi2_core
- libwebp libsecret wrapGAppsHook gnome3.adwaita-icon-theme
- osm-gps-map
- ];
+ nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
+
+ buildInputs = [
+ cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif
+ libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt
+ libsoup graphicsmagick json-glib openjpeg lua pugixml
+ colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme
+ osm-gps-map
+ ];
cmakeFlags = [
"-DBUILD_USERMANUAL=False"
@@ -49,6 +43,6 @@ stdenv.mkDerivation rec {
homepage = https://www.darktable.org;
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = [ maintainers.goibhniu maintainers.rickynils maintainers.flosse ];
+ maintainers = with maintainers; [ goibhniu rickynils flosse mrVanDalo ];
};
}
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index a62940ff7038..633a1d9bd6e6 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch
# For `digitaglinktree`
, perl, sqlite
@@ -34,7 +34,7 @@
, libqtav
, libusb1
, marble
-, mesa
+, libGLU_combined
, mysql
, opencv3
, pcre
@@ -50,11 +50,13 @@
mkDerivation rec {
name = "digikam-${version}";
- version = "5.7.0";
+ version = "5.9.0";
- src = fetchurl {
- url = "mirror://kde/stable/digikam/${name}.tar.xz";
- sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n";
+ src = fetchFromGitHub {
+ owner = "KDE";
+ repo = "digikam";
+ rev = "v${version}";
+ sha256 = "09diw273h9i7rss89ba82yrfy6jb2njv3k0dknrrg7bb998vrw2d";
};
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
@@ -74,8 +76,7 @@ mkDerivation rec {
liblqr1
libqtav
libusb1
- mesa
- mysql
+ libGLU_combined
opencv3
pcre
@@ -99,8 +100,6 @@ mkDerivation rec {
threadweaver
];
- enableParallelBuilding = true;
-
cmakeFlags = [
"-DENABLE_MYSQLSUPPORT=1"
"-DENABLE_INTERNALMYSQL=1"
diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix
index 80d2b2903678..a845bc63a385 100644
--- a/pkgs/applications/graphics/displaycal/default.nix
+++ b/pkgs/applications/graphics/displaycal/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage {
meta = {
description = "Display Calibration and Characterization powered by Argyll CMS";
- homepage = http://displaycal.net/;
+ homepage = https://displaycal.net/;
license = stdenv.lib.licenses.gpl3;
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index 17334c5b366c..9ab43ff94337 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, dpkg, makeWrapper, gcc, mesa, xdg_utils,
+{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc,
libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr";
};
- libPath = stdenv.lib.makeLibraryPath [ gcc.cc mesa xdg_utils
+ libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11
libXcursor libXrandr libxcb libXi libSM libICE libXrender
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index 3386d75e81e1..e698fb8f2341 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, pkgconfig, fltk, openexr, mesa, openexr_ctl }:
+{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }:
assert fltk.glSupport;
stdenv.mkDerivation {
- name ="openexr_viewers-2.2.0";
+ name ="openexr_viewers-2.2.1";
src = fetchurl {
- url = "mirror://savannah/openexr/openexr_viewers-2.2.0.tar.gz";
- sha256 = "1s84vnas12ybx8zz0jcmpfbk9m4ab5bg2d3cglqwk3wys7jf4gzp";
+ url = "mirror://savannah/openexr/openexr_viewers-2.2.1.tar.gz";
+ sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8";
};
configurePhase = ''
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
'';
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ openexr fltk mesa openexr_ctl ];
+ buildInputs = [ openexr fltk libGLU_combined openexr_ctl ];
meta = {
description = "Application for viewing OpenEXR images on a display at various exposure settings";
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index b447fa7810f4..d7f25fdd4261 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "feh-${version}";
- version = "2.22.2";
+ version = "2.25.1";
src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2";
- sha256 = "1kcflv4jb4250g94nqn28i98xqvvci8w7vqpfr62gxlp16z1za05";
+ sha256 = "197sm78bm33dvahr5nxqkbmpmdn4b13ahc9mrgn1l7n104bg4phc";
};
outputs = [ "out" "man" "doc" ];
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];
- preBuild = ''
- makeFlags="PREFIX=$out exif=1"
- '';
+ makeFlags = [
+ "PREFIX=$(out)" "exif=1"
+ ] ++ optional stdenv.isDarwin "verscmp=0";
postBuild = ''
pushd man
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 80f893e7c3c9..d517306c1d61 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
-, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper }:
+, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper, makeDesktopItem }:
let
pythonPackages = python27Packages;
@@ -32,8 +32,40 @@ in stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \
--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
+
+ mkdir -p $out/share/mime/packages
+ cat << EOF > $out/share/mime/packages/freecad.xml
+
+
+
+
+ FreeCAD Document
+
+
+
+ EOF
+
+ mkdir -p $out/share/applications
+ cp $desktopItem/share/applications/* $out/share/applications/
+ for entry in $out/share/applications/*.desktop; do
+ substituteAllInPlace $entry
+ done
'';
+ desktopItem = makeDesktopItem {
+ name = "freecad";
+ desktopName = "FreeCAD";
+ genericName = "CAD Application";
+ comment = meta.description;
+ exec = "@out@/bin/FreeCAD %F";
+ categories = "Science;Education;Engineering;";
+ startupNotify = "true";
+ mimeType = "application/x-extension-fcstd;";
+ extraEntries = ''
+ Path=@out@/share/freecad
+ '';
+ };
+
meta = with stdenv.lib; {
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
homepage = https://www.freecadweb.org/;
diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix
index e6d8a06a5193..0bd3421f1b10 100644
--- a/pkgs/applications/graphics/freepv/default.nix
+++ b/pkgs/applications/graphics/freepv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng,
+{ stdenv, fetchurl, libjpeg, libGLU_combined, freeglut, zlib, cmake, libX11, libxml2, libpng,
libXxf86vm }:
stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56";
};
- buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng
+ buildInputs = [ libjpeg libGLU_combined freeglut zlib cmake libX11 libxml2 libpng
libXxf86vm ];
postPatch = ''
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index afad1e6c3af0..09d1a86db8e3 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } :
+{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } :
let
version = "2.2";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr";
};
- nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ];
+ nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ];
buildInputs = [ gtk3 ];
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 1e8f0e209c06..d034f5d64d93 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2
-, lcms, intltool, gettext, fbida
+{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool
+, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
}:
stdenv.mkDerivation rec {
name = "geeqie-${version}";
- version = "1.3";
+ version = "1.4";
src = fetchurl {
url = "http://geeqie.org/${name}.tar.xz";
- sha256 = "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb";
+ sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";
};
+ # Do not build the changelog as this requires markdown.
+ patches = [ ./geeqie-no-changelog.patch ];
+
preConfigure = "./autogen.sh";
- configureFlags = [ "--enable-gps" ];
-
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ];
buildInputs = [
- autoconf automake gtk2 libpng exiv2 lcms intltool gettext
+ gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida
];
postInstall = ''
@@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
-e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH'
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Lightweight GTK+ based image viewer";
@@ -45,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = http://geeqie.sourceforge.net;
- maintainers = with maintainers; [ pSub ];
+ maintainers = with maintainers; [ jfrankenau pSub ];
platforms = platforms.gnu;
};
}
diff --git a/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch
new file mode 100644
index 000000000000..1b8833b135f3
--- /dev/null
+++ b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch
@@ -0,0 +1,14 @@
+--- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500
++++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500
+@@ -10,9 +10,9 @@
+ readmedir = @readmedir@
+
+ if HAVE_MARKDOWN
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
++readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
+ else
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
++readme_DATA = README.md COPYING TODO README.lirc AUTHORS
+ endif
+
+ desktopdir = $(datadir)/applications
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index ff87b70a0c1e..a2cbffd5d217 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
-, python2Packages, libart_lgpl, libexif, gettext, xorg
+, python2Packages, libexif, gettext, xorg
, AppKit, Cocoa, gtk-mac-integration }:
let
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
[ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo
freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
libmng librsvg libwmf zlib libzip ghostscript aalib jasper
- python pygtk libart_lgpl libexif gettext xorg.libXpm
+ python pygtk libexif gettext xorg.libXpm
wrapPython
]
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index 92e6084ce673..dea3fd4e3c61 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib,
- pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }:
+ pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
stdenv.mkDerivation rec {
name = "giv-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
prePatch = ''
sed -i s,/usr/bin/perl,${perl}/bin/perl, doc/eperl
- sed -i s,/usr/local,$out, SConstruct
+ sed -i s,/usr/local,$out, SConstruct
'';
patches = [ ./build.patch ];
@@ -25,15 +25,14 @@ stdenv.mkDerivation rec {
installPhase = "scons install";
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
- json_glib ];
+ nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
+ buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
- meta = {
+ meta = with stdenv.lib; {
description = "Cross platform image and hierarchical vector viewer based";
homepage = http://giv.sourceforge.net/giv/;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ viric ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
index 6dcf8223777a..c1f15904818f 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook
-, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book
+, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book
, intltool, itstool, makeWrapper, pkgconfig, which
}:
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
buildInputs = [
- barcode gtk3 gtk_doc gnome3.yelp_tools
- gnome3.gnome_common gnome3.gsettings_desktop_schemas
+ barcode gtk3 gtk-doc gnome3.yelp-tools
+ gnome3.gnome-common gnome3.gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool
];
diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix
new file mode 100644
index 000000000000..2b391710907c
--- /dev/null
+++ b/pkgs/applications/graphics/gnuclad/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+ name = "gnuclad";
+ version = "0.2.4";
+
+ src = fetchurl {
+ url = "https://launchpad.net/gnuclad/trunk/0.2/+download/${name}-${version}.tar.gz";
+ sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = with stdenv.lib; {
+ homepage = https://launchpad.net/gnuclad;
+ description = "gnuclad tries to help the environment by creating trees. It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project.";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ mog ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix
index 6fe37d605ae1..98a32ad18995 100644
--- a/pkgs/applications/graphics/gocr/default.nix
+++ b/pkgs/applications/graphics/gocr/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, tk }:
stdenv.mkDerivation rec {
- name = "gocr-0.50";
+ name = "gocr-0.51";
src = fetchurl {
url = "http://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz";
- sha256 = "1dgmcpapy7h68d53q2c5d0bpgzgfb2nw2blndnx9qhc7z12149mw";
+ sha256 = "14i6zi6q11h6d0qds2cpvgvhbxk5xaa027h8cd0wy1zblh7sxckf";
};
buildFlags = [ "all" "libs" ];
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
new file mode 100644
index 000000000000..8df630d582cc
--- /dev/null
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook
+, glfw3, gtk3, libpng12 }:
+
+stdenv.mkDerivation rec {
+ name = "goxel-${version}";
+ version = "0.7.3";
+
+ src = fetchFromGitHub {
+ owner = "guillaumechereau";
+ repo = "goxel";
+ rev = "v${version}";
+ sha256 = "114s1pbv3ixc2gzkg7n927hffd6ly5gg59izw4z6drgjcdhd7xj9";
+ };
+
+ nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
+ buildInputs = [ glfw3 gtk3 libpng12 ];
+
+ buildPhase = ''
+ make release
+ '';
+
+ installPhase = ''
+ install -D ./goxel $out/bin/goxel
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Open Source 3D voxel editor";
+ homepage = https://guillaumechereau.github.io/goxel/;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ tilpner ];
+ };
+}
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index c8c9ac8f26ef..f086a8f5ba60 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,14 +2,14 @@
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
, libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
-let version = "1.3.26"; in
+let version = "1.3.28"; in
stdenv.mkDerivation {
name = "graphicsmagick-${version}";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
- sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v";
+ sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall";
};
patches = [
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index d9e0f42e53e3..03489db933c1 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -1,28 +1,32 @@
{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,
exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret,
- libchamplain, librsvg, libwebp, json_glib, webkit, lcms2, bison,
- flex, hicolor_icon_theme, wrapGAppsHook }:
+ libchamplain, librsvg, libwebp, json-glib, webkit, lcms2, bison,
+ flex, hicolor-icon-theme, wrapGAppsHook, shared-mime-info }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "gthumb";
- version = "${major}.3";
- major = "3.5";
+ version = "${major}.0";
+ major = "3.6";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
- sha256 = "0hka1b3l8mf94zsk7jff87wsb8bz4pj5pixjrs0w2j8jbsa9sggk";
+ sha256 = "1zc7myvnzgq7dawjg03rqvwfad7p938m20f25sfhv65jsfq8n928";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = with gnome3;
- [ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf
+ [ itstool libxml2 intltool glib gtk gsettings-desktop-schemas dconf
exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain
- librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme defaultIconTheme ];
+ librsvg libwebp json-glib webkit lcms2 bison flex hicolor-icon-theme defaultIconTheme ];
enableParallelBuilding = true;
+ preFixup = ''
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
+ '';
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/gthumb;
description = "Image browser and viewer for GNOME";
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 9acd8357cb71..8107ed8aa449 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -1,20 +1,20 @@
{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig
, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi
-, libXmu, mesa, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
+, libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
}:
stdenv.mkDerivation rec {
- name = "hugin-2017.0.0";
+ name = "hugin-2018.0.0";
src = fetchurl {
url = "mirror://sourceforge/hugin/${name}.tar.bz2";
- sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46";
+ sha256 = "1jv5wpqbq49fhbl5g521g1qxhdm1rm7acxd18fr3n3n5d830vbyk";
};
buildInputs = [
boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg
- libpng libtiff libX11 libXi libXmu mesa openexr panotools sqlite vigra
+ libpng libtiff libX11 libXi libXmu libGLU_combined openexr panotools sqlite vigra
wxGTK zlib
];
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 889d710f043f..47452eb43e88 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation rec {
- name = "inkscape-0.92.2";
+ name = "inkscape-0.92.3";
src = fetchurl {
url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2";
- sha256 = "1lyghk6yarcv9nwkh6k366p6hb7rfilqcvbyji09hki59khd0a56";
+ sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6";
};
unpackPhase = ''
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 2b1b1f8da8a6..dbd209a57a2f 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "ipe-7.1.10";
+ name = "ipe-7.2.7";
src = fetchurl {
- url = "https://dl.bintray.com/otfried/generic/ipe/7.1/${name}-src.tar.gz";
- sha256 = "0kwk8l2jasb4fdixaca08g661d0sdmx2jkk3ch7pxh0f4xkdxkkz";
+ url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
+ sha256 = "08lzqhagvr8l69hxghyw9akf5dixbily7hj2gxhzzrp334k3yvfn";
};
# changes taken from Gentoo portage
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
done
'';
+ patches = [ ./xlocale.patch ];
+
#TODO: make .desktop entry
meta = {
diff --git a/pkgs/applications/graphics/ipe/xlocale.patch b/pkgs/applications/graphics/ipe/xlocale.patch
new file mode 100644
index 000000000000..b440831d81b4
--- /dev/null
+++ b/pkgs/applications/graphics/ipe/xlocale.patch
@@ -0,0 +1,10 @@
+--- ipe-7.2.7/src/ipelib/ipeplatform.cpp 2016-12-09 15:09:04.000000000 +0100
++++ ipe-7.2.7/src/ipelib/ipeplatform.cpp 2017-11-23 17:13:11.152395834 +0100
+@@ -38,7 +38,6 @@
+ #include
+ #else
+ #include
+-#include
+ #include
+ #endif
+ #ifdef __APPLE__
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index ce315ebc5120..eb59b6ff6d65 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc
-, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
+, cmake, 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 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
- cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
+ cmake libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff
gettext intltool perl unzip ftgl glew asciidoc
gtkmm2 glibmm gtkglext pangox_compat libXmu
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index a9c238ead3c1..f74ad3c877ca 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -9,11 +9,11 @@
mkDerivation rec {
name = "krita-${version}";
- version = "3.3.2";
+ version = "4.0.0";
src = fetchurl {
- url = https://download.kde.org/stable/krita/3.3.2/krita-3.3.2.1.tar.xz;
- sha256 = "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5";
+ url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
+ sha256 = "14sm67vkpxzpnh4c2mzvr0rpk8a3i8kzxx6fi3lpczrcc1g7di09";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
@@ -29,7 +29,7 @@ mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
meta = with lib; {
- description = "A free an open source painting application";
+ description = "A free and open source painting application";
homepage = https://krita.org/;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux;
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 5f27cb446994..4dc1e89116ed 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -7,13 +7,13 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
stdenv.mkDerivation rec {
name = "leocad-${version}";
- version = "17.02";
+ version = "18.02";
src = fetchFromGitHub {
owner = "leozide";
repo = "leocad";
rev = "v${version}";
- sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc";
+ sha256 = "0rb4kjyrr9ry85cfpbk52l19vvwn7lrh2kmj2lwq531smnygn5m3";
};
nativeBuildInputs = [ qmake4Hook ];
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
description = "CAD program for creating virtual LEGO models";
homepage = http://www.leocad.org/;
license = licenses.gpl2;
- inherit (qt4.meta) platforms;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
index 30d34a88d90a..867c0a558382 100644
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/pkgs/applications/graphics/luminance-hdr/default.nix
@@ -1,28 +1,21 @@
-{ stdenv, cmake, fetchurl, fetchpatch, pkgconfig, boost, exiv2, fftwFloat, gsl
+{ stdenv, cmake, fetchurl, pkgconfig, boost, exiv2, fftwFloat, gsl
, ilmbase, lcms2, libraw, libtiff, openexr
-, qtbase, qtdeclarative, qttools, qtwebkit
+, qtbase, qtdeclarative, qttools, qtwebengine
}:
stdenv.mkDerivation rec {
- name = "luminance-hdr-2.4.0";
+ name = "luminance-hdr-2.5.1";
src = fetchurl {
url = "mirror://sourceforge/qtpfsgui/${name}.tar.bz2";
- sha256 = "00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l";
+ sha256 = "15hnyk9yjkkc97dmnrg2ipfgwqxprlcyv2kyvbls4d54zc56x658";
};
- patches = [(fetchpatch {
- name = "fix-qt53-build.diff";
- url = "http://anonscm.debian.org/cgit/pkg-phototools/luminance-hdr.git/"
- + "plain/debian/patches/51_qt5_printsupport.diff?id=00c869a860062dac181303f2c03a3513c0e210bc";
- sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl";
- })];
-
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
buildInputs =
[
- qtbase qtdeclarative qttools qtwebkit
+ qtbase qtdeclarative qttools qtwebengine
boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr
];
diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix
index ac2a194b7ca4..c25c1277ee0b 100644
--- a/pkgs/applications/graphics/meh/default.nix
+++ b/pkgs/applications/graphics/meh/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A minimal image viewer using raw XLib";
- homepage = http://www.johnhawthorn.com/meh/;
+ homepage = https://www.johnhawthorn.com/meh/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix
new file mode 100644
index 000000000000..2fddc39e0d07
--- /dev/null
+++ b/pkgs/applications/graphics/meme/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "meme-unstable-${version}";
+ version = "2017-09-10";
+
+ owner = "nomad-software";
+ repo = "meme";
+ goPackagePath = "github.com/${owner}/${repo}";
+
+ src = fetchFromGitHub {
+ inherit owner repo;
+ rev = "a6521f2eecb0aac22937b0013747ed9cb40b81ea";
+ sha256 = "1gbsv1d58ck6mj89q31s5b0ppw51ab76yqgz39jgwqnkidvzdfly";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A command line utility for creating image macro style memes";
+ homepage = "https://github.com/nomad-software/meme";
+ license = licenses.mit;
+ maintainers = [ maintainers.fgaz ];
+ platforms = with platforms; linux ++ darwin;
+ };
+}
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index d73697673bfe..adb1ec29237e 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -1,51 +1,65 @@
-{ stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip, vcg }:
+{ stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }:
-stdenv.mkDerivation rec {
- name = "meshlab-1.3.3";
+let
+ meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662";
+ vcglibRev = "a8e87662b63ee9f4ded5d4699b28d74183040803";
+in stdenv.mkDerivation {
+ name = "meshlab-2016.12";
- src = fetchurl {
- url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz";
- sha256 = "03wqaibfbfag2w1zi1a5z6h546r9d7pg2sjl5pwg24w7yp8rr0n9";
- };
+ srcs =
+ [
+ (fetchFromGitHub {
+ owner = "cnr-isti-vclab";
+ repo = "meshlab";
+ rev = meshlabRev;
+ sha256 = "0srrp7zhi86dsg4zsx1615gr26barz38zdl8s03zq6vm1dgzl3cc";
+ name = "meshlab-${meshlabRev}";
+ })
+ (fetchFromGitHub {
+ owner = "cnr-isti-vclab";
+ repo = "vcglib";
+ rev = vcglibRev;
+ sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f";
+ name = "vcglib-${vcglibRev}";
+ })
+ ];
- # I don't know why I need this; without this, the rpath set at the beginning of the
- # buildPhase gets removed from the 'meshlab' binary
- dontPatchELF = true;
+ sourceRoot = "meshlab-${meshlabRev}";
- patches = [ ./include-unistd.diff ];
+ patches = [ ./fix-2016.02.patch ];
hardeningDisable = [ "format" ];
+ enableParallelBuilding = true;
buildPhase = ''
- mkdir -p "$out/include"
+ # MeshLab has ../vcglib hardcoded everywhere, so move the source dir
+ mv ../vcglib-${vcglibRev} ../vcglib
+
+ cd src
export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS"
- cd meshlab/src
+
pushd external
qmake -recursive external.pro
- make
+ buildPhase
popd
qmake -recursive meshlab_full.pro
- make
+ buildPhase
'';
installPhase = ''
- mkdir -p $out/opt/meshlab $out/bin $out/lib
- pushd distrib
- cp -R * $out/opt/meshlab
- popd
+ mkdir -p $out/opt/meshlab $out/bin
+ cp -Rv distrib/* $out/opt/meshlab
ln -s $out/opt/meshlab/meshlab $out/bin/meshlab
+ ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver
'';
- sourceRoot = ".";
-
- buildInputs = [ qt4 unzip vcg ];
+ buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ];
meta = {
- description = "System for the processing and editing of unstructured 3D triangular meshes";
- homepage = http://meshlab.sourceforge.net/;
- license = stdenv.lib.licenses.gpl2Plus;
+ description = "A system for processing and editing 3D triangular meshes.";
+ homepage = http://www.meshlab.net/;
+ license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
- broken = true;
};
}
diff --git a/pkgs/applications/graphics/meshlab/fix-2016.02.patch b/pkgs/applications/graphics/meshlab/fix-2016.02.patch
new file mode 100644
index 000000000000..ebccccc00a29
--- /dev/null
+++ b/pkgs/applications/graphics/meshlab/fix-2016.02.patch
@@ -0,0 +1,88 @@
+From 0fd17cd2b6d57e8a2a981a70115c2565ee076d0f Mon Sep 17 00:00:00 2001
+From: Marco Callieri
+Date: Mon, 9 Jan 2017 16:06:14 +0100
+Subject: [PATCH 1/3] resolved ambiguity for abs overloads
+
+
+diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp
+index 364d53bf..ef3d4a2d 100644
+--- a/src/meshlabplugins/edit_quality/eqhandle.cpp
++++ b/src/meshlabplugins/edit_quality/eqhandle.cpp
+@@ -83,7 +83,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+ setCursor(Qt::OpenHandCursor);
+
+ QPointF newPos = event->scenePos();
+- qreal handleOffset = abs(newPos.x()-pos().x());
++ qreal handleOffset = std::fabs(newPos.x()-pos().x());
+
+ if (handleOffset >= std::numeric_limits::epsilon())
+ {
+--
+2.15.0
+
+
+From 33cfd5801e59b6c9e34360c75112e6dcb88d807b Mon Sep 17 00:00:00 2001
+From: Marco Callieri
+Date: Tue, 10 Jan 2017 10:05:05 +0100
+Subject: [PATCH 2/3] again, fabs ambiguity
+
+
+diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp
+index ef3d4a2d..d29f8c45 100644
+--- a/src/meshlabplugins/edit_quality/eqhandle.cpp
++++ b/src/meshlabplugins/edit_quality/eqhandle.cpp
+@@ -30,6 +30,7 @@ FIRST RELEASE
+ #include "eqhandle.h"
+ #include
+ #include
++#include
+
+ EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position,
+ EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox,
+@@ -83,7 +84,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+ setCursor(Qt::OpenHandCursor);
+
+ QPointF newPos = event->scenePos();
+- qreal handleOffset = std::fabs(newPos.x()-pos().x());
++ qreal handleOffset = fabs(newPos.x()-pos().x());
+
+ if (handleOffset >= std::numeric_limits::epsilon())
+ {
+--
+2.15.0
+
+
+From d717e44f4134ebee03322a6a2a56fce626084a3c Mon Sep 17 00:00:00 2001
+From: Patrick Chilton
+Date: Mon, 4 Dec 2017 21:27:23 +0100
+Subject: [PATCH 3/3] io_TXT -> io_txt
+
+
+diff --git a/src/meshlab_full.pro b/src/meshlab_full.pro
+index 6ea7f1db..2a95c127 100644
+--- a/src/meshlab_full.pro
++++ b/src/meshlab_full.pro
+@@ -16,7 +16,7 @@ SUBDIRS = common \
+ meshlabplugins/io_x3d \
+ meshlabplugins/io_expe \
+ meshlabplugins/io_pdb \
+- plugins_experimental/io_TXT \
++ plugins_experimental/io_txt \
+ # Filter plugins
+ meshlabplugins/filter_aging \
+ meshlabplugins/filter_ao \
+diff --git a/src/plugins_experimental/io_TXT/io_txt.cpp b/src/plugins_experimental/io_txt/io_txt.cpp
+similarity index 100%
+rename from src/plugins_experimental/io_TXT/io_txt.cpp
+rename to src/plugins_experimental/io_txt/io_txt.cpp
+diff --git a/src/plugins_experimental/io_TXT/io_txt.h b/src/plugins_experimental/io_txt/io_txt.h
+similarity index 100%
+rename from src/plugins_experimental/io_TXT/io_txt.h
+rename to src/plugins_experimental/io_txt/io_txt.h
+diff --git a/src/plugins_experimental/io_TXT/io_txt.pro b/src/plugins_experimental/io_txt/io_txt.pro
+similarity index 100%
+rename from src/plugins_experimental/io_TXT/io_txt.pro
+rename to src/plugins_experimental/io_txt/io_txt.pro
+--
+2.15.0
+
diff --git a/pkgs/applications/graphics/meshlab/include-unistd.diff b/pkgs/applications/graphics/meshlab/include-unistd.diff
deleted file mode 100644
index 74f28a4d2119..000000000000
--- a/pkgs/applications/graphics/meshlab/include-unistd.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-*** old/vcglib/wrap/ply/plystuff.h 2013-02-09 00:00:04.110705851 -0500
---- new/vcglib/wrap/ply/plystuff.h 2013-02-09 15:20:53.482205183 -0500
-***************
-*** 75,80 ****
---- 75,81 ----
- #define pb_close _close
- #define DIR_SEP "\\"
- #else
-+ #include
- #define pb_mkdir(n) mkdir(n,0755)
- #define pb_access access
- #define pb_stat stat
-
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index ac0060ec7f8e..8c3a8bc894b3 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -4,7 +4,7 @@
, makeWrapper
, pkgconfig
, wrapGAppsHook
-, gsettings_desktop_schemas
+, gsettings-desktop-schemas
, qtbase
, qttools
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
libraw
libtiff
quazip
- gsettings_desktop_schemas];
+ gsettings-desktop-schemas];
cmakeFlags = ["-DENABLE_OPENCV=ON"
"-DENABLE_RAW=ON"
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index b4402c7d1043..c33c0b31a959 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -4,20 +4,20 @@
stdenv.mkDerivation rec {
name = "openimageio-${version}";
- version = "1.7.17";
+ version = "1.8.8";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
- sha256 = "0vx2pndgyfbnziwn36aylvq4jd889dvibzhw9ajzkm378l43lly9";
+ sha256 = "1jn4ph7giwxr65xxbm59i03wywnmxkqnpvqp0kcajl4k48vq3wkr";
};
outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [ cmake ];
buildInputs = [
- boost ilmbase libjpeg libpng
+ boost ilmbase libjpeg libpng
libtiff opencolorio openexr
unzip
];
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
description = "A library and tools for reading and writing images";
license = licenses.bsd3;
maintainers = [ maintainers.goibhniu ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index e7a05c522ca2..33fddf6c8d01 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
+{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext
}:
stdenv.mkDerivation rec {
- version = "2015.03-1";
+ version = "2015.03-3";
name = "openscad-${version}";
src = fetchurl {
url = "http://files.openscad.org/${name}.src.tar.gz";
- sha256 = "61e0dd3cd107e5670d727526700104cca5ac54a1f0a84117fcc9e57bf3b6b279";
+ sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx";
};
buildInputs = [
- qt4 qmake4Hook bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib
+ qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
pkgconfig harfbuzz qscintilla gettext
];
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = http://openscad.org/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers;
+ maintainers = with stdenv.lib.maintainers;
[ bjornfor raskin the-kenny ];
};
}
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 730f809eef40..42b69e249267 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -1,9 +1,12 @@
-{stdenv, fetchFromGitHub, cmake
-,full, python, mesa, libXt }:
+{
+stdenv, fetchFromGitHub, cmake
+,qtbase, qttools, python, libGLU_combined
+,libXt, qtx11extras, qtxmlpatterns
+}:
stdenv.mkDerivation rec {
name = "paraview-${version}";
- version = "5.4.0";
+ version = "5.4.1";
# fetching from GitHub instead of taking an "official" source
# tarball because of missing submodules there
@@ -11,13 +14,14 @@ stdenv.mkDerivation rec {
owner = "Kitware";
repo = "ParaView";
rev = "v${version}";
- sha256 = "0h1vkgwm10mc5mnr3djp81lxr5pi0hyj776z77hiib6xm5596q9n";
+ sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74";
fetchSubmodules = true;
};
cmakeFlags = [
"-DPARAVIEW_ENABLE_PYTHON=ON"
"-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
+ "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF"
];
# During build, binaries are called that rely on freshly built
@@ -29,17 +33,19 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ cmake
- python
- mesa
- libXt
+ nativeBuildInputs = [
+ cmake
+ ];
- # theoretically the following should be fine, but there is an error
- # due to missing libqminimal when not using qt5.full
-
- # qtbase qtx11extras qttools
- full
- ];
+ buildInputs = [
+ python
+ libGLU_combined
+ libXt
+ qtbase
+ qtx11extras
+ qttools
+ qtxmlpatterns
+ ];
meta = {
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index f7175f9d2b87..0e52190af420 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,36 +1,104 @@
-{ stdenv, fetchurl, makeWrapper, xulrunner }:
+{ stdenv, fetchurl, lib, makeWrapper,
+ # build dependencies
+ alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
+ freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
+ glibc, udev
+}:
stdenv.mkDerivation rec {
- version = "2.0.21";
+ version = "3.0.4";
name = "pencil-${version}";
src = fetchurl {
- url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
- sha256 = "0xq3gczqy7gzf1997qxdql5z7qqk1vabr0rzgakmsi4dq2q4d3kq";
+ url = "http://pencil.evolus.vn/dl/V${version}/Pencil_${version}_amd64.deb";
+ sha256 = "58e2b794c615ea8715d8374f177e19c87f7071e359826ec34a59836d537a62fd";
};
- buildPhase = "";
+ sourceRoot = ".";
- buildInputs = [ makeWrapper ];
+ unpackCmd = ''
+ ar p "$src" data.tar.xz | tar xJ
+ '';
+
+ buildPhase = ":";
+
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
- mkdir -p "$out"
- cp -r usr/* "$out"
- sed -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \
- -i "$out/bin/pencil"
- sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \
- -e "s|Icon=.*|Icon=$out/share/evolus-pencil/skin/classic/icon.svg|" \
- -i "$out/share/applications/pencil.desktop"
+ mkdir -p $out/bin
+ cp -R usr/share opt $out/
- wrapProgram $out/bin/pencil \
- --prefix PATH ":" ${xulrunner}/bin
+ # fix the path in the desktop file
+ substituteInPlace \
+ $out/share/applications/pencil.desktop \
+ --replace /opt/ $out/opt/
+
+ # symlink the binary to bin/
+ ln -s $out/opt/Pencil/pencil $out/bin/pencil
+ '';
+
+
+ preFixup = let
+ packages = [
+ alsaLib
+ atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ gnome2.GConf
+ gnome2.gtk
+ gnome2.pango
+ nspr
+ nss
+ xorg.libX11
+ xorg.libXScrnSaver
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXtst
+ stdenv.cc.cc.lib
+ stdenv.cc.cc
+ glibc
+ ];
+ libPathNative = lib.makeLibraryPath packages;
+ libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
+ libPath = "${libPathNative}:${libPath64}";
+ in ''
+ # patch executable
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${libPath}:$out/opt/Pencil" \
+ $out/opt/Pencil/pencil
+
+ # patch libnode
+ patchelf \
+ --set-rpath "${libPath}" \
+ $out/opt/Pencil/libnode.so
+
+ # libffmpeg is for some reason not executable
+ chmod a+x $out/opt/Pencil/libffmpeg.so
+
+ # fix missing libudev
+ ln -s ${udev}/lib/systemd/libsystemd-shared.so $out/opt/Pencil/libudev.so.1
+ wrapProgram $out/opt/Pencil/pencil \
+ --prefix LD_LIBRARY_PATH : $out/opt/Pencil
'';
meta = with stdenv.lib; {
description = "GUI prototyping/mockup tool";
- homepage = https://github.com/prikhi/pencil;
- license = licenses.gpl2; # Commercial license is also available
- maintainers = with maintainers; [ bjornfor prikhi ];
- platforms = platforms.linux;
+ homepage = "https://pencil.evolus.vn/";
+ license = licenses.gpl2; # Commercial license is also available
+ maintainers = with maintainers; [ bjornfor prikhi mrVanDalo ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 0d1adcff6e83..73bbd5003bd8 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
platforms = platforms.linux;
- maintainers = [ maintainers.mornfall ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 82e8793199b6..01affbbbd94c 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "1.5.1";
src = fetchurl {
- url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz";
+ url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1";
};
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
- homepage = http://photoqt.org/;
+ homepage = https://photoqt.org/;
description = "Simple, yet powerful and good looking image viewer";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index f4a4b6bb9d85..a3151238438b 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -56,9 +56,9 @@ buildDotnetPackage rec {
'';
makeWrapperArgs = [
- ''--prefix MONO_GAC_PREFIX ':' "${gtksharp}"''
- ''--prefix LD_LIBRARY_PATH ':' "${gtksharp}/lib"''
- ''--prefix LD_LIBRARY_PATH ':' "${gtksharp.gtk.out}/lib"''
+ ''--prefix MONO_GAC_PREFIX : ${gtksharp}''
+ ''--prefix LD_LIBRARY_PATH : ${gtksharp}/lib''
+ ''--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib''
];
postInstall = ''
diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index 202bbb5b13f4..9e5958871cc0 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchFromGitHub, getopt, which, pkgconfig, gtk2 } :
+{ stdenv, fetchFromGitHub, pkgconfig
+, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
+}:
stdenv.mkDerivation (rec {
name = "pqiv-${version}";
- version = "2.9";
+ version = "2.10.2";
src = fetchFromGitHub {
owner = "phillipberndt";
repo = "pqiv";
rev = version;
- sha256 = "1xncf6aq52zpxpmz3ikmlkinz7y3nmbpgfxjb7q40sqs00n0mfsd";
+ sha256 = "0zn7ps73lw04l9i4777c90ik07v3hkg66mnpz8vvvwjyi40i77a7";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ getopt which gtk2 ];
+ buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ];
prePatch = "patchShebangs .";
meta = with stdenv.lib; {
- description = "Rewrite of qiv (quick image viewer)";
+ description = "Powerful image viewer with minimal UI";
homepage = http://www.pberndt.com/Programme/Linux/pqiv;
license = licenses.gpl3;
maintainers = [ maintainers.ndowens ];
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index 451eaae79b2e..c8327b9bca19 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
-, qtbase, qmake, mesa_glu
+, qtbase, qmake, libGLU
}:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ qmake ];
- buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ];
+ buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline libGLU ];
meta = with stdenv.lib; {
license = licenses.gpl3;
diff --git a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake
deleted file mode 100644
index 7be7cb63f701..000000000000
--- a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(GIT_BRANCH master)
-set(GIT_VERSION 4.2.1115)
-set(GIT_CHANGESET 0821eea7b6a4ac2fce1fcf644e06078e161e41e3)
-set(GIT_TAGDISTANCE 1115)
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 91a34a505f2f..9964bec67814 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau
-, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
+, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
, lensfun
}:
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7";
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+ nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
buildInputs = [
- cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
- lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun
+ pixman libpthreadstubs gtkmm3 libXau libXdmcp
+ lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun
];
cmakeFlags = [
diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix
deleted file mode 100644
index fb73feb4a099..000000000000
--- a/pkgs/applications/graphics/rawtherapee/dev.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau
-, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx
-}:
-
-stdenv.mkDerivation rec {
- name = "rawtherapee-git-2016-10-10";
-
- src = fetchFromGitHub {
- owner = "Beep6581";
- repo = "RawTherapee";
- rev = "0821eea7b6a4ac2fce1fcf644e06078e161e41e3";
- sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
- lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ];
-
- NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";
-
- # Copy generated ReleaseInfo.cmake so we don't need git. File was
- # generated manually using `./tools/generateReleaseInfo` in the
- # source folder. Make sure to regenerate it when updating.
- preConfigure = ''
- cp ${./ReleaseInfo.cmake} ./ReleaseInfo.cmake
- '';
-
- enableParallelBuilding = true;
-
- meta = {
- description = "RAW converter and digital photo processing software";
- homepage = http://www.rawtherapee.com/;
- license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ];
- platforms = with stdenv.lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch b/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch
deleted file mode 100644
index 3c87ce64e26b..000000000000
--- a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ca0afa8d5f3cc7d09b6bab32d155a87c550f0d7b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fl=C3=B6ssie?=
-Date: Sat, 1 Oct 2016 12:38:24 +0200
-Subject: [PATCH] Fix incompatibility with glibmm 2.50 (#3440)
-
-Kudos to @Hombre57 for the suggestion.
----
- rtgui/dirbrowser.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc
-index d3fc8bf..6f25f0f 100644
---- a/rtgui/dirbrowser.cc
-+++ b/rtgui/dirbrowser.cc
-@@ -59,7 +59,7 @@ std::vector listSubDirs (const Glib::RefPtr& dir, bool
- } catch (const Glib::Exception& exception) {
-
- if (options.rtSettings.verbose) {
-- std::cerr << "Failed to list subdirectories of \"" << dir << "\": " << exception.what () << std::endl;
-+ std::cerr << "Failed to list subdirectories of \"" << dir->get_basename() << "\": " << exception.what () << std::endl;
- }
-
- }
diff --git a/pkgs/applications/graphics/renderdoc/custom_swig.patch b/pkgs/applications/graphics/renderdoc/custom_swig.patch
new file mode 100644
index 000000000000..e6ed05ea97a5
--- /dev/null
+++ b/pkgs/applications/graphics/renderdoc/custom_swig.patch
@@ -0,0 +1,32 @@
+diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
+index 2df9ffa5..66bafaba 100644
+--- a/qrenderdoc/CMakeLists.txt
++++ b/qrenderdoc/CMakeLists.txt
+@@ -65,16 +65,6 @@ include(ExternalProject)
+ # Need bison for swig
+ find_package(BISON)
+
+-# Compile our custom SWIG that will do scoped/strong enum classes
+-ExternalProject_Add(custom_swig
+- # using an URL to a zip directly so we don't clone the history etc
+- URL ${RENDERDOC_SWIG_PACKAGE}
+- BUILD_IN_SOURCE 1
+- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1
+- COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null
+- BUILD_COMMAND $(MAKE) > /dev/null 2>&1
+- INSTALL_COMMAND $(MAKE) install > /dev/null 2>&1)
+-
+ # Lastly find PySide 2, optionally, for Qt5 Python bindings
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+
+@@ -186,9 +176,8 @@ foreach(in ${swig_interfaces})
+ get_filename_component(swig_file ${in} NAME_WE)
+
+ add_custom_command(OUTPUT ${swig_file}_python.cxx ${swig_file}.py
+- COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in}
++ COMMAND $ENV{NIXOS_CUSTOM_SWIG} -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in}
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${in}
+- DEPENDS custom_swig
+ DEPENDS ${RDOC_REPLAY_FILES}
+ DEPENDS ${QRD_INTERFACE_FILES})
+
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index d69f9a676c1b..2bd3ab89161f 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -1,31 +1,57 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig
-, qtbase, qtx11extras, vulkan-loader, xorg
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, qtbase, qtx11extras, qtsvg, makeWrapper, python3, bison
+, pcre, vulkan-loader, xorg, autoreconfHook
}:
+let
+ custom_swig = stdenv.mkDerivation {
+ name = "renderdoc-custom-swig";
+ src = fetchFromGitHub {
+ owner = "baldurk";
+ repo = "swig";
+ rev = "renderdoc-modified-1";
+ sha256 = "1whymd3vamwnp4jqfc9asls3dw9wsdi21xhm1d2a4vx9nql8if1x";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pcre ];
+
+ autoreconfPhase = ''
+ patchShebangs autogen.sh
+ ./autogen.sh
+ '';
+ };
+in
stdenv.mkDerivation rec {
name = "renderdoc-${version}";
- version = "0.34pre";
+ version = "0.91";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
- rev = "5e2717daec53e5b51517d3231fb6120bebbe6b7a";
- sha256 = "1zpvjvsj5c441kyjpmd2d2r0ykb190rbq474nkmp1jk72cggnpq0";
+ rev = "2d8b2cf818746b6a2add54e2fef449398816a40c";
+ sha256 = "07yc3fk7j2nqmrhc4dm3v2pgbc37scd7d28nlzk6v0hw99zck8k0";
};
buildInputs = [
- qtbase xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader
+ qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader
];
- nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
+
+ nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison ];
cmakeFlags = [
- "-DBUILD_VERSION_HASH=${src.rev}-distro-nix"
+ "-DBUILD_VERSION_HASH=${src.rev}"
+ "-DBUILD_VERSION_DIST_NAME=NixOS"
+ "-DBUILD_VERSION_DIST_VER=0.91"
+ "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc"
+ "-DBUILD_VERSION_DIST_STABLE=ON"
# TODO: use this instead of preConfigure once placeholders land
#"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/"
];
+
preConfigure = ''
cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/"
'';
+
preFixup = ''
mkdir $out/bin/.bin
mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc
@@ -35,8 +61,14 @@ stdenv.mkDerivation rec {
ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd
wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
'';
+
+ # Set path to custom swig binary
+ NIXOS_CUSTOM_SWIG = "${custom_swig}/bin/swig";
+
enableParallelBuilding = true;
+ patches = [ ./custom_swig.patch ];
+
meta = with stdenv.lib; {
description = "A single-frame graphics debugger";
homepage = https://renderdoc.org/;
@@ -48,6 +80,6 @@ stdenv.mkDerivation rec {
Windows 7 - 10, Linux or Android.
'';
maintainers = [maintainers.jansol];
- platforms = platforms.linux;
+ platforms = ["i686-linux" "x86_64-linux"];
};
}
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 3ef23142b2ed..2ca1fead84c8 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
-, avahi, libjpeg, libusb1, libv4l, net_snmp
+, avahi, libjpeg, libusb1, libv4l, net_snmp, libpng
, gettext, pkgconfig
# List of { src name backend } attibute sets - see installFirmware below:
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
;
- buildInputs = [ avahi libusb1 libv4l net_snmp ];
+ buildInputs = [ avahi libusb1 libv4l net_snmp libpng ];
nativeBuildInputs = [ gettext pkgconfig ];
enableParallelBuilding = true;
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
homepage = http://www.sane-project.org/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ nckx peti ];
+ maintainers = with maintainers; [ peti ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index dbf79bf20acb..e746f83e5d49 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // {
- version = "2016-06-11";
+ version = "2017-12-01";
src = fetchgit {
- sha256 = "0jpavig7bg7l72drlwipmsg03j6qdy5aq2r3kj6a2h6ahpnm2549";
- rev = "5ba37467e88ca8052973b37128ce8fd36ad5d61d";
+ sha256 = "0qf7d7268kdxnb723c03m6icxhbgx0vw8gqvck2q1w5b948dy9g8";
+ rev = "e895ee55bec8a3320a0e972b32c05d35b47fe226";
url = "git://alioth.debian.org/git/sane/sane-backends.git";
};
})
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
new file mode 100644
index 000000000000..8f26d5a9884a
--- /dev/null
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, makeDesktopItem
+, cmake, libjpeg, libpng, libtiff, boost
+, qtbase, qttools }:
+
+stdenv.mkDerivation rec {
+ name = "scantailor-advanced-${version}";
+ version = "1.0.12";
+
+ src = fetchFromGitHub {
+ owner = "4lex4";
+ repo = "scantailor-advanced";
+ rev = "v${version}";
+ sha256 = "0i80jzky7l8wdv0wqdx48x1q0wmj72hhm0050pd43q80pj5r78a0";
+ };
+
+ nativeBuildInputs = [ cmake qttools ];
+ buildInputs = [ libjpeg libpng libtiff boost qtbase ];
+
+ postInstall = ''
+ mkdir -p $out/share/icons/hicolor/scalable/apps
+ cp $src/resources/appicon.svg $out/share/icons/hicolor/scalable/apps/scantailor.svg
+
+ mkdir -p $out/share/applications
+ cp $desktopItem/share/applications/* $out/share/applications/
+ for entry in $out/share/applications/*.desktop; do
+ substituteAllInPlace $entry
+ done
+ '';
+
+ desktopItem = makeDesktopItem {
+ name = "scantailor-advanced";
+ exec = "scantailor %f";
+ icon = "scantailor";
+ comment = meta.description;
+ desktopName = "Scan Tailor Advanced";
+ genericName = "Scan Processing Software";
+ mimeType = "image/png;image/tif;image/jpeg;";
+ categories = "Graphics;";
+ startupNotify = "true";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/4lex4/scantailor-advanced;
+ description = "Interactive post-processing tool for scanned pages";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ jfrankenau ];
+ platforms = platforms.gnu;
+ };
+}
diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix
index e97278148f99..80987a8c7411 100644
--- a/pkgs/applications/graphics/seg3d/default.nix
+++ b/pkgs/applications/graphics/seg3d/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, cmake, wxGTK, itk, mesa, libXft, libXext, libXi, zlib, libXmu,
+{ fetchurl, stdenv, cmake, wxGTK, itk, libGLU_combined, libXft, libXext, libXi, zlib, libXmu,
libuuid }:
assert (stdenv ? glibc);
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
exit 1
'';
- buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu libuuid ];
+ buildInputs = [ cmake wxGTK itk libGLU_combined libXft libXext libXi zlib libXmu libuuid ];
meta = {
broken = true;
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index b0a6f7caf885..5a24a364587e 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,37 +1,43 @@
-{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala_0_28, sqlite
-, webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib
-, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook
-, gnome_doc_utils, hicolor_icon_theme, itstool, libgdata }:
+{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
+, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib
+, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
+, gobjectIntrospection, itstool, libgdata }:
-# for dependencies see http://www.yorba.org/projects/shotwell/install/
+# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
-stdenv.mkDerivation rec {
- version = "${major}.${minor}";
- major = "0.27";
- minor = "1";
- name = "shotwell-${version}";
+let
+ pname = "shotwell";
+ version = "0.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
- sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "1d797nmlz9gs6ri0h65b76s40ss6ma6h6405xqx03lhg5xni3kmg";
};
- NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
+ nativeBuildInputs = [
+ meson ninja vala pkgconfig itstool gettext desktop-file-utils wrapGAppsHook gobjectIntrospection
+ ];
- configureFlags = [ "--disable-gsettings-convert-install" ];
+ buildInputs = [
+ gtk3 libexif libgphoto2 libsoup libxml2 sqlite webkitgtk
+ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
+ libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
+ libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
+ gnome3.gcr gnome3.defaultIconTheme libgdata
+ ];
- preConfigure = ''
- patchShebangs .
+ postInstall = ''
+ glib-compile-schemas $out/share/glib-2.0/schemas
'';
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
- buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala_0_28 sqlite webkitgtk
- gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
- which udev libgudev gnome3.gexiv2 hicolor_icon_theme
- libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
- gnome_doc_utils gnome3.rest gnome3.gcr
- gnome3.defaultIconTheme itstool libgdata ];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ versionPolicy = "none";
+ };
+ };
meta = with stdenv.lib; {
description = "Popular photo organizer for the GNOME desktop";
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index 43d6229ab2bc..a1d0316631fa 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype
-, json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre
+, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre
+, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "solvespace-2.3-20170808";
@@ -11,11 +12,13 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [
+ pkgconfig cmake wrapGAppsHook
+ ];
buildInputs = [
- cmake zlib libpng cairo freetype
- json_c fontconfig gtkmm3 pangomm glew mesa_glu
- xlibs.libpthreadstubs xlibs.libXdmcp pcre
+ zlib libpng cairo freetype
+ json_c fontconfig gtkmm3 pangomm glew libGLU
+ xorg.libpthreadstubs xorg.libXdmcp pcre
];
enableParallelBuilding = true;
@@ -38,11 +41,11 @@ stdenv.mkDerivation rec {
--replace /usr/bin/ $out/bin/
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A parametric 3d CAD program";
- license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ edef ];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.edef ];
+ platforms = platforms.linux;
homepage = http://solvespace.com;
};
}
diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix
index 53bdbcd12740..94666531c0c8 100644
--- a/pkgs/applications/graphics/swingsane/default.nix
+++ b/pkgs/applications/graphics/swingsane/default.nix
@@ -57,6 +57,5 @@ stdenv.mkDerivation rec {
homepage = http://swingsane.com/;
license = licenses.asl20;
platforms = platforms.all;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 68597a23ca65..7f118b6adc9a 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, libX11, imlib2, giflib, libexif, conf ? null }:
+{ stdenv, fetchFromGitHub, libXft, imlib2, giflib, libexif, conf ? null }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "sxiv-${version}";
- version = "1.3.2";
+ version = "24";
src = fetchFromGitHub {
owner = "muennich";
repo = "sxiv";
rev = "v${version}";
- sha256 = "1f4gz1qjhb44bbb3q5fqk439zyipkwnr19zhg89yq2pgmzzzqr2h";
+ sha256 = "020n1bdxbzqncprh8a4rnjzc4frp335yxbqh5w6dr970f7n5qm8d";
};
postUnpack = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
- buildInputs = [ libX11 imlib2 giflib libexif ];
+ buildInputs = [ libXft imlib2 giflib libexif ];
postInstall = ''
mkdir -p $out/share/applications/
diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index 31908dcfd9f0..f1adc6bd10ea 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -22,7 +22,7 @@ let
else if stdenv.system == "i686-linux" then
"x86"
else
- abort "Unsupported platform";
+ throw "Unsupported platform ${stdenv.system}";
in
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index e951f3a7a937..c655cadef400 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms
-, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:
+, intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}:
stdenv.mkDerivation rec {
name = "viewnior-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs =
[ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
- shared_mime_info glib gdk_pixbuf perl
+ shared-mime-info glib gdk_pixbuf perl
];
preFixup = ''
diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
index 38f63bdb3836..538931c1040e 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -1,5 +1,5 @@
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
-, hicolor_icon_theme, defaultIconTheme
+, hicolor-icon-theme, defaultIconTheme
# Test requirements
, dbus, xvfb_run, xdotool
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
'';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
- buildInputs = [ hicolor_icon_theme defaultIconTheme librsvg ];
+ buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
makeWrapperArgs = [
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index dcb7c512ddef..a8b4038b11f3 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yEd-${version}";
- version = "3.17.1";
+ version = "3.17.2";
src = requireFile {
name = "${name}.zip";
url = "https://www.yworks.com/en/products/yfiles/yed/";
- sha256 = "0fk1gai7yghfmfvx1rfzdnpwihbq6hqzncyk6zkpqdrf6zz576nl";
+ sha256 = "0wpfvd3jqxgjk3xqkamvlg7rk0w0pmrv7srjfqns447ccc3i7qg2";
};
nativeBuildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index 52a17f5cbeb9..0ed958b4e770 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib, kdepimTeam,
- extra-cmake-modules, shared_mime_info,
+ extra-cmake-modules, shared-mime-info,
akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
}:
@@ -10,7 +10,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = kdepimTeam;
};
- nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
+ nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
new file mode 100644
index 000000000000..1b5e12c7ec32
--- /dev/null
+++ b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
@@ -0,0 +1,49 @@
+From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001
+From: gnidorah
+Date: Fri, 22 Dec 2017 17:36:03 +0300
+Subject: [PATCH] Revert "Make Akonadi installation properly relocatable"
+
+This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
+---
+ CMakeLists.txt | 3 ---
+ KF5AkonadiConfig.cmake.in | 6 +++---
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9788bea94..15bad00fd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -285,9 +285,6 @@ configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
+- AKONADI_INCLUDE_DIR
+- KF5Akonadi_DATA_DIR
+ )
+
+ install(FILES
+diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
+index 75abede50..10f039376 100644
+--- a/KF5AkonadiConfig.cmake.in
++++ b/KF5AkonadiConfig.cmake.in
+@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@")
+ find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@")
+ find_dependency(Qt5Network "@QT_REQUIRED_VERSION@")
+
+-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
+-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@")
++set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
++set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@")
+
+ find_dependency(Boost "@Boost_MINIMUM_VERSION@")
+
+@@ -22,4 +22,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
+
+ # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
+-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
++set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
+--
+2.15.1
+
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index bb7dac1b62a0..cba0b1e59e3a 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -1,6 +1,6 @@
{
mkDerivation, copyPathsToStore, lib, kdepimTeam,
- extra-cmake-modules, shared_mime_info,
+ extra-cmake-modules, shared-mime-info,
boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin,
ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
}:
@@ -12,20 +12,20 @@ mkDerivation {
maintainers = kdepimTeam;
};
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
- nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
+ nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n
kiconthemes kio kwindowsystem qttools
];
propagatedBuildInputs = [ boost kitemmodels ];
outputs = [ "out" "dev" ];
- NIX_CFLAGS_COMPILE = [
- ''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"''
- ''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"''
- ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB="${lib.getBin mysql}/bin/mysql_install_db"''
- ''-DNIXPKGS_MYSQL_MYSQLCHECK="${lib.getBin mysql}/bin/mysqlcheck"''
- ''-DNIXPKGS_POSTGRES_PG_CTL=""''
- ''-DNIXPKGS_POSTGRES_INITDB=""''
+ CXXFLAGS = [
+ ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mysql}/bin/mysqld\"''
+ ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mysql}/bin/mysqladmin\"''
+ ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"''
+ ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"''
+ ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
+ ''-DNIXPKGS_POSTGRES_INITDB=\"\"''
];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIX_OUT=\"$out\""
diff --git a/pkgs/applications/kde/akonadi/series b/pkgs/applications/kde/akonadi/series
index 9e067f0a0008..f828d503cc77 100644
--- a/pkgs/applications/kde/akonadi/series
+++ b/pkgs/applications/kde/akonadi/series
@@ -1,2 +1,3 @@
akonadi-paths.patch
akonadi-timestamps.patch
+0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix
index 3d7bf26c794e..1470406d5a43 100644
--- a/pkgs/applications/kde/akonadiconsole.nix
+++ b/pkgs/applications/kde/akonadiconsole.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
- ktextwidgets, kxmlgui, messagelib, qtbase,
+ ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian
}:
mkDerivation {
@@ -16,6 +16,6 @@ mkDerivation {
buildInputs = [
akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
- messagelib qtbase libkdepim
+ messagelib qtbase libkdepim akonadi-search xapian
];
}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 378fcde41e10..8fd65770afd5 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -63,7 +63,6 @@ let
kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
};
in {
- kdelibs = callPackage ./kdelibs { inherit attica phonon; };
akonadi = callPackage ./akonadi {};
akonadi-calendar = callPackage ./akonadi-calendar.nix {};
akonadi-contacts = callPackage ./akonadi-contacts.nix {};
@@ -101,7 +100,9 @@ let
kdepim-runtime = callPackage ./kdepim-runtime.nix {};
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
+ kdialog = callPackage ./kdialog.nix {};
keditbookmarks = callPackage ./keditbookmarks.nix {};
+ kget = callPackage ./kget.nix {};
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kholidays = callPackage ./kholidays.nix {};
@@ -124,6 +125,7 @@ let
kontactinterface = callPackage ./kontactinterface.nix {};
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
+ ksmtp = callPackage ./ksmtp {};
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
krdc = callPackage ./krdc.nix {};
krfb = callPackage ./krfb.nix {};
@@ -135,6 +137,7 @@ let
libkdcraw = callPackage ./libkdcraw.nix {};
libkdepim = callPackage ./libkdepim.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
+ libkgapi = callPackage ./libkgapi.nix {};
libkipi = callPackage ./libkipi.nix {};
libkleo = callPackage ./libkleo.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
@@ -154,8 +157,6 @@ let
print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {};
syndication = callPackage ./syndication.nix {};
-
- l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
};
in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 1542b9c25190..9ad488f63ab4 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.08.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
index 6275bb84c17b..fe8b15febf2e 100644
--- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
+++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
@@ -11,85 +11,6 @@ Index: grantleetheme-17.04.0/src/grantleetheme_p.h
QString author;
QString email;
-Index: grantleetheme-17.04.0/src/grantleetheme.cpp
-===================================================================
---- grantleetheme-17.04.0.orig/src/grantleetheme.cpp
-+++ grantleetheme-17.04.0/src/grantleetheme.cpp
-@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr
- , description(other.description)
- , name(other.name)
- , dirName(other.dirName)
-- , absolutePath(other.absolutePath)
-+ , absolutePaths(other.absolutePaths)
- , author(other.author)
- , email(other.email)
- , loader(other.loader)
-@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine()
-
- void ThemePrivate::setupLoader()
- {
-- // Get the parent dir with themes, we set the theme directory separately
-- QDir dir(absolutePath);
-- dir.cdUp();
-+ QStringList templateDirs;
-+ for (const QString& path : absolutePaths) {
-+ QDir dir(path);
-+ dir.cdUp();
-+ templateDirs << dir.absolutePath();
-+ }
-
- loader = QSharedPointer::create();
-- loader->setTemplateDirs({ dir.absolutePath() });
-+ loader->setTemplateDirs(templateDirs);
- loader->setTheme(dirName);
-
- if (!sEngine) {
-@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c
- KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
- if (group.isValid()) {
- d->dirName = dirName;
-- d->absolutePath = themePath;
-+ d->absolutePaths = QStringList(themePath);
- d->name = group.readEntry("Name", QString());
- d->description = group.readEntry("Description", QString());
- d->themeFileName = group.readEntry("FileName", QString());
-@@ -141,7 +142,7 @@ Theme::~Theme()
-
- bool Theme::operator==(const Theme &other) const
- {
-- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
-+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
- }
-
- Theme &Theme::operator=(const Theme &other)
-@@ -185,7 +186,12 @@ QString Theme::dirName() const
-
- QString Theme::absolutePath() const
- {
-- return d->absolutePath;
-+ return d->absolutePaths.first();
-+}
-+
-+QStringList Theme::absolutePaths() const
-+{
-+ return d->absolutePaths;
- }
-
- QString Theme::author() const
-@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem
- return result;
- }
-
-+void Theme::addThemeDir(const QString& path)
-+{
-+ QDir dir(path);
-+ dir.cdUp();
-+ d->absolutePaths << dir.absolutePath();
-+}
-+
- void Theme::addPluginPath(const QString &path)
- {
- if (!ThemePrivate::sEngine) {
Index: grantleetheme-17.04.0/src/grantleetheme.h
===================================================================
--- grantleetheme-17.04.0.orig/src/grantleetheme.h
@@ -153,3 +74,80 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp
}
}
}
+--- src/grantleetheme.cpp.orig 2017-12-22 16:11:39.863598126 +0300
++++ ./src/grantleetheme.cpp 2017-12-22 16:16:14.045664607 +0300
+@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePr
+ , description(other.description)
+ , name(other.name)
+ , dirName(other.dirName)
+- , absolutePath(other.absolutePath)
++ , absolutePaths(other.absolutePaths)
+ , author(other.author)
+ , email(other.email)
+ , loader(other.loader)
+@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine()
+
+ void ThemePrivate::setupLoader()
+ {
+- // Get the parent dir with themes, we set the theme directory separately
+- QDir dir(absolutePath);
+- dir.cdUp();
++ QStringList templateDirs;
++ for (const QString& path : absolutePaths) {
++ QDir dir(path);
++ dir.cdUp();
++ templateDirs << dir.absolutePath();
++ }
+
+ loader = QSharedPointer::create();
+- loader->setTemplateDirs({ dir.absolutePath() });
++ loader->setTemplateDirs(templateDirs);
+ loader->setTheme(dirName);
+
+ if (!sEngine) {
+@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, c
+ KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
+ if (group.isValid()) {
+ d->dirName = dirName;
+- d->absolutePath = themePath;
++ d->absolutePaths = QStringList(themePath);
+ d->name = group.readEntry("Name", QString());
+ d->description = group.readEntry("Description", QString());
+ d->themeFileName = group.readEntry("FileName", QString());
+@@ -140,7 +143,7 @@ Theme::~Theme()
+
+ bool Theme::operator==(const Theme &other) const
+ {
+- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
++ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
+ }
+
+ Theme &Theme::operator=(const Theme &other)
+@@ -184,7 +187,12 @@ QString Theme::dirName() const
+
+ QString Theme::absolutePath() const
+ {
+- return d->absolutePath;
++ return d->absolutePaths.first();
++}
++
++QStringList Theme::absolutePaths() const
++{
++ return d->absolutePaths;
+ }
+
+ QString Theme::author() const
+@@ -223,6 +231,13 @@ QString Theme::render(const QString &tem
+ return result;
+ }
+
++void Theme::addThemeDir(const QString& path)
++{
++ QDir dir(path);
++ dir.cdUp();
++ d->absolutePaths << dir.absolutePath();
++}
++
+ void Theme::addPluginPath(const QString &path)
+ {
+ if (!ThemePrivate::sEngine) {
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index b032de848794..89bc171d2953 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,5 +1,5 @@
{ mkDerivation, lib
-, extra-cmake-modules, kdoctools, makeWrapper, shared_mime_info
+, extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info
, qtwebkit
, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
, flac, lame, libmad, libmpcdec, libvorbis
@@ -28,7 +28,7 @@ mkDerivation {
# cd/dvd
cdparanoia libdvdcss libdvdread
# others
- ffmpeg libmusicbrainz3 shared_mime_info
+ ffmpeg libmusicbrainz3 shared-mime-info
];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
postFixup =
diff --git a/pkgs/applications/kde/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix
deleted file mode 100644
index daf0a55b19e5..000000000000
--- a/pkgs/applications/kde/kde-locale-4.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-name: args:
-
-{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }:
-
-mkDerivation (args // {
- sname = "kde-l10n-${name}";
- name = "kde-l10n-${name}-qt4";
-
- outputs = [ "out" ];
-
- nativeBuildInputs =
- [ automoc4 cmake gettext perl ]
- ++ (args.nativeBuildInputs or []);
- buildInputs =
- [ kdelibs ]
- ++ (args.buildInputs or []);
-
- preConfigure = ''
- sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
- ${args.preConfigure or ""}
- '';
-
- preFixup = ''
- propagatedBuildInputs=
- propagatedNativeBuildInputs=
- '';
-})
diff --git a/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch
deleted file mode 100644
index b7d7300e9a84..000000000000
--- a/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Mon, 7 Sep 2015 13:54:57 -0500
-Subject: [PATCH 1/2] old kde4 cmake policies
-
----
- cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
-diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index 7d54b9b..c435571 100644
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -345,6 +345,39 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-+# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
-+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
-+# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3)
-+cmake_policy(VERSION 2.4.5)
-+
-+# CMake 2.6, set compatibility behaviour to cmake 2.4
-+# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above
-+# resets the policy settings, so we get a lot of warnings
-+
-+# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough
-+cmake_policy(SET CMP0000 OLD)
-+# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests
-+cmake_policy(SET CMP0002 OLD)
-+# CMP0003: add the link paths to the link command as with cmake 2.4
-+cmake_policy(SET CMP0003 OLD)
-+# CMP0005: keep escaping behaviour for definitions added via add_definitions()
-+cmake_policy(SET CMP0005 OLD)
-+# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file
-+# where this is done, macros and functions are executed with the policies as they
-+# were when the were defined. Keep the OLD behaviour so we can set the policies here
-+# for all KDE software without the big warning
-+cmake_policy(SET CMP0011 OLD)
-+
-+# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files
-+# in this directory over those from CMAKE_MODULE_PATH
-+cmake_policy(SET CMP0017 NEW)
-+
-+# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake
-+if (POLICY CMP0026)
-+ cmake_policy(SET CMP0026 OLD)
-+endif (POLICY CMP0026)
-+
-+
- # Only do something if it hasn't been found yet
- if(NOT KDE4_FOUND)
-
---
-2.5.0
-
diff --git a/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch b/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch
deleted file mode 100644
index ff0306ea1488..000000000000
--- a/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Mon, 7 Sep 2015 13:56:03 -0500
-Subject: [PATCH 2/2] polkit install path
-
----
- kdecore/auth/ConfigureChecks.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake
-index 7cf9cb5..c8334ae 100644
---- a/kdecore/auth/ConfigureChecks.cmake
-+++ b/kdecore/auth/ConfigureChecks.cmake
-@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
- ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
- ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
-
-- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
-+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
- "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
- set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
---
-2.5.0
-
diff --git a/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch
deleted file mode 100644
index a79d7b2b7d16..000000000000
--- a/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
-index ab8f76d..2ae5089 100644
---- a/kdecore/kernel/kstandarddirs.cpp
-+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults()
- else
- {
- xdgdirList.clear();
-- xdgdirList.append(QString::fromLatin1("/etc/xdg"));
--#ifdef Q_WS_WIN
-- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
--#else
-- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
--#endif
- }
-
- QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
-@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults()
- }
- } else {
- xdgdirList = kdedirDataDirs;
--#ifndef Q_WS_WIN
-- xdgdirList.append(QString::fromLatin1("/usr/local/share/"));
-- xdgdirList.append(QString::fromLatin1("/usr/share/"));
--#endif
- }
-
- localXdgDir = readEnvPath("XDG_DATA_HOME");
-diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp
-index 4c9cad9..6849d45 100644
---- a/solid/solid/xdgbasedirs.cpp
-+++ b/solid/solid/xdgbasedirs.cpp
-@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource )
- {
- if ( qstrncmp( "data", resource, 4 ) == 0 ) {
- if ( instance()->mDataDirs.isEmpty() ) {
-- instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" );
-+ instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" );
- }
- return instance()->mDataDirs;
- } else if ( qstrncmp( "config", resource, 6 ) == 0 ) {
- if ( instance()->mConfigDirs.isEmpty() ) {
-- instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" );
-+ instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" );
- }
- return instance()->mConfigDirs;
- }
diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
deleted file mode 100644
index 31e578e228a9..000000000000
--- a/pkgs/applications/kde/kdelibs/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- mkDerivation, lib,
- automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
- attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
- libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
- shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch
-}:
-
-mkDerivation {
- name = "kdelibs";
-
- outputs = [ "out" "dev" ];
-
- outputInclude = "out";
-
- setOutputFlags = false;
-
- nativeBuildInputs = [
- automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
- ];
- buildInputs = [
- attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
- polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre
- ];
- propagatedBuildInputs = [ qt4 soprano phonon strigi ];
-
- patches = [
- ./0001-old-kde4-cmake-policies.patch
- ./0002-polkit-install-path.patch
- ./0003-remove_xdg_impurities.patch
- ];
-
- # cmake does not detect path to `ilmbase`
- NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
-
- cmakeFlags = [
- "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
- "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
- "-DWITH_SOLID_UDISKS2=ON"
- "-DKDE_DEFAULT_HOME=.kde"
- ];
-
- meta = {
- platforms = lib.platforms.linux;
- homepage = http://www.kde.org;
- license = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
- maintainers = [ lib.maintainers.ttuegel ];
- };
-}
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 17d7da7b702c..b5eca47d6c0e 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -21,7 +21,7 @@
, kplotting
, ktextwidgets
, mlt
-, shared_mime_info
+, shared-mime-info
, libv4l
, kfilemetadata
, ffmpeg
@@ -62,7 +62,7 @@ mkDerivation {
qtquickcontrols
qtscript
qtwebkit
- shared_mime_info
+ shared-mime-info
libv4l
ffmpeg
];
diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix
index 0fde861a0237..b3cfed91dd45 100644
--- a/pkgs/applications/kde/kdepim-runtime.nix
+++ b/pkgs/applications/kde/kdepim-runtime.nix
@@ -1,11 +1,11 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- shared_mime_info,
+ shared-mime-info,
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
- pimcommon, qtwebengine,
+ pimcommon, qtwebengine, libkgapi
}:
mkDerivation {
@@ -14,12 +14,12 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
- pimcommon
+ pimcommon libkgapi
];
# Attempts to build some files before dependencies have been generated
enableParallelBuilding = false;
diff --git a/pkgs/applications/kde/kdialog.nix b/pkgs/applications/kde/kdialog.nix
new file mode 100644
index 000000000000..df301af0cbac
--- /dev/null
+++ b/pkgs/applications/kde/kdialog.nix
@@ -0,0 +1,18 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules, kdoctools,
+ kinit, kguiaddons, kwindowsystem
+}:
+
+mkDerivation {
+ name = "kdialog";
+
+ meta = {
+ license = with lib.licenses; [ gpl2 fdl12 ];
+ maintainers = with lib.maintainers; [ peterhoeg ];
+ };
+
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+
+ propagatedBuildInputs = [ kinit kguiaddons kwindowsystem ];
+}
diff --git a/pkgs/applications/kde/kget.nix b/pkgs/applications/kde/kget.nix
new file mode 100644
index 000000000000..6a50f1d08d1c
--- /dev/null
+++ b/pkgs/applications/kde/kget.nix
@@ -0,0 +1,22 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules, kdoctools,
+ kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme,
+ kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui
+}:
+
+mkDerivation {
+ name = "kget";
+
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+
+ buildInputs = [
+ kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme
+ kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui
+ ];
+
+ meta = with lib; {
+ license = with licenses; [ gpl2 ];
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index a78da6f48ca2..13585848317b 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info,
+ mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info,
exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,
kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,
@@ -12,11 +12,11 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
kpty libmtp libssh openexr openslp phonon qtsvg samba solid
];
- NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
+ CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ];
}
diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix
index 9f3d5e2ea019..f380315cce90 100644
--- a/pkgs/applications/kde/kmail-account-wizard.nix
+++ b/pkgs/applications/kde/kmail-account-wizard.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib, kdepimTeam,
- extra-cmake-modules, kdoctools, shared_mime_info,
+ extra-cmake-modules, kdoctools, shared-mime-info,
akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,
kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,
kwallet, libkdepim, libkleo, pimcommon, qttools,
@@ -12,7 +12,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [
akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport
knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim
diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix
index 19ce2ba94f30..c4b7c0ab4327 100644
--- a/pkgs/applications/kde/kmailtransport.nix
+++ b/pkgs/applications/kde/kmailtransport.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet,
+ akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp
}:
mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ akonadi kcmutils ki18n kio ];
+ buildInputs = [ akonadi kcmutils ki18n kio ksmtp ];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index b18a3f7fdc1e..4523a69fc1be 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -10,7 +10,7 @@ mkDerivation {
license = [ lib.licenses.lgpl21 ];
maintainers = kdepimTeam;
};
- nativeBuildInputs = [ extra-cmake-modules ki18n ];
- buildInputs = [ kcodecs qtbase ];
+ nativeBuildInputs = [ extra-cmake-modules ];
+ buildInputs = [ kcodecs ki18n qtbase ];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
new file mode 100644
index 000000000000..74e83761eb7d
--- /dev/null
+++ b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
@@ -0,0 +1,25 @@
+From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001
+From: gnidorah
+Date: Fri, 22 Dec 2017 19:32:47 +0300
+Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 83c2bcb..5f6d47c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS
+ REQUIRED_HEADERS KSMTP_HEADERS
+ )
+
+-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h
+--
+2.15.1
+
diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix
new file mode 100644
index 000000000000..6a5f51a17bfe
--- /dev/null
+++ b/pkgs/applications/kde/ksmtp/default.nix
@@ -0,0 +1,17 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kcoreaddons, kio, kmime, cyrus_sasl
+}:
+
+mkDerivation {
+ name = "ksmtp";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ kcoreaddons kio kmime ];
+ propagatedBuildInputs = [ cyrus_sasl ];
+ patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
+}
diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix
deleted file mode 100644
index 10a8472d5a9e..000000000000
--- a/pkgs/applications/kde/l10n.nix
+++ /dev/null
@@ -1,181 +0,0 @@
-{ callPackage, recurseIntoAttrs, lib }:
-
-let
-
- kdeLocale4 = import ./kde-locale-4.nix;
-
-in
-
-lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
- ar = {
- qt4 = callPackage (kdeLocale4 "ar" {}) {};
- };
- bg = {
- qt4 = callPackage (kdeLocale4 "bg" {}) {};
- };
- bs = {
- qt4 = callPackage (kdeLocale4 "bs" {}) {};
- };
- ca = {
- qt4 = callPackage (kdeLocale4 "ca" {}) {};
- };
- ca_valencia = {
- qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
- };
- cs = {
- qt4 = callPackage (kdeLocale4 "cs" {}) {};
- };
- da = {
- qt4 = callPackage (kdeLocale4 "da" {}) {};
- };
- de = {
- qt4 = callPackage (kdeLocale4 "de" {}) {};
- };
- el = {
- qt4 = callPackage (kdeLocale4 "el" {}) {};
- };
- en_GB = {
- qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
- };
- eo = {
- qt4 = callPackage (kdeLocale4 "eo" {}) {};
- };
- es = {
- qt4 = callPackage (kdeLocale4 "es" {}) {};
- };
- et = {
- qt4 = callPackage (kdeLocale4 "et" {}) {};
- };
- eu = {
- qt4 = callPackage (kdeLocale4 "eu" {}) {};
- };
- fa = {
- qt4 = callPackage (kdeLocale4 "fa" {}) {};
- };
- fi = {
- qt4 = callPackage (kdeLocale4 "fi" {}) {};
- };
- fr = {
- qt4 = callPackage (kdeLocale4 "fr" {}) {};
- };
- ga = {
- qt4 = callPackage (kdeLocale4 "ga" {}) {};
- };
- gl = {
- qt4 = callPackage (kdeLocale4 "gl" {}) {};
- };
- he = {
- qt4 = callPackage (kdeLocale4 "he" {}) {};
- };
- hi = {
- qt4 = callPackage (kdeLocale4 "hi" {}) {};
- };
- hr = {
- qt4 = callPackage (kdeLocale4 "hr" {}) {};
- };
- hu = {
- qt4 = callPackage (kdeLocale4 "hu" {}) {};
- };
- ia = {
- qt4 = callPackage (kdeLocale4 "ia" {}) {};
- };
- id = {
- qt4 = callPackage (kdeLocale4 "id" {}) {};
- };
- is = {
- qt4 = callPackage (kdeLocale4 "is" {}) {};
- };
- it = {
- qt4 = callPackage (kdeLocale4 "it" {}) {};
- };
- ja = {
- qt4 = callPackage (kdeLocale4 "ja" {}) {};
- };
- kk = {
- qt4 = callPackage (kdeLocale4 "kk" {}) {};
- };
- km = {
- qt4 = callPackage (kdeLocale4 "km" {}) {};
- };
- ko = {
- qt4 = callPackage (kdeLocale4 "ko" {}) {};
- };
- lt = {
- qt4 = callPackage (kdeLocale4 "lt" {}) {};
- };
- lv = {
- qt4 = callPackage (kdeLocale4 "lv" {}) {};
- };
- mr = {
- qt4 = callPackage (kdeLocale4 "mr" {}) {};
- };
- nb = {
- qt4 = callPackage (kdeLocale4 "nb" {}) {};
- };
- nds = {
- qt4 = callPackage (kdeLocale4 "nds" {}) {};
- };
- nl = {
- qt4 = callPackage (kdeLocale4 "nl" {}) {};
- };
- nn = {
- qt4 = callPackage (kdeLocale4 "nn" {}) {};
- };
- pa = {
- qt4 = callPackage (kdeLocale4 "pa" {}) {};
- };
- pl = {
- qt4 = callPackage (kdeLocale4 "pl" {}) {};
- };
- pt = {
- qt4 = callPackage (kdeLocale4 "pt" {}) {};
- };
- pt_BR = {
- qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
- };
- ro = {
- qt4 = callPackage (kdeLocale4 "ro" {}) {};
- };
- ru = {
- qt4 = callPackage (kdeLocale4 "ru" {}) {};
- };
- sk = {
- qt4 = callPackage (kdeLocale4 "sk" {}) {};
- };
- sl = {
- qt4 = callPackage (kdeLocale4 "sl" {}) {};
- };
- sr = {
- qt4 = callPackage (kdeLocale4 "sr" {
- preConfigure = ''
- patchShebangs \
- 4/sr/sr@latin/scripts/ts-pmap-compile.py \
- 4/sr/scripts/ts-pmap-compile.py \
- 4/sr/data/resolve-sr-hybrid \
- 4/sr/sr@ijekavian/scripts/ts-pmap-compile.py \
- 4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py
- '';
- }) {};
- };
- sv = {
- qt4 = callPackage (kdeLocale4 "sv" {}) {};
- };
- tr = {
- qt4 = callPackage (kdeLocale4 "tr" {}) {};
- };
- ug = {
- qt4 = callPackage (kdeLocale4 "ug" {}) {};
- };
- uk = {
- qt4 = callPackage (kdeLocale4 "uk" {}) {};
- };
- wa = {
- qt4 = callPackage (kdeLocale4 "wa" {}) {};
- };
- zh_CN = {
- qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
- };
- zh_TW = {
- qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
- };
-}
diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix
index edd9732d051b..3fd486056542 100644
--- a/pkgs/applications/kde/libkcddb.nix
+++ b/pkgs/applications/kde/libkcddb.nix
@@ -8,8 +8,8 @@ mkDerivation {
license = with licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = with maintainers; [ peterhoeg ];
};
- nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ qtbase kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ qtbase ];
propagatedBuildInputs = [
kcodecs ki18n kio kwidgetsaddons
libmusicbrainz5
diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix
new file mode 100644
index 000000000000..7ff3a1f04b09
--- /dev/null
+++ b/pkgs/applications/kde/libkgapi.nix
@@ -0,0 +1,15 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ qtwebengine, kio, kcalcore, kcontacts
+}:
+
+mkDerivation {
+ name = "libkgapi";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ qtwebengine kio kcalcore kcontacts ];
+}
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index 1217c29032b4..e0e80b05ebce 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,7 +1,7 @@
{ mkDerivation, lib
, extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebkit
-, krunner, shared_mime_info, kparts, knewstuff
+, krunner, shared-mime-info, kparts, knewstuff
, gpsd, perl
}:
@@ -10,7 +10,7 @@ mkDerivation {
meta.license = with lib.licenses; [ lgpl21 gpl3 ];
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
propagatedBuildInputs = [
- qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts
+ qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts
knewstuff gpsd
];
}
diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix
index fd628a7aacfd..efe850ab414d 100644
--- a/pkgs/applications/kde/minuet.nix
+++ b/pkgs/applications/kde/minuet.nix
@@ -1,5 +1,5 @@
{ mkDerivation
-, lib, extra-cmake-modules
+, lib, extra-cmake-modules, gettext, python
, drumstick, fluidsynth
, kcoreaddons, kcrash, kdoctools
, qtquickcontrols2, qtsvg, qttools
@@ -12,11 +12,13 @@ mkDerivation {
maintainers = with maintainers; [ peterhoeg ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
+
propagatedBuildInputs = [
drumstick fluidsynth
kcoreaddons kcrash
qtquickcontrols2 qtsvg qttools
];
+
enableParallelBuilding = true;
}
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 422968be35a5..0ac8ddebc75d 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
qtscript, kconfig, kinit, karchive, kcrash,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
- shared_mime_info
+ shared-mime-info
}:
mkDerivation {
@@ -13,7 +13,7 @@ mkDerivation {
maintainers = with lib.maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
- buildInputs = [ shared_mime_info ];
+ buildInputs = [ shared-mime-info ];
propagatedBuildInputs = [
kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
karchive kcrash
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 64511aabf7c0..5f6f28c95b08 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,25 +1,27 @@
{
- mkDerivation, lib,
+ stdenv, mkDerivation, lib,
extra-cmake-modules, kdoctools,
- djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
- kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
- kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
- libspectre, phonon, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
+ chmlib ? null, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks,
+ kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
+ kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet,
+ kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5,
+ qtdeclarative, qtsvg, threadweaver
}:
mkDerivation {
name = "okular";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
- kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio
- kparts kpty kwallet kwindowsystem libkexiv2 libspectre phonon poppler
- qca-qt5 qtdeclarative qtsvg threadweaver
- ];
- meta = {
- platforms = lib.platforms.linux;
+ discount djvulibre ebook_tools kactivities karchive kbookmarks
+ kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
+ kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet
+ kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
+ qtdeclarative qtsvg threadweaver
+ ] ++ lib.optional (!stdenv.isAarch64) chmlib;
+ meta = with lib; {
homepage = http://www.kde.org;
- license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
- maintainers = [ lib.maintainers.ttuegel ];
+ license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+ maintainers = with maintainers; [ ttuegel ];
+ platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 2edfb0d79bb3..d61784805e45 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,1691 @@
{
akonadi = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadi-17.08.3.tar.xz";
- sha256 = "01sn0c5b679v76djpd7rx3cgzn3idpsjc3m3wgrvjzfyqs18f2al";
- name = "akonadi-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz";
+ sha256 = "006cb98k3kxd51d0d07984aj4d0km0bn0v3rigpa3sw5s07w8dfi";
+ name = "akonadi-17.12.3.tar.xz";
};
};
akonadi-calendar = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-17.08.3.tar.xz";
- sha256 = "1w14a27k0hw4i9vnv2bkh12jpvb6jh31i6jd4hxaxvvmmjwl68b6";
- name = "akonadi-calendar-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-17.12.3.tar.xz";
+ sha256 = "0ffrnpwyjmvx80qziajdkihdzl5pyp0zbm8qg8wkcr8nxs3fgv6a";
+ name = "akonadi-calendar-17.12.3.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-tools-17.08.3.tar.xz";
- sha256 = "19b5my6svq32nwagkq5p0al7mzf844d4pp0764irgdcfk6ciakkw";
- name = "akonadi-calendar-tools-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz";
+ sha256 = "0836al499pd0bmwgaqzmbbmas3jmn44hv37y9k6j6ab71gpkjjy9";
+ name = "akonadi-calendar-tools-17.12.3.tar.xz";
};
};
akonadiconsole = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadiconsole-17.08.3.tar.xz";
- sha256 = "1ccmdarzb60f22ypnfmr1gzrc7byw08c2h3zhni9g1jab327i2vk";
- name = "akonadiconsole-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/akonadiconsole-17.12.3.tar.xz";
+ sha256 = "0xny4y5i03sj93dxaafnqiyczichjnzjrx1h4z13fn62flz8fn1b";
+ name = "akonadiconsole-17.12.3.tar.xz";
};
};
akonadi-contacts = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadi-contacts-17.08.3.tar.xz";
- sha256 = "0fh9rja4dlvambx6ig4gszgr26rrxfhmgdn0541fsg5hpkpifsx9";
- name = "akonadi-contacts-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/akonadi-contacts-17.12.3.tar.xz";
+ sha256 = "0jbxyzvpp2lan8pi212adwflqx38paqvr661ia4zmdjnkhdvi95v";
+ name = "akonadi-contacts-17.12.3.tar.xz";
};
};
akonadi-import-wizard = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadi-import-wizard-17.08.3.tar.xz";
- sha256 = "1hza7bl6anzxp32dpw79v73lgqssmdw32qhkinnacws7x9kcvpag";
- name = "akonadi-import-wizard-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/akonadi-import-wizard-17.12.3.tar.xz";
+ sha256 = "0knddbgirj55l24njak7s8ixg1v9i6g5nx6ijh6cnnbr2zl6aws4";
+ name = "akonadi-import-wizard-17.12.3.tar.xz";
};
};
akonadi-mime = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadi-mime-17.08.3.tar.xz";
- sha256 = "1374wvyh29ba5s60m8przch5rmxvxzc2kjfw1gxhkrl7k8hfi4k8";
- name = "akonadi-mime-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/akonadi-mime-17.12.3.tar.xz";
+ sha256 = "0n04x37palp2k6mq20p97k89qi2zfncaapn5pcf4372bzvzi9vj2";
+ name = "akonadi-mime-17.12.3.tar.xz";
};
};
akonadi-notes = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadi-notes-17.08.3.tar.xz";
- sha256 = "0bnr6j8pqqx6hg8hq51yzaky5hyym5lxyj9rwcsmm75x2c29wxb7";
- name = "akonadi-notes-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/akonadi-notes-17.12.3.tar.xz";
+ sha256 = "0lwnyl12a5sc3ijmahqy3prdzh9352rsqp2jpw2y58xpa2sx0w3g";
+ name = "akonadi-notes-17.12.3.tar.xz";
};
};
akonadi-search = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akonadi-search-17.08.3.tar.xz";
- sha256 = "16d6v2d1irh02kd4dcvjhv17sqkps4xq4dpa4x1wb3q5qzxhmqcr";
- name = "akonadi-search-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/akonadi-search-17.12.3.tar.xz";
+ sha256 = "0npnbnras7lxs4r1g0v2nynpdni7wni7y9hy30k61lbif06ghm9x";
+ name = "akonadi-search-17.12.3.tar.xz";
};
};
akregator = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/akregator-17.08.3.tar.xz";
- sha256 = "1jd48yj9sl4z46qfk3qkm98q33f1qblsyjdr7ff8znxkg2pw5xg6";
- name = "akregator-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/akregator-17.12.3.tar.xz";
+ sha256 = "0032jg05xwk29hpqscb5xfk7ipcpprhw8m28ksfx7v77fb025dsp";
+ name = "akregator-17.12.3.tar.xz";
};
};
analitza = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/analitza-17.08.3.tar.xz";
- sha256 = "1j0z63sfah2ypjb3szcr7dqndw18lcy8l9440q8kzq0gyl83cn3v";
- name = "analitza-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/analitza-17.12.3.tar.xz";
+ sha256 = "0xyr5s69768l0lp1qkp68jvny8mfh36q1xpz8msdhcn4513bw5sw";
+ name = "analitza-17.12.3.tar.xz";
};
};
ark = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ark-17.08.3.tar.xz";
- sha256 = "1qz333nd23x4ldx675cxs7ka2vz45xmkfsakdg8m3x26i7jnl86x";
- name = "ark-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ark-17.12.3.tar.xz";
+ sha256 = "0hjnzcn6ijpgqld7034gwzyl9m0i5nwac457f010ibzf0qp10gdi";
+ name = "ark-17.12.3.tar.xz";
};
};
artikulate = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/artikulate-17.08.3.tar.xz";
- sha256 = "13hg9cjdwhfya57xan96ma55msani0lx7v55zh0hv0jab9fxgv1n";
- name = "artikulate-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/artikulate-17.12.3.tar.xz";
+ sha256 = "0ynbq0m7rk4mm3khjsh0bl744g7m6l2cq9v2a4slg7n4dq8gr8zx";
+ name = "artikulate-17.12.3.tar.xz";
};
};
audiocd-kio = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/audiocd-kio-17.08.3.tar.xz";
- sha256 = "0n1xfypn2m56iw65p52yfbbqn17c6kc1x8syh35ifg9c1147y8ar";
- name = "audiocd-kio-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/audiocd-kio-17.12.3.tar.xz";
+ sha256 = "0916igzdp1v9zafq5jwhwsfja5h9zsbqgwq97mnkmx9bnd4d2r26";
+ name = "audiocd-kio-17.12.3.tar.xz";
};
};
baloo-widgets = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/baloo-widgets-17.08.3.tar.xz";
- sha256 = "031yhv8ivqzr63maylsin60hfv45awry6xigfy0kfqj06q63944g";
- name = "baloo-widgets-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/baloo-widgets-17.12.3.tar.xz";
+ sha256 = "1gn18raxqwjx09l54a4gaisxlv4i2vf7pnpv8fqfdk49wc06b58h";
+ name = "baloo-widgets-17.12.3.tar.xz";
};
};
blinken = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/blinken-17.08.3.tar.xz";
- sha256 = "15nnsyqy73inqqys1r8khh1vvl24ljmgjpxlqg8vlfb6d8dsc8yx";
- name = "blinken-17.08.3.tar.xz";
- };
- };
- blogilo = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/blogilo-17.08.3.tar.xz";
- sha256 = "18vbvs5cih9vcxfqsia35q8bzc4ldzaajvnv9iqmisg060fxfwi9";
- name = "blogilo-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/blinken-17.12.3.tar.xz";
+ sha256 = "0lda34yw7h867jzfqi071yw0g47916cmr145x1gz71nclg9sdgr0";
+ name = "blinken-17.12.3.tar.xz";
};
};
bomber = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/bomber-17.08.3.tar.xz";
- sha256 = "1rmjlhyc46jxjsc303zl56c3k15q1qvp4yfl78v5l2pwmk8vdxzn";
- name = "bomber-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/bomber-17.12.3.tar.xz";
+ sha256 = "14iyn9901canzd4hpsb4xwxd67j01wn54asplvlizmwy3jhpfx9s";
+ name = "bomber-17.12.3.tar.xz";
};
};
bovo = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/bovo-17.08.3.tar.xz";
- sha256 = "1npzzjgzhgbv7pnz3j9if2c5qa5b9ghzj7llp8yndf6dz31qibps";
- name = "bovo-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/bovo-17.12.3.tar.xz";
+ sha256 = "15zaf8017zqfj4z0mlc321lvfnfhda8n648zlsxxap1lj6icr3s9";
+ name = "bovo-17.12.3.tar.xz";
};
};
calendarsupport = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/calendarsupport-17.08.3.tar.xz";
- sha256 = "1ii3h42jkskrizg29ii17jkdxgsqs3lwzsd7ypgw1k8gk9fyyqxh";
- name = "calendarsupport-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/calendarsupport-17.12.3.tar.xz";
+ sha256 = "020ra0sbc8pmibff5ffyzhqwww8qdi1wlmn6h9qh0z2sjk9hrs84";
+ name = "calendarsupport-17.12.3.tar.xz";
};
};
cantor = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/cantor-17.08.3.tar.xz";
- sha256 = "0yz71lxwzl5r9k2fzs4iyhyx811rc77m6n1lqagd2c29hnnchn9w";
- name = "cantor-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/cantor-17.12.3.tar.xz";
+ sha256 = "08jhbm54vv5s14ig2adw83fkk1r0p98aifhiq0sc4xga7gkx032w";
+ name = "cantor-17.12.3.tar.xz";
};
};
cervisia = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/cervisia-17.08.3.tar.xz";
- sha256 = "0272zf51rn1a9k796fspp456zq6j21bddfn7r350pd6ra19ay7j8";
- name = "cervisia-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/cervisia-17.12.3.tar.xz";
+ sha256 = "04qvgpaa5mf9jmlqd60r1df3r9rscaqasfa9c39cfmahrnvm4yyr";
+ name = "cervisia-17.12.3.tar.xz";
};
};
dolphin = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/dolphin-17.08.3.tar.xz";
- sha256 = "02bb66411jy03s4wicalnsl6sxmslhdb3wxsqh7sdyh63llna5b5";
- name = "dolphin-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/dolphin-17.12.3.tar.xz";
+ sha256 = "0fd4c7kwdvjpx7q9yb2razdlv6q7y74nkk99jg20jsng0px9dp20";
+ name = "dolphin-17.12.3.tar.xz";
};
};
dolphin-plugins = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/dolphin-plugins-17.08.3.tar.xz";
- sha256 = "1s2rjrvfs5i87gx3fsz0mqdr7106ds5747wq6n2sfzjkvippygay";
- name = "dolphin-plugins-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/dolphin-plugins-17.12.3.tar.xz";
+ sha256 = "0bdvwsl83bilm1jhgmcl0b8iyh4vbfg3imara2rmizfxl5g6jccf";
+ name = "dolphin-plugins-17.12.3.tar.xz";
};
};
dragon = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/dragon-17.08.3.tar.xz";
- sha256 = "0fxzwfg0l7lnsswb51h8gmh4wngmng9sgm5nhn6wmwhfbhbzgagq";
- name = "dragon-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/dragon-17.12.3.tar.xz";
+ sha256 = "1j5li70fyz1ynykmxb63i2na3n964lsdkyilj1vhdzb55592b1s4";
+ name = "dragon-17.12.3.tar.xz";
};
};
eventviews = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/eventviews-17.08.3.tar.xz";
- sha256 = "0j1r833kzf9sparvqnfn8r7klf4j0z8jwrgclf87rggmx0dn2v4y";
- name = "eventviews-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/eventviews-17.12.3.tar.xz";
+ sha256 = "0v712sisa0bic6zbl7gb4jvh11wf7krsfpxffxgxc3i8zmvw9jfc";
+ name = "eventviews-17.12.3.tar.xz";
};
};
ffmpegthumbs = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ffmpegthumbs-17.08.3.tar.xz";
- sha256 = "19bkpc316wlhswgrbszpj65lrzsdp443c1174hqknm0srvp6fbvv";
- name = "ffmpegthumbs-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ffmpegthumbs-17.12.3.tar.xz";
+ sha256 = "18f2yxbfxrf4598xwzjd6fws35ipnvnsljv5jwy9lmq400iqpii5";
+ name = "ffmpegthumbs-17.12.3.tar.xz";
};
};
filelight = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/filelight-17.08.3.tar.xz";
- sha256 = "06j6api909shraflfpn0cyvxaa57s2dq178kshkfv5yppxjpfpja";
- name = "filelight-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/filelight-17.12.3.tar.xz";
+ sha256 = "1k8vibkxv8m8f2q4hj3g4jvk96zkkd0wpxhag5jycla6v50q9anf";
+ name = "filelight-17.12.3.tar.xz";
};
};
granatier = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/granatier-17.08.3.tar.xz";
- sha256 = "1z2gs73k8ymz09x72hvyylwqs6pxbnivz86hbb9pb1mlb7x5fgvs";
- name = "granatier-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/granatier-17.12.3.tar.xz";
+ sha256 = "1zysqf68d2zzhii587a3qdqqf1zhi2k3008f626r59a0yb2bdz9x";
+ name = "granatier-17.12.3.tar.xz";
};
};
grantlee-editor = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/grantlee-editor-17.08.3.tar.xz";
- sha256 = "1cb77qmzzk64mkbzvywksvpfqw88mwmg7sqrni4apsasvg9mvygx";
- name = "grantlee-editor-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/grantlee-editor-17.12.3.tar.xz";
+ sha256 = "03v4yrmbkpa6w8kq54iv0a6rx0q7zv1jmwka103iv89qf9d332j4";
+ name = "grantlee-editor-17.12.3.tar.xz";
};
};
grantleetheme = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/grantleetheme-17.08.3.tar.xz";
- sha256 = "0zag5gmaqi068hw8s71ascj7s8clg1sickrfpzjf3nhcf6y669rp";
- name = "grantleetheme-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/grantleetheme-17.12.3.tar.xz";
+ sha256 = "0q6s5h236a61q015g9238jandibfhpw9yrx7s367qagk5wi4phsx";
+ name = "grantleetheme-17.12.3.tar.xz";
};
};
gwenview = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/gwenview-17.08.3.tar.xz";
- sha256 = "05c96y5yrdgh7228bw3agn344g02hylnb2fw8crjcdapsiya4v1w";
- name = "gwenview-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/gwenview-17.12.3.tar.xz";
+ sha256 = "03gz5a4531xhmr0m5x7nzwzfr3j61xy8yw6pk06i6q7azbxxr1rr";
+ name = "gwenview-17.12.3.tar.xz";
};
};
incidenceeditor = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/incidenceeditor-17.08.3.tar.xz";
- sha256 = "0qfcycivlgzjx8j4b2bd4qjp3x8wbiax477bmz56sfv7q0vp1dgm";
- name = "incidenceeditor-17.08.3.tar.xz";
- };
- };
- jovie = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/jovie-17.08.3.tar.xz";
- sha256 = "1a4v97p3yfwr5zn5qkfkw1ln7liz47f3bnhdb6yzzi03s5xfrk1z";
- name = "jovie-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/incidenceeditor-17.12.3.tar.xz";
+ sha256 = "19jl8mpabxm8gk7krpby1c0kcrss1nvxl5blpviy0m4ccq5jsbka";
+ name = "incidenceeditor-17.12.3.tar.xz";
};
};
juk = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/juk-17.08.3.tar.xz";
- sha256 = "0735rdrn80akfb8viq8y77kxa28y1rg5infp26q7cy5cd4r6fvsi";
- name = "juk-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/juk-17.12.3.tar.xz";
+ sha256 = "1zzzvwn3ahzwkd7gdavz6k72js2xh79wf1w06vfjx9h35j54smb6";
+ name = "juk-17.12.3.tar.xz";
};
};
k3b = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/k3b-17.08.3.tar.xz";
- sha256 = "0kshb3j4djb9npkia0m0ffyrwja3drsyxw7hpgyxxswik6kwbvgk";
- name = "k3b-17.08.3.tar.xz";
- };
- };
- kaccessible = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kaccessible-17.08.3.tar.xz";
- sha256 = "0sfrs57npp4y1yyw16chgrvyp6bnf4jymffblj5h7pb4bv0xlsmk";
- name = "kaccessible-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz";
+ sha256 = "1i74c8x72qx36wl9vc7wcz5rpyd6410n3w8bas7hb5j4bfaapl3l";
+ name = "k3b-17.12.3.tar.xz";
};
};
kaccounts-integration = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kaccounts-integration-17.08.3.tar.xz";
- sha256 = "0cir87m7f8sf70vvr8sxfhklgxigvv6npijphbbim7fnzc4z37m0";
- name = "kaccounts-integration-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kaccounts-integration-17.12.3.tar.xz";
+ sha256 = "0c3jx2wr7qxkh5i3fmhsd1r0aqf133443nc7l7krymjzd54y6db9";
+ name = "kaccounts-integration-17.12.3.tar.xz";
};
};
kaccounts-providers = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kaccounts-providers-17.08.3.tar.xz";
- sha256 = "1y3ykj4q6m14q2lskliv0qy0ml0j9i9svhq06g2j25zd5wwlhbp5";
- name = "kaccounts-providers-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kaccounts-providers-17.12.3.tar.xz";
+ sha256 = "1h2asblaqmyhy4qfzcl7mxinfg0djghr9xrcvl2xyd85jkk428h5";
+ name = "kaccounts-providers-17.12.3.tar.xz";
};
};
kaddressbook = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kaddressbook-17.08.3.tar.xz";
- sha256 = "1dq3lgrvg7s65mc2x2sgkwpz623ygb0by0y571dqjaz219j03955";
- name = "kaddressbook-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kaddressbook-17.12.3.tar.xz";
+ sha256 = "1ys2hrpqpbwpml3arw076gng7ygdvvkwy489lnq7d345y79501bq";
+ name = "kaddressbook-17.12.3.tar.xz";
};
};
kajongg = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kajongg-17.08.3.tar.xz";
- sha256 = "00xb764nxzihz9kh7a82cm7slrj78zjl3s5qb90s03y375q4bha6";
- name = "kajongg-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kajongg-17.12.3.tar.xz";
+ sha256 = "1p39qjj05p1zjlz9f49pvwzvlsa61h549r74ravj4xdl6fqvdgfa";
+ name = "kajongg-17.12.3.tar.xz";
};
};
kalarm = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kalarm-17.08.3.tar.xz";
- sha256 = "0rmdxx59iykn6f746dw9p0dyk96wds4kqr6w2y8fscp889i05g2a";
- name = "kalarm-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kalarm-17.12.3.tar.xz";
+ sha256 = "0n3cdj630q96rvljph3raz0f698pwrh2rx81xzsyp2lk917737h7";
+ name = "kalarm-17.12.3.tar.xz";
};
};
kalarmcal = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kalarmcal-17.08.3.tar.xz";
- sha256 = "0g4vxkjkc38p2aigmfr2q2qd6x8pr4fj53jkvjq314vqg9sbak9c";
- name = "kalarmcal-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kalarmcal-17.12.3.tar.xz";
+ sha256 = "13bg69qsyzjaabghq6n33y211i5mz9pnnc26kqyhg87za526j7km";
+ name = "kalarmcal-17.12.3.tar.xz";
};
};
kalgebra = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kalgebra-17.08.3.tar.xz";
- sha256 = "0hcrl205z2m5108g1kgxnmkrrg6x2m2p59cmdkbsd0ly0jnfc9w2";
- name = "kalgebra-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kalgebra-17.12.3.tar.xz";
+ sha256 = "1vm64azi46zgxg0kjg8ch7gxbb8wb3bafsfgxmv4x1hqy45crkv7";
+ name = "kalgebra-17.12.3.tar.xz";
};
};
kalzium = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kalzium-17.08.3.tar.xz";
- sha256 = "142lcm1d7v8xknmqg00cgdz3iaydr6c9wblpij3wykffd53x7ind";
- name = "kalzium-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kalzium-17.12.3.tar.xz";
+ sha256 = "1zha7iy2wg8dyrajijnc3vy7wb0k4kli4q2xkv6ryc6klrp2910h";
+ name = "kalzium-17.12.3.tar.xz";
};
};
kamera = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kamera-17.08.3.tar.xz";
- sha256 = "0zrny1f27z0drsna2lpw9sr4y7z479lys3vzcysgf1fv8b8jdjdh";
- name = "kamera-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kamera-17.12.3.tar.xz";
+ sha256 = "1xk2cclavzkjifzznd9kx4nq8dysmns2ni9w865s0vvl98z6jbg9";
+ name = "kamera-17.12.3.tar.xz";
};
};
kanagram = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kanagram-17.08.3.tar.xz";
- sha256 = "1v5k67dw47i3n8635w1sc63n7f63hd9wvb44yxaw88clk46acn0k";
- name = "kanagram-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kanagram-17.12.3.tar.xz";
+ sha256 = "05dl248lvskh46mii5glvxpspf6gw1m4z2g6lpb9acafr8cqvz8k";
+ name = "kanagram-17.12.3.tar.xz";
};
};
kapman = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kapman-17.08.3.tar.xz";
- sha256 = "0gici0v3ya16nk0b33cm5n95gdfhjqpy8wjg5y8bj12dby1d0n2w";
- name = "kapman-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kapman-17.12.3.tar.xz";
+ sha256 = "04ngab85hsx4z9h45z32s1arahfzyxkyb4i9w6x51jmm3a7cnp4z";
+ name = "kapman-17.12.3.tar.xz";
};
};
kapptemplate = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kapptemplate-17.08.3.tar.xz";
- sha256 = "16j1lx6rp0lqmcd8fyaishc0i2670v0map270z9575101338cyvm";
- name = "kapptemplate-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kapptemplate-17.12.3.tar.xz";
+ sha256 = "11v108jqmqp4xcmf6nz41fl7avmcpd26w4pdgfk70dzjwpzf1hl3";
+ name = "kapptemplate-17.12.3.tar.xz";
};
};
kate = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kate-17.08.3.tar.xz";
- sha256 = "1yjzhf0a1skxz6iipac3z1p2wswn8bfjfr3k8qb6lhwlhbapc33x";
- name = "kate-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kate-17.12.3.tar.xz";
+ sha256 = "041ax9mvmgi9aj3759411bv1yj0a0v08djmwmn6kbvl8nv6a7dp5";
+ name = "kate-17.12.3.tar.xz";
};
};
katomic = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/katomic-17.08.3.tar.xz";
- sha256 = "0y00la43lc1352fipzglyvaf1cqalf0vkygg8r9vizm8vycp7hp9";
- name = "katomic-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/katomic-17.12.3.tar.xz";
+ sha256 = "1ljc8h2ngsc3cqz58dal3kkn7ymwa23ikxhjakn0nsg07fbqkdjl";
+ name = "katomic-17.12.3.tar.xz";
};
};
kblackbox = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kblackbox-17.08.3.tar.xz";
- sha256 = "18lz0nb8zp95higssscgcr2cj1ni71bckk1wazyryxkmmmqk2rdn";
- name = "kblackbox-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kblackbox-17.12.3.tar.xz";
+ sha256 = "1nc15k4rlpjb9p5y3g6jhi1j8nnwzxv4cymg7m7p356xr5k0m5qm";
+ name = "kblackbox-17.12.3.tar.xz";
};
};
kblocks = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kblocks-17.08.3.tar.xz";
- sha256 = "1nf3ws0dzzwqc87v6jqi1x5zm7w56cgfingr5plpp3cj8wv8jnvw";
- name = "kblocks-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kblocks-17.12.3.tar.xz";
+ sha256 = "04yyz71a4nr8g6fnb3mfsnlisnsw2c28z39w1hn54msmi32wyvi2";
+ name = "kblocks-17.12.3.tar.xz";
};
};
kblog = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kblog-17.08.3.tar.xz";
- sha256 = "0cnbn0wmva8xm2i05w5pdikw5mbx3z6mim3k98v2r954qml7xqdk";
- name = "kblog-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kblog-17.12.3.tar.xz";
+ sha256 = "0169m2h60iygy021j5w7fqww4ljal3gzffmj8f7arf6fin9myhwb";
+ name = "kblog-17.12.3.tar.xz";
};
};
kbounce = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kbounce-17.08.3.tar.xz";
- sha256 = "12yj5jmpvhj5cxr4i818lp9cbcrdrvq9r7s202nzx5znxs11bbf6";
- name = "kbounce-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kbounce-17.12.3.tar.xz";
+ sha256 = "0m0hvb8dv2z5s80c8i0ivkwnp9xaqprvgkgnrfmispj1splpzlvw";
+ name = "kbounce-17.12.3.tar.xz";
};
};
kbreakout = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kbreakout-17.08.3.tar.xz";
- sha256 = "14d4cx91vv8bvvpjwbrwcvjczzs8j58yzazsfgqwhrj47cwhya43";
- name = "kbreakout-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kbreakout-17.12.3.tar.xz";
+ sha256 = "04n01c36dbfq8khklc7jp2d80zxyhfy7v3x4dqpknnq22a8x8f6c";
+ name = "kbreakout-17.12.3.tar.xz";
};
};
kbruch = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kbruch-17.08.3.tar.xz";
- sha256 = "0jxlybkmzs24482fmy7hhk2apyq26fpdblpnpdbqnydz95707475";
- name = "kbruch-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kbruch-17.12.3.tar.xz";
+ sha256 = "1m3cdifm13gyfkhnab3nmw762kvbz64fyfw8py7lqy7i023yg35r";
+ name = "kbruch-17.12.3.tar.xz";
};
};
kcachegrind = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcachegrind-17.08.3.tar.xz";
- sha256 = "0xmnpbli7ndlv0532hpnqgvbkpw8y176jydhs6hy73ywwm416mvs";
- name = "kcachegrind-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kcachegrind-17.12.3.tar.xz";
+ sha256 = "1nsx813dsngf5agdw04cdrw3h8cj4g2na28i5anxbscn7fm715hd";
+ name = "kcachegrind-17.12.3.tar.xz";
};
};
kcalc = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcalc-17.08.3.tar.xz";
- sha256 = "0ck1hjv1v9fj7ckl4blpmfxzjx61ihc6av71m710nk7iv6gncsfm";
- name = "kcalc-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kcalc-17.12.3.tar.xz";
+ sha256 = "0w4rqkjsl24528bqkqansk985iq6nk78bm0pinagm1fqrarjqk8j";
+ name = "kcalc-17.12.3.tar.xz";
};
};
kcalcore = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcalcore-17.08.3.tar.xz";
- sha256 = "0iy6dwzrcwzhjcz8yajp4mvbxr6vkxp4bnbnh9k2zvxgmg4y63h5";
- name = "kcalcore-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kcalcore-17.12.3.tar.xz";
+ sha256 = "125qdd3gp6bwm6lqc1ib4icv3sa8sd0n5fjbgwr4klx8xsxzr03z";
+ name = "kcalcore-17.12.3.tar.xz";
};
};
kcalutils = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcalutils-17.08.3.tar.xz";
- sha256 = "1vs6qnv31s01i7wb7kz86v17z0wrymcclmwx2hj7vl4jqr532zdq";
- name = "kcalutils-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kcalutils-17.12.3.tar.xz";
+ sha256 = "1cag7pg9qd8w7xmvplkqr6p6pscnjzlzlin9fi6yjhhsq8bi2rxb";
+ name = "kcalutils-17.12.3.tar.xz";
};
};
kcharselect = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcharselect-17.08.3.tar.xz";
- sha256 = "1ib3rqd43yprnp07vvmg029a44dimisycv030j3qd87r3yw06phs";
- name = "kcharselect-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kcharselect-17.12.3.tar.xz";
+ sha256 = "1chxa1nsczk525hvwyw6cbzdr73i21zw9jngp9c79frcnpb5hdi4";
+ name = "kcharselect-17.12.3.tar.xz";
};
};
kcolorchooser = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcolorchooser-17.08.3.tar.xz";
- sha256 = "17aa2k8z7i7ds2s3ampkci4n0003rsbx4fj3l773ylb11fyl3b2f";
- name = "kcolorchooser-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kcolorchooser-17.12.3.tar.xz";
+ sha256 = "1yf8bizxd65h9pzai51l7piw5p4rlcl2bmw3qf9s73xii9cxz8yl";
+ name = "kcolorchooser-17.12.3.tar.xz";
};
};
kcontacts = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcontacts-17.08.3.tar.xz";
- sha256 = "0dsx0bgf6rcqrl31xcklh368lr93pn2ylipw81svpnqya1ry31dk";
- name = "kcontacts-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz";
+ sha256 = "08gzaznb6nazqcd5v755cs6fvxq4y1ywa7qbff7fb28sbkz6sdjl";
+ name = "kcontacts-17.12.3.tar.xz";
};
};
kcron = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kcron-17.08.3.tar.xz";
- sha256 = "0xmd25dfhpkaa6zzmc7xdfn4fv0awfqjv2r166hmqd32gnx70bry";
- name = "kcron-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kcron-17.12.3.tar.xz";
+ sha256 = "0kdd0kzx26jhwrz9ism9fc5gbf1fh0qsb6h3gmx524r40wzr45bf";
+ name = "kcron-17.12.3.tar.xz";
};
};
kdav = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdav-17.08.3.tar.xz";
- sha256 = "1v7xclq8qz4pmvp1asavammlfwi2pg1y0fabapqpnglx194rbwic";
- name = "kdav-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdav-17.12.3.tar.xz";
+ sha256 = "141a2fk3n18554qh8h00dnik33pf4jmvp1z94gbhscgkza1xdlx4";
+ name = "kdav-17.12.3.tar.xz";
};
};
kdebugsettings = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdebugsettings-17.08.3.tar.xz";
- sha256 = "1gfcnwpmx6dd12d9kycf0khi5s85932b1wvyw1mr5dhlqyyqf1s4";
- name = "kdebugsettings-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdebugsettings-17.12.3.tar.xz";
+ sha256 = "0y71ay5b7fly5rbl7fii6glkhmdkrk6fxmyx5ick5jgjgnmzjkdr";
+ name = "kdebugsettings-17.12.3.tar.xz";
};
};
kde-dev-scripts = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-dev-scripts-17.08.3.tar.xz";
- sha256 = "1dydd198jfcjm58m5qk071kx18gbgnbwf9mcx20ibanq17cdh3px";
- name = "kde-dev-scripts-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kde-dev-scripts-17.12.3.tar.xz";
+ sha256 = "1mipi7fchmf6rmivlpbncx106axaw9hi9r1kd7ibn5jqz0raa554";
+ name = "kde-dev-scripts-17.12.3.tar.xz";
};
};
kde-dev-utils = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-dev-utils-17.08.3.tar.xz";
- sha256 = "184sx4i5k8rnx5572460v2jnd0abdr2i5gp74khbjlgagkdvcj07";
- name = "kde-dev-utils-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kde-dev-utils-17.12.3.tar.xz";
+ sha256 = "05a8h9bdg81zlaf1zqk8vdqp1d2lkymdg82ppxvm2sxg00rrzgp6";
+ name = "kde-dev-utils-17.12.3.tar.xz";
};
};
kdeedu-data = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdeedu-data-17.08.3.tar.xz";
- sha256 = "12vy656ng14gq93cw30bwdg15jvwr6qvlsjk0vfmljvcbc9171ww";
- name = "kdeedu-data-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdeedu-data-17.12.3.tar.xz";
+ sha256 = "17xdhkaavz1b5f2iqw64b7891qc8l2i3f90zr2byw4j05gfm24wr";
+ name = "kdeedu-data-17.12.3.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-mobipocket-17.08.3.tar.xz";
- sha256 = "1rfi44lh25knc0jf02fazh6s4wy1h8m76i9njcjxbjrz7x518cfj";
- name = "kdegraphics-mobipocket-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-mobipocket-17.12.3.tar.xz";
+ sha256 = "16l5s4ha93h7bvb07kx60674i0j1n26c16w8q3drl8jmkmmf2h4j";
+ name = "kdegraphics-mobipocket-17.12.3.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-thumbnailers-17.08.3.tar.xz";
- sha256 = "0irsa4x6pi5jq36yz1kgkdv8946w05mr19afydpz1jpa2knhkc6i";
- name = "kdegraphics-thumbnailers-17.08.3.tar.xz";
- };
- };
- kde-l10n-ar = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ar-17.08.3.tar.xz";
- sha256 = "0j06r39gam92bxm25vc8x7bxm6143pww42d9ala13akh3gh56wmy";
- name = "kde-l10n-ar-17.08.3.tar.xz";
- };
- };
- kde-l10n-ast = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ast-17.08.3.tar.xz";
- sha256 = "1kmv0ajbd9dws1al4qx9k2hnsqf2dwkj2ww12xn3flrqg71kgnpb";
- name = "kde-l10n-ast-17.08.3.tar.xz";
- };
- };
- kde-l10n-bg = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bg-17.08.3.tar.xz";
- sha256 = "0dv2hdki9mbc6kq6b1gzpqijgq31ffz4la9aprzj57mk4l14vkp1";
- name = "kde-l10n-bg-17.08.3.tar.xz";
- };
- };
- kde-l10n-bs = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bs-17.08.3.tar.xz";
- sha256 = "0makcag2kjns6528ldrjr52r412yi1y947lqq5db8ya6i8bxlsl2";
- name = "kde-l10n-bs-17.08.3.tar.xz";
- };
- };
- kde-l10n-ca = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca-17.08.3.tar.xz";
- sha256 = "13n0y9rmcnaka5hnmjp6x99pdvx19bb5f7m0wmnkkq0v8xs0cr53";
- name = "kde-l10n-ca-17.08.3.tar.xz";
- };
- };
- kde-l10n-ca_valencia = {
- version = "ca_valencia-17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca@valencia-17.08.3.tar.xz";
- sha256 = "0h4iznjvzy4lvb91vpb4f7jlrvi3a9z56i7j3xm0ihf1qmgxxzmj";
- name = "kde-l10n-ca_valencia-17.08.3.tar.xz";
- };
- };
- kde-l10n-cs = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-cs-17.08.3.tar.xz";
- sha256 = "0dadsgmg7pvagpq0nj4hs889zvk2lw085wlv2mw6jfminjav4c2d";
- name = "kde-l10n-cs-17.08.3.tar.xz";
- };
- };
- kde-l10n-da = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-da-17.08.3.tar.xz";
- sha256 = "04w1clqk3p0zkv01406iwkwp572vwfpn94x8g7hxraaz2rzs2qnf";
- name = "kde-l10n-da-17.08.3.tar.xz";
- };
- };
- kde-l10n-de = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-de-17.08.3.tar.xz";
- sha256 = "1cxpdwvpymf1yqgs54v6f8hgxwyblv0i0zpm5w5wrimmg8lnbrc8";
- name = "kde-l10n-de-17.08.3.tar.xz";
- };
- };
- kde-l10n-el = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-el-17.08.3.tar.xz";
- sha256 = "1csskz68dsrlvkr5iri8w0wx2g5h7db18dpnlcmbl076l9ds9nmv";
- name = "kde-l10n-el-17.08.3.tar.xz";
- };
- };
- kde-l10n-en_GB = {
- version = "en_GB-17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-en_GB-17.08.3.tar.xz";
- sha256 = "1vf6h68biiqr9vzqlig34z47clkdk6ncr3mhan7rajsk1dlp6qwy";
- name = "kde-l10n-en_GB-17.08.3.tar.xz";
- };
- };
- kde-l10n-eo = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eo-17.08.3.tar.xz";
- sha256 = "0a7wk6xfhq7zj02zjadnp7ml97r5vvgjvlm5yajz6l4q5l0vsdnn";
- name = "kde-l10n-eo-17.08.3.tar.xz";
- };
- };
- kde-l10n-es = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-es-17.08.3.tar.xz";
- sha256 = "1b7jzccicb58s3v796x0k2fwyfq8qmqyb5b26y5x9xknk7mv3fkz";
- name = "kde-l10n-es-17.08.3.tar.xz";
- };
- };
- kde-l10n-et = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-et-17.08.3.tar.xz";
- sha256 = "1d10yq8d5fjhgc0zvz3izl1c15i9g8vw5kgs2mvciwhaj6sqgk78";
- name = "kde-l10n-et-17.08.3.tar.xz";
- };
- };
- kde-l10n-eu = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eu-17.08.3.tar.xz";
- sha256 = "1r6nyjibagqfk4s1c2sylxlsq3jv7vhc01bbwpdl314rhcv67lkq";
- name = "kde-l10n-eu-17.08.3.tar.xz";
- };
- };
- kde-l10n-fa = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fa-17.08.3.tar.xz";
- sha256 = "0slrrsp8wgh33zv779mqdf3km4h88mzqfzdds08g8hr3mimp8ibj";
- name = "kde-l10n-fa-17.08.3.tar.xz";
- };
- };
- kde-l10n-fi = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fi-17.08.3.tar.xz";
- sha256 = "10axj320my3bgfqn1rpwpn4nii3bh39afsvqkbz6xh01sci4z47w";
- name = "kde-l10n-fi-17.08.3.tar.xz";
- };
- };
- kde-l10n-fr = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fr-17.08.3.tar.xz";
- sha256 = "0gqmq0hwxmj2awjyhhy81nwrks4mlqdnbfinxsrsj1kmklsx8pdg";
- name = "kde-l10n-fr-17.08.3.tar.xz";
- };
- };
- kde-l10n-ga = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ga-17.08.3.tar.xz";
- sha256 = "0p7jy5sh2x1fc6mfacs1f5brq86hw6xk7bccc30k5c8b0kfbvdf4";
- name = "kde-l10n-ga-17.08.3.tar.xz";
- };
- };
- kde-l10n-gl = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-gl-17.08.3.tar.xz";
- sha256 = "185yw84i04llag4kpi3lmmy9niis2z3rd5ch2x7y4jyq3kdpwhi4";
- name = "kde-l10n-gl-17.08.3.tar.xz";
- };
- };
- kde-l10n-he = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-he-17.08.3.tar.xz";
- sha256 = "0dx0mvl4vapkyir8a0a1dgv2h1hjsr5n2ykjihk21ykf7axvqqd4";
- name = "kde-l10n-he-17.08.3.tar.xz";
- };
- };
- kde-l10n-hi = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hi-17.08.3.tar.xz";
- sha256 = "0f6p7bwvvqj7jdaqsn4nxjsb5cdna9q4cp59wfy05ppi685qqp4v";
- name = "kde-l10n-hi-17.08.3.tar.xz";
- };
- };
- kde-l10n-hr = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hr-17.08.3.tar.xz";
- sha256 = "0yd4sqfa59ca57ig55x46fp59pjxby6ha5bhkzhcd1d2baa4a672";
- name = "kde-l10n-hr-17.08.3.tar.xz";
- };
- };
- kde-l10n-hu = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hu-17.08.3.tar.xz";
- sha256 = "1s3vgjslnffxivrx69dnz4c2iyjf2awv51k8bbbfjw271422wvfg";
- name = "kde-l10n-hu-17.08.3.tar.xz";
- };
- };
- kde-l10n-ia = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ia-17.08.3.tar.xz";
- sha256 = "1jpvla8h5ji9lcdhk7rinixkyr6wax30wp9wvqqqd8p9dp18i0cp";
- name = "kde-l10n-ia-17.08.3.tar.xz";
- };
- };
- kde-l10n-id = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-id-17.08.3.tar.xz";
- sha256 = "191x45jv4bzkglyng7fp3fblcbirp9k94h9r54sk32idwqkiwngx";
- name = "kde-l10n-id-17.08.3.tar.xz";
- };
- };
- kde-l10n-is = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-is-17.08.3.tar.xz";
- sha256 = "1h3pw9rnssf6wh1n5r01gqnz7riqz6hismndd67xw4pnq7vqpjkm";
- name = "kde-l10n-is-17.08.3.tar.xz";
- };
- };
- kde-l10n-it = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-it-17.08.3.tar.xz";
- sha256 = "0n4ivcyjcb47h3455wnzhnlkf26h29r2f9j1dgw9rw32aczb8l68";
- name = "kde-l10n-it-17.08.3.tar.xz";
- };
- };
- kde-l10n-ja = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ja-17.08.3.tar.xz";
- sha256 = "0qxf7c8l61xwkhn81phyw4849frzrc032fnbphlgq1nc9kqygara";
- name = "kde-l10n-ja-17.08.3.tar.xz";
- };
- };
- kde-l10n-kk = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-kk-17.08.3.tar.xz";
- sha256 = "0wlzv9kgpa2ah2j8dd4vn5gr9jkbmzl6ph3lm5mr7rf0pl14qws2";
- name = "kde-l10n-kk-17.08.3.tar.xz";
- };
- };
- kde-l10n-km = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-km-17.08.3.tar.xz";
- sha256 = "07arvlwxq59xjlgmf348rdrm1gfbzx9yds6qj667mrbk7h1n5ibr";
- name = "kde-l10n-km-17.08.3.tar.xz";
- };
- };
- kde-l10n-ko = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ko-17.08.3.tar.xz";
- sha256 = "0cw6v0iqq79hc4llw37s630gf36npc7ngsihqlia4y3pn4mzabwf";
- name = "kde-l10n-ko-17.08.3.tar.xz";
- };
- };
- kde-l10n-lt = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lt-17.08.3.tar.xz";
- sha256 = "0mv31nqdxp9wcnwch0sqrgz5pp1y3gmv25p8jvbrfrivpbkmhwv3";
- name = "kde-l10n-lt-17.08.3.tar.xz";
- };
- };
- kde-l10n-lv = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lv-17.08.3.tar.xz";
- sha256 = "0lyh2lj1h5ihhy22hh0is3s3qd8x88wgbwrqkq9802vksy7f587l";
- name = "kde-l10n-lv-17.08.3.tar.xz";
- };
- };
- kde-l10n-mr = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-mr-17.08.3.tar.xz";
- sha256 = "1zpciw63xk0s6jpkw4fpw0d17fcc4h1fdl6v1d3w3c1rs7dmmw9y";
- name = "kde-l10n-mr-17.08.3.tar.xz";
- };
- };
- kde-l10n-nb = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nb-17.08.3.tar.xz";
- sha256 = "024ii25iz8lf2g6k1nrr1lmian3wzq4ljx3y8ss1vz244m047xss";
- name = "kde-l10n-nb-17.08.3.tar.xz";
- };
- };
- kde-l10n-nds = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nds-17.08.3.tar.xz";
- sha256 = "0bp9ap276z86mxldasq6cdskrwkh48z9yfrblgffhh94941i0gcn";
- name = "kde-l10n-nds-17.08.3.tar.xz";
- };
- };
- kde-l10n-nl = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nl-17.08.3.tar.xz";
- sha256 = "00mzrk682r30i8x3navpad3b9jm15h5mp81v92q5cmcmblvvaw0l";
- name = "kde-l10n-nl-17.08.3.tar.xz";
- };
- };
- kde-l10n-nn = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nn-17.08.3.tar.xz";
- sha256 = "0d45g2n7hvk7p2n84674fqdnsz26hk0scczr6w3kzb2zk95x5734";
- name = "kde-l10n-nn-17.08.3.tar.xz";
- };
- };
- kde-l10n-pa = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pa-17.08.3.tar.xz";
- sha256 = "0sg35fmw0rs3nzyrhkfvh8b5nm86w5qkjgic4ymrib0grjxbdjcj";
- name = "kde-l10n-pa-17.08.3.tar.xz";
- };
- };
- kde-l10n-pl = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pl-17.08.3.tar.xz";
- sha256 = "0sk19zh9ykldm66d51k8pkmyql5cfxvgpzp8q3c3n9g60cdx510x";
- name = "kde-l10n-pl-17.08.3.tar.xz";
- };
- };
- kde-l10n-pt = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt-17.08.3.tar.xz";
- sha256 = "135g0wq2cfkgvwv1y1w9wnnz2bsdf5sdijqnvazkb6j3is4fz2pw";
- name = "kde-l10n-pt-17.08.3.tar.xz";
- };
- };
- kde-l10n-pt_BR = {
- version = "pt_BR-17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt_BR-17.08.3.tar.xz";
- sha256 = "0ww3rhijqs1h9ihszkqvxdi0d4185zpm336837741nwqg601dik0";
- name = "kde-l10n-pt_BR-17.08.3.tar.xz";
- };
- };
- kde-l10n-ro = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ro-17.08.3.tar.xz";
- sha256 = "1d45j7xx1mzzgjwqw5svhkcb5v0hqbbzcwg1x1j7xqcggdlx4075";
- name = "kde-l10n-ro-17.08.3.tar.xz";
- };
- };
- kde-l10n-ru = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ru-17.08.3.tar.xz";
- sha256 = "10py3cz4mpgcaskrsbbr26arg01c3im26zqmjcdwjnkgp8s780pj";
- name = "kde-l10n-ru-17.08.3.tar.xz";
- };
- };
- kde-l10n-sk = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sk-17.08.3.tar.xz";
- sha256 = "01607982ms2smr05nslp79x6fjqhvlpjdkkv8fs4vwxvii9wd77w";
- name = "kde-l10n-sk-17.08.3.tar.xz";
- };
- };
- kde-l10n-sl = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sl-17.08.3.tar.xz";
- sha256 = "10ljgz3jrgbgb06ijq1sp46qc3d7dbyz8dql56zcgz1pbv6pyxqz";
- name = "kde-l10n-sl-17.08.3.tar.xz";
- };
- };
- kde-l10n-sr = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sr-17.08.3.tar.xz";
- sha256 = "1m12x7w0m4n97crmy9ad6szx92z3cqsvm6fbh99naaaf033962jn";
- name = "kde-l10n-sr-17.08.3.tar.xz";
- };
- };
- kde-l10n-sv = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sv-17.08.3.tar.xz";
- sha256 = "1qqry4xakc4qp140jr5306xfp58d33rxp44mrvmdngzh30bqs6g2";
- name = "kde-l10n-sv-17.08.3.tar.xz";
- };
- };
- kde-l10n-tr = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-tr-17.08.3.tar.xz";
- sha256 = "1as31vjsig32s31qxnx6ykfgpyya3s362ml576ndiyrj84znzby0";
- name = "kde-l10n-tr-17.08.3.tar.xz";
- };
- };
- kde-l10n-ug = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ug-17.08.3.tar.xz";
- sha256 = "1jx2g5xczybfz9915py30g9rqds0191bsaywnj241nzqizy20csz";
- name = "kde-l10n-ug-17.08.3.tar.xz";
- };
- };
- kde-l10n-uk = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-uk-17.08.3.tar.xz";
- sha256 = "14c30x7j8inswccjfb3yslwxjp0ispp1wzq6j4nl5zzj24lkicf8";
- name = "kde-l10n-uk-17.08.3.tar.xz";
- };
- };
- kde-l10n-wa = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-wa-17.08.3.tar.xz";
- sha256 = "0mz0g6hf4z59vb4i0zkvmyx85mxz7fpwi6yyng03iqzlbpdq0qj7";
- name = "kde-l10n-wa-17.08.3.tar.xz";
- };
- };
- kde-l10n-zh_CN = {
- version = "zh_CN-17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_CN-17.08.3.tar.xz";
- sha256 = "1l60z9wicf5ka9ik5b85qh0z3n7g9msjv3ckwzm2kj41q9r30559";
- name = "kde-l10n-zh_CN-17.08.3.tar.xz";
- };
- };
- kde-l10n-zh_TW = {
- version = "zh_TW-17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_TW-17.08.3.tar.xz";
- sha256 = "1br778qbxnbsrdpvd34g2m3xc1v725ib4689kw5g36pm1jlf55h0";
- name = "kde-l10n-zh_TW-17.08.3.tar.xz";
- };
- };
- kdelibs = {
- version = "4.14.38";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdelibs-4.14.38.tar.xz";
- sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
- name = "kdelibs-4.14.38.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-thumbnailers-17.12.3.tar.xz";
+ sha256 = "1xak3c76bwprmb0anjvw5p620lm9hxyn6dzw2vh1di899b1p60n4";
+ name = "kdegraphics-thumbnailers-17.12.3.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdenetwork-filesharing-17.08.3.tar.xz";
- sha256 = "0vy2cyd9ifxrqw9zk4hyidiprd7730q7hm1gc44l6b4siimxyb4x";
- name = "kdenetwork-filesharing-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdenetwork-filesharing-17.12.3.tar.xz";
+ sha256 = "0hkvmv0wiyhh4b036sdqx4f69ihxwl4m3mnmwc58va3cj5p32pyh";
+ name = "kdenetwork-filesharing-17.12.3.tar.xz";
};
};
kdenlive = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdenlive-17.08.3.tar.xz";
- sha256 = "1nh6cmxkr47zlpvcrjm8dfylsdmncb5qhyvb86rypr1qqmbifg5x";
- name = "kdenlive-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdenlive-17.12.3.tar.xz";
+ sha256 = "0gjhiwjh5h727v4lcs3yy526sr4sr563acg9xc54q76hcl1qc7rp";
+ name = "kdenlive-17.12.3.tar.xz";
};
};
kdepim-addons = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdepim-addons-17.08.3.tar.xz";
- sha256 = "1r0qgrliw2g82vgj63l00x0visjclxh2fafngl8ga4dk411nfg4x";
- name = "kdepim-addons-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdepim-addons-17.12.3.tar.xz";
+ sha256 = "13562gn2jc049pfkq8kw2w5lnmh6s6z6r57p3rpjr880izw9707h";
+ name = "kdepim-addons-17.12.3.tar.xz";
};
};
kdepim-apps-libs = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdepim-apps-libs-17.08.3.tar.xz";
- sha256 = "0706ndzw315szab2qg30x7a6f50iv439rrpdpy321q7ay5fm0f2p";
- name = "kdepim-apps-libs-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdepim-apps-libs-17.12.3.tar.xz";
+ sha256 = "178iq1kjynid2hfnlh5pbcq2z46rl55xfvvsnpbwbk80j81mpj24";
+ name = "kdepim-apps-libs-17.12.3.tar.xz";
};
};
kdepim-runtime = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdepim-runtime-17.08.3.tar.xz";
- sha256 = "0qc6kkc5rsg9l5plciass6p1ym7arlp6yk7x5ycy53k7fbsh4ak7";
- name = "kdepim-runtime-17.08.3.tar.xz";
- };
- };
- kde-runtime = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kde-runtime-17.08.3.tar.xz";
- sha256 = "15nfkfz2wwlr1rp93sl1kmxl35wpnlf86225ihl43nhwn6pihb38";
- name = "kde-runtime-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdepim-runtime-17.12.3.tar.xz";
+ sha256 = "1r30wp4n020hh83znv6889w3vm0flyn31b92pmrgvsxm8yzphgwn";
+ name = "kdepim-runtime-17.12.3.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdesdk-kioslaves-17.08.3.tar.xz";
- sha256 = "11akksc09mzxnjiqcsxwgwcxzcjpw50cr277lp7p6rx1hdbwlk7a";
- name = "kdesdk-kioslaves-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdesdk-kioslaves-17.12.3.tar.xz";
+ sha256 = "022yp5glg3dxfm5lgv4095dimw9nwbdh559y2vvvlx06pyi0b1qa";
+ name = "kdesdk-kioslaves-17.12.3.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdesdk-thumbnailers-17.08.3.tar.xz";
- sha256 = "1hhsskrhkq3z6phjkvc43gzsmx0apcpr4sjr9zqqfy847zqsvfm2";
- name = "kdesdk-thumbnailers-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdesdk-thumbnailers-17.12.3.tar.xz";
+ sha256 = "0qndm22x7f4w8nmai4zxrxmxkism25xh7cf8vfsihlpqj1qs7wci";
+ name = "kdesdk-thumbnailers-17.12.3.tar.xz";
};
};
kdf = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdf-17.08.3.tar.xz";
- sha256 = "1s291c4g51y92wplrqkl528py83xfviyvv1qjyp3c7nyf6g2jvwq";
- name = "kdf-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdf-17.12.3.tar.xz";
+ sha256 = "18q0581jaqc6w2cbdq1crxgrn97p89ah205mv253pd58w9qc4xlp";
+ name = "kdf-17.12.3.tar.xz";
};
};
kdialog = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdialog-17.08.3.tar.xz";
- sha256 = "1n6n06sqgq1s2781pnsbfyczc68l5xx6l0idymj3pmniz3q4svp8";
- name = "kdialog-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdialog-17.12.3.tar.xz";
+ sha256 = "1smz7q09ss963c9snsvb6biimn1d2c9yyx9lhxszfl9155cgd9x4";
+ name = "kdialog-17.12.3.tar.xz";
};
};
kdiamond = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kdiamond-17.08.3.tar.xz";
- sha256 = "1czhmxs3k7mx82r1k88h8riwn9jxlz6w60mi4jx8b29qcm532f53";
- name = "kdiamond-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kdiamond-17.12.3.tar.xz";
+ sha256 = "1k4mlajxwpbn4y6dlkz5psxy6iqfjj5qif7i5sfn0c3gsgm76pxc";
+ name = "kdiamond-17.12.3.tar.xz";
};
};
keditbookmarks = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/keditbookmarks-17.08.3.tar.xz";
- sha256 = "115ys7703m611dw6ap2kqv4rgzxp15dsscg1y2gx09afc8fg2i62";
- name = "keditbookmarks-17.08.3.tar.xz";
- };
- };
- kfilereplace = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kfilereplace-17.08.3.tar.xz";
- sha256 = "1ksv9igzq65wgsam6ynbbzzyriacbk7y48dzh190p8k2bdf6gij6";
- name = "kfilereplace-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/keditbookmarks-17.12.3.tar.xz";
+ sha256 = "066ia9n648p53g4451zfn5nram821rlbjlnfi9ny9p0j4dl6wwya";
+ name = "keditbookmarks-17.12.3.tar.xz";
};
};
kfind = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kfind-17.08.3.tar.xz";
- sha256 = "16f27ykh52vphq6wjyi1vy6vrzshj0cawmc8fy7y1j5yzzdkx1hk";
- name = "kfind-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kfind-17.12.3.tar.xz";
+ sha256 = "1xf1sw422sg3ki1phy097lwma14drdnjbgc1m5rap3dg0za25c9s";
+ name = "kfind-17.12.3.tar.xz";
};
};
kfloppy = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kfloppy-17.08.3.tar.xz";
- sha256 = "1d5xn0rxc92k60hc1860mji8dzq932gg4by42gylwldcvgdija14";
- name = "kfloppy-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kfloppy-17.12.3.tar.xz";
+ sha256 = "0gjp2l5jm16v1v4xwzaandplabz6rjdiimcf3b0r5d9prbiwry3p";
+ name = "kfloppy-17.12.3.tar.xz";
};
};
kfourinline = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kfourinline-17.08.3.tar.xz";
- sha256 = "1bxzlx55i6vbk8cmpx38g1xdx0swqwd73lw5z584affw464ps1n9";
- name = "kfourinline-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kfourinline-17.12.3.tar.xz";
+ sha256 = "1l10fj1vhxj1d647mcxp7a2bbilrhs3sf7cwkr57vavfzsp7diyw";
+ name = "kfourinline-17.12.3.tar.xz";
};
};
kgeography = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kgeography-17.08.3.tar.xz";
- sha256 = "19k39rjm9lwbv3p6iifam80li5bhw4xf2g4i4hj0h7gyrj9gb1mp";
- name = "kgeography-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kgeography-17.12.3.tar.xz";
+ sha256 = "1dl3k4zlchpdhvjb459wb44iyq30ngki6x198pyc23j15mjfdrih";
+ name = "kgeography-17.12.3.tar.xz";
};
};
kget = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kget-17.08.3.tar.xz";
- sha256 = "01z3ij4iv3kgwy0fcnrf4qpfgapflx1pgv2hiaykgsj6ij24fx6a";
- name = "kget-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kget-17.12.3.tar.xz";
+ sha256 = "1kaxvid76s8rx07hza56s83l785dxi5whhkqzkv132z2dm01yzww";
+ name = "kget-17.12.3.tar.xz";
};
};
kgoldrunner = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kgoldrunner-17.08.3.tar.xz";
- sha256 = "1k09pw7lm17702p0lliyl767zwk4n3gkkzj441cq3fqjnwm93lx4";
- name = "kgoldrunner-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kgoldrunner-17.12.3.tar.xz";
+ sha256 = "1ihj48kvr9xpw4rajiyq3kng1dn6l60dmii5pnyjmxlfs08apayx";
+ name = "kgoldrunner-17.12.3.tar.xz";
};
};
kgpg = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kgpg-17.08.3.tar.xz";
- sha256 = "1g06n6i9qqvalmpg2zan7qg7j7dp4rn152pashs3jxij29n1bw7h";
- name = "kgpg-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kgpg-17.12.3.tar.xz";
+ sha256 = "19yacv7l6kynyznb8ixn3697h04mhh4fhx02n4frdy9pnzv94hyp";
+ name = "kgpg-17.12.3.tar.xz";
};
};
khangman = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/khangman-17.08.3.tar.xz";
- sha256 = "1fny78d3vaaz67css4i14pnvkm5p586ib8mwrs2rglc931c89dqq";
- name = "khangman-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/khangman-17.12.3.tar.xz";
+ sha256 = "0hnm499qs1l2yzfqxhmkyc5lp0qb5j29h1knap1vmv4qy0qnmnjk";
+ name = "khangman-17.12.3.tar.xz";
};
};
khelpcenter = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/khelpcenter-17.08.3.tar.xz";
- sha256 = "089aahdr1yibff4y0l78m0wzz7m0mc090g4fp4aj4gp56wz6i5jn";
- name = "khelpcenter-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/khelpcenter-17.12.3.tar.xz";
+ sha256 = "0z5hrwqsi9ifraivz59nbq247x481hx90wiyfbls9lwv56y1zi7n";
+ name = "khelpcenter-17.12.3.tar.xz";
};
};
kholidays = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kholidays-17.08.3.tar.xz";
- sha256 = "17razwvskf6i5hidlfp98bmfrijp8hn5gxrqcjxc49wpkhlj70jm";
- name = "kholidays-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kholidays-17.12.3.tar.xz";
+ sha256 = "0w886443zzvpwqznnn7ymw5bxzdnigfz9j45qrl1qvdd6q8710di";
+ name = "kholidays-17.12.3.tar.xz";
};
};
kidentitymanagement = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kidentitymanagement-17.08.3.tar.xz";
- sha256 = "0k926vwdhrk4ilpn0zhkcn26j1h7nqlzzi9mimybz1sp4fzxa83v";
- name = "kidentitymanagement-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz";
+ sha256 = "0my4r8k8gadkda3z1myarrq4x72qz6wxsy6lj9rzkj4y549bm93y";
+ name = "kidentitymanagement-17.12.3.tar.xz";
};
};
kig = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kig-17.08.3.tar.xz";
- sha256 = "0wf03fm7fpph52ilxckz02ikn6mq486ps8p8byq2vvfwh6z0w6wg";
- name = "kig-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kig-17.12.3.tar.xz";
+ sha256 = "0liv94y90bfd5pi003bd3jryc1dal5mwxhqy94c2n3ay8yz8kxid";
+ name = "kig-17.12.3.tar.xz";
};
};
kigo = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kigo-17.08.3.tar.xz";
- sha256 = "1k850vmsifvab14aaqkivgrw8794yhvn7d10c5ib2zf6447cl8m5";
- name = "kigo-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kigo-17.12.3.tar.xz";
+ sha256 = "1z01w5zsbwn8h0mgr5liqagsmlppqclkjs4z5rdys75sxm142fzh";
+ name = "kigo-17.12.3.tar.xz";
};
};
killbots = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/killbots-17.08.3.tar.xz";
- sha256 = "0ds391xx2d792069kl998f84qym26964ph5bja6bwkhgvws84r9g";
- name = "killbots-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/killbots-17.12.3.tar.xz";
+ sha256 = "14xgh9qhagq9c01xbv0n4g5b3q9r6qr0dsc5ilindr66psspx7an";
+ name = "killbots-17.12.3.tar.xz";
};
};
kimagemapeditor = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kimagemapeditor-17.08.3.tar.xz";
- sha256 = "0clzk2d63hy1vvkdpxa1j5pp7y28x467wd9zfvv6k2vw703ghqlx";
- name = "kimagemapeditor-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kimagemapeditor-17.12.3.tar.xz";
+ sha256 = "1s9929wb3lclbn85rk3zd0nai64mrwgqdqnkw2dys98snq12r3hn";
+ name = "kimagemapeditor-17.12.3.tar.xz";
};
};
kimap = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kimap-17.08.3.tar.xz";
- sha256 = "0c5inldmlwc5x2q1vhvj0wv61h6986m068a2k4xrrbirpb4pcwls";
- name = "kimap-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kimap-17.12.3.tar.xz";
+ sha256 = "1prilnf01s73ml7542s7qh0ki9gqvgq7xqzxq2mz17k4d3irdvxw";
+ name = "kimap-17.12.3.tar.xz";
};
};
kio-extras = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kio-extras-17.08.3.tar.xz";
- sha256 = "0gq187435yd0251znqicpcn0r89aar7a64bjpf6x0zhdlli8n9jc";
- name = "kio-extras-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kio-extras-17.12.3.tar.xz";
+ sha256 = "1ifi09hv5aqx62x1cjnsxxh7xji9m0mmk3gfn43la9vw4rhxzlks";
+ name = "kio-extras-17.12.3.tar.xz";
};
};
kiriki = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kiriki-17.08.3.tar.xz";
- sha256 = "1cbijn0358gpr21yfab84gybf5vqxwilwbhfl6nj8qmppp2bpjqd";
- name = "kiriki-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kiriki-17.12.3.tar.xz";
+ sha256 = "1zl8mq1ya3x67y1pj1ir98v5lbxwccwyni8i02wc7mbgmxbk6p9q";
+ name = "kiriki-17.12.3.tar.xz";
};
};
kiten = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kiten-17.08.3.tar.xz";
- sha256 = "0v00q9hs94p5r6x7s7i12814pfydd5y1bzp6sm5x0vx1ixdnkx89";
- name = "kiten-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kiten-17.12.3.tar.xz";
+ sha256 = "1p1s20ks3r2zfd7wig1j2lbxbf3ch9gbykw2cgadip4nyn9nyll5";
+ name = "kiten-17.12.3.tar.xz";
};
};
kjumpingcube = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kjumpingcube-17.08.3.tar.xz";
- sha256 = "13ifm6drw4m1dzssfalazmnsr5f8z9gla3aypb9ny1xm9ahlgfwh";
- name = "kjumpingcube-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kjumpingcube-17.12.3.tar.xz";
+ sha256 = "07fakw1nq3bickj05cvb39wyb02fpfph0ia1wfm8wf43rd34c76l";
+ name = "kjumpingcube-17.12.3.tar.xz";
};
};
kldap = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kldap-17.08.3.tar.xz";
- sha256 = "0bnx5fc48ppsykpqwjgsqjd7s4azgzk82k9xgaw566nxqqvgpzsv";
- name = "kldap-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kldap-17.12.3.tar.xz";
+ sha256 = "02adfzjlvxjff33cpyihsf9z9zm7nvgmnipg9dmkpc0cwl25a8jy";
+ name = "kldap-17.12.3.tar.xz";
};
};
kleopatra = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kleopatra-17.08.3.tar.xz";
- sha256 = "0vglphfxq37pxdrrchgzkdlzlzr18qlfwy9g64njyddnsv48pfx8";
- name = "kleopatra-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kleopatra-17.12.3.tar.xz";
+ sha256 = "1417j1jh7bs0020laaimpwmmng508k85kp24k923ad2v65i51agd";
+ name = "kleopatra-17.12.3.tar.xz";
};
};
klettres = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/klettres-17.08.3.tar.xz";
- sha256 = "14jxbvil45hc2kqky7yhxrgzpv4094lk9ri0j05i1av6784s9555";
- name = "klettres-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/klettres-17.12.3.tar.xz";
+ sha256 = "0npp2dkwi3g36scipdra5xj5lf0xga3l8h8pk6isx7l86xsv3ds0";
+ name = "klettres-17.12.3.tar.xz";
};
};
klickety = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/klickety-17.08.3.tar.xz";
- sha256 = "01hqf41m8pviziq1x562rd85357kkfgd0x0ba1vasimjddg6v6qa";
- name = "klickety-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/klickety-17.12.3.tar.xz";
+ sha256 = "0f8gxqcfanxbqjqrq1j598nbis3djxxps61hdl1wd9xki1a86xy8";
+ name = "klickety-17.12.3.tar.xz";
};
};
klines = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/klines-17.08.3.tar.xz";
- sha256 = "1s0krcqbqii9fqrymm4bb9ssznzyv8bijk5lcngwgxs24igl0g4d";
- name = "klines-17.08.3.tar.xz";
- };
- };
- klinkstatus = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/klinkstatus-17.08.3.tar.xz";
- sha256 = "0bv5ahcnss6ziccx9mmvf5bdsff9drjqpmq9ln51524bjn4x58ic";
- name = "klinkstatus-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/klines-17.12.3.tar.xz";
+ sha256 = "0kp7c8qxkwgf13cwa7x5wik5w7snq6830zpah6lsk4ls5jw5mln0";
+ name = "klines-17.12.3.tar.xz";
};
};
kmag = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmag-17.08.3.tar.xz";
- sha256 = "0dadzzrmd982y7apjk783wm5q302y03ydai74pzyqy0awnjdm09d";
- name = "kmag-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmag-17.12.3.tar.xz";
+ sha256 = "0n9dxf5mcz6rlfr91r6yd7sxfmshgdc8znxfbncd1a9j523vba3w";
+ name = "kmag-17.12.3.tar.xz";
};
};
kmahjongg = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmahjongg-17.08.3.tar.xz";
- sha256 = "09j2pmqc66zi851fsl4ijrcgq3y35arx9272p6z07bg0z9ja5vgb";
- name = "kmahjongg-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmahjongg-17.12.3.tar.xz";
+ sha256 = "0ai6jlny4fi69psiizix5adz3kga4plf70y322a3ybl8g9c44m1a";
+ name = "kmahjongg-17.12.3.tar.xz";
};
};
kmail = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmail-17.08.3.tar.xz";
- sha256 = "1ibpq0alnk70ha1smfyw8gc91k5q4x1gw7zddwgzw1pjr4v1bqdc";
- name = "kmail-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmail-17.12.3.tar.xz";
+ sha256 = "02hjrk1c4mk3jrmyhn4ppar6vdlg51j79fqcjzfs1d8s4w0swwbs";
+ name = "kmail-17.12.3.tar.xz";
};
};
kmail-account-wizard = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmail-account-wizard-17.08.3.tar.xz";
- sha256 = "0mkw6skpf9kc2h34ww85g18cljln77n5dsg5cyfyqc3i52m1halk";
- name = "kmail-account-wizard-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmail-account-wizard-17.12.3.tar.xz";
+ sha256 = "1qdwqd763k5dq8mmwibnvgqjb7l6br9dqwxfsi7q8bhjxipijvdx";
+ name = "kmail-account-wizard-17.12.3.tar.xz";
};
};
kmailtransport = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmailtransport-17.08.3.tar.xz";
- sha256 = "0cfyzvsn5x03i6kprqm7y6j6qsfys4yz2s3f4wb5igpdm25nclq1";
- name = "kmailtransport-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmailtransport-17.12.3.tar.xz";
+ sha256 = "131yy2xa61fi2dmrb3qapf589lf4s9v2rkk2js0bi1827yg097f0";
+ name = "kmailtransport-17.12.3.tar.xz";
};
};
kmbox = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmbox-17.08.3.tar.xz";
- sha256 = "0mf0005fs15vgmmikdsa44ig4hxrnysl13mrn168crk96h3sk8qi";
- name = "kmbox-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmbox-17.12.3.tar.xz";
+ sha256 = "15x9cdwcbwrjaj3rzphwmpayhy45j45pwj88sz0drqz3mwc55jgm";
+ name = "kmbox-17.12.3.tar.xz";
};
};
kmime = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmime-17.08.3.tar.xz";
- sha256 = "17ziw8g1wdys4iy2yqavqy7wj4kw617m80fg77zlf1cscswhg23d";
- name = "kmime-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmime-17.12.3.tar.xz";
+ sha256 = "0251szs8dcpnwhqk72c211mp7h0xhn0f8z21mdm6k94ij43da9cm";
+ name = "kmime-17.12.3.tar.xz";
};
};
kmines = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmines-17.08.3.tar.xz";
- sha256 = "14b0klnlbxkvln3q9fliw6cijc2xmsfmvm6sfikdzzgj59jcylzp";
- name = "kmines-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmines-17.12.3.tar.xz";
+ sha256 = "0r9rs97s92z5854xdampgp6igmppzp3mhaw9rscrdwvvq4xpsll9";
+ name = "kmines-17.12.3.tar.xz";
};
};
kmix = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmix-17.08.3.tar.xz";
- sha256 = "0fd38banrbgpp8g5gz09w6wny8mdi9szvddl1rv7yx67zf112g67";
- name = "kmix-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmix-17.12.3.tar.xz";
+ sha256 = "12fwimqr21hgwqscihaxwh1f39xm8k21f95f7b3gwwa5lbj0l9mp";
+ name = "kmix-17.12.3.tar.xz";
};
};
kmousetool = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmousetool-17.08.3.tar.xz";
- sha256 = "0y2zavs442wpz438p1kyzrqlv9qgvxd4l5gw1pmmx8lkvjjdi91v";
- name = "kmousetool-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmousetool-17.12.3.tar.xz";
+ sha256 = "0gbvzywnxbcb4iw7pgf70ljz0qd8xl8825srpp3fj7lv0kh9ni9z";
+ name = "kmousetool-17.12.3.tar.xz";
};
};
kmouth = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmouth-17.08.3.tar.xz";
- sha256 = "0gzc6apskfpvih7aap5mfv45q3pg70nfis1vh5ywidia36wbf26i";
- name = "kmouth-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmouth-17.12.3.tar.xz";
+ sha256 = "012lpy904n2isj8msxivgk0ssy56qajgjxn1hz2jy9jjyyi77f2n";
+ name = "kmouth-17.12.3.tar.xz";
};
};
kmplot = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kmplot-17.08.3.tar.xz";
- sha256 = "1ann38zzzd5pds889mc5vw8xw80qlpm9l9nmkczkqyhkfvwxd605";
- name = "kmplot-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kmplot-17.12.3.tar.xz";
+ sha256 = "0plblgv243ymmcbpb8rs4clilwlsggn7219yqrh064lzbfblhxa9";
+ name = "kmplot-17.12.3.tar.xz";
};
};
knavalbattle = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/knavalbattle-17.08.3.tar.xz";
- sha256 = "1zj6pki0v3p4xg25ivl45mb877p5xh47d066442pahkf8l3wnsh5";
- name = "knavalbattle-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/knavalbattle-17.12.3.tar.xz";
+ sha256 = "07z0h0h6fmd99x0kqjlwlkpxndypa2svdvmjv8vmwcdp45hik90f";
+ name = "knavalbattle-17.12.3.tar.xz";
};
};
knetwalk = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/knetwalk-17.08.3.tar.xz";
- sha256 = "0i32f54z5hinafy1v5s1j8ahnbw30721lxa2mvh5qcbr21fan3mc";
- name = "knetwalk-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/knetwalk-17.12.3.tar.xz";
+ sha256 = "1iz819dsrdf5fck6qx0s4d0k7sz58pbxp5kk4aczszmvpnn2197k";
+ name = "knetwalk-17.12.3.tar.xz";
};
};
knotes = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/knotes-17.08.3.tar.xz";
- sha256 = "0ly9gpji3nl3i53nzqd5z27li8qnc1asfv1d1kawchz077da02xy";
- name = "knotes-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/knotes-17.12.3.tar.xz";
+ sha256 = "1iy6rmhlh7jgryxrwqrqaqaajfimdlqcw0x3yizbqalpw1k6f8m3";
+ name = "knotes-17.12.3.tar.xz";
};
};
kolf = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kolf-17.08.3.tar.xz";
- sha256 = "1wc6x1hgkniwzb53bcph3alk0fxlb91s6j39blhync6713x8b4g0";
- name = "kolf-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kolf-17.12.3.tar.xz";
+ sha256 = "1zc1i36a302rpvv2lbfv8q8glh1brjk95mjkwxbplv8gmdbd71cj";
+ name = "kolf-17.12.3.tar.xz";
};
};
kollision = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kollision-17.08.3.tar.xz";
- sha256 = "14ama8cfi4d7whgck0gywm7869gpargq1lrkq8ik4k914pharkzi";
- name = "kollision-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kollision-17.12.3.tar.xz";
+ sha256 = "019ibb9190k6qf07kgjy88lzyawvbh9hb7df96l96ilgssxxhnvz";
+ name = "kollision-17.12.3.tar.xz";
};
};
kolourpaint = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kolourpaint-17.08.3.tar.xz";
- sha256 = "1y44q14f6brdmccnmf8143kjjqais8ps15z31dpx2935qzjxw8sc";
- name = "kolourpaint-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kolourpaint-17.12.3.tar.xz";
+ sha256 = "15vd3ykixfkbwg3dk4plfpf72k2cknwpk6ip7rnw4h41r0rg838w";
+ name = "kolourpaint-17.12.3.tar.xz";
};
};
kompare = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kompare-17.08.3.tar.xz";
- sha256 = "0fi3s02rsaa3xl7j69lq2qvg9jn9hxdp44ns89q94s06rqkbjyr1";
- name = "kompare-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kompare-17.12.3.tar.xz";
+ sha256 = "0kfrxwx2dnvbvy7ykm3dxm0873g2136jllakav8pxgf75z4iwryl";
+ name = "kompare-17.12.3.tar.xz";
};
};
konqueror = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/konqueror-17.08.3.tar.xz";
- sha256 = "1b2hs0fp0a51y87dl8rnv47b8kzjylsps9nczgi8zsipg03z9ja7";
- name = "konqueror-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/konqueror-17.12.3.tar.xz";
+ sha256 = "0dhm22p4mx244pd2wnl7xxhkh4yc3dsl126ndmajj62i0si0y0hw";
+ name = "konqueror-17.12.3.tar.xz";
};
};
konquest = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/konquest-17.08.3.tar.xz";
- sha256 = "1k5s9cvlsx3j2774i6p6xx2sfg75aafj9a4imvm7mzvn3gvmkm3q";
- name = "konquest-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/konquest-17.12.3.tar.xz";
+ sha256 = "1jdwa4b9224x2m3r3v3sgk7796kvlayf7gjpsdvby0xggpihsqli";
+ name = "konquest-17.12.3.tar.xz";
};
};
konsole = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/konsole-17.08.3.tar.xz";
- sha256 = "07v9nbikzpanpggglp07slkbn6h0cl2anz7735f9b0lg55fydv42";
- name = "konsole-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/konsole-17.12.3.tar.xz";
+ sha256 = "1g3c7wl10n5qhs5bnm1d92qsv7jh8gn3d1l0wivj29cn9b0rf2gs";
+ name = "konsole-17.12.3.tar.xz";
};
};
kontact = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kontact-17.08.3.tar.xz";
- sha256 = "1hj6vgvn73bzf43ckk4cm24m1n0a4c9c6p14q95hbfbcp5bdra1i";
- name = "kontact-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kontact-17.12.3.tar.xz";
+ sha256 = "0gik5h84mx3izdlml0sl1y68n7h9w8196h2l09lxnf10mmya3yas";
+ name = "kontact-17.12.3.tar.xz";
};
};
kontactinterface = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kontactinterface-17.08.3.tar.xz";
- sha256 = "1ncy0fz0jyklckimm9jjfv2j88aibk49ismz5z6xlasn44vn7l9c";
- name = "kontactinterface-17.08.3.tar.xz";
- };
- };
- kopete = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kopete-17.08.3.tar.xz";
- sha256 = "1v5gmh521si3zbxgcm9m4rcp0csqy52xgvpjpb8j7iq9m0fcqv7q";
- name = "kopete-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kontactinterface-17.12.3.tar.xz";
+ sha256 = "15nigzawl5rzd0s6l9xqv3sldah3wc9m6zd3avbsb3ydmi0f1hks";
+ name = "kontactinterface-17.12.3.tar.xz";
};
};
korganizer = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/korganizer-17.08.3.tar.xz";
- sha256 = "1nsj03h1r5mnz2dvdmydvqz2fspgw2ybs5z05gg0f903sq1gz80l";
- name = "korganizer-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/korganizer-17.12.3.tar.xz";
+ sha256 = "0gplnra98ivhsqcrdy44ghak0h9x0fn481irqh2y11f8kjaf6z40";
+ name = "korganizer-17.12.3.tar.xz";
};
};
kpat = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kpat-17.08.3.tar.xz";
- sha256 = "0l5s5rrn67lbf8hjqyyxvxij935pb1fd9x9dlskxyc2w7n6acmn2";
- name = "kpat-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kpat-17.12.3.tar.xz";
+ sha256 = "0nkqfnxrnik4ma7xrskqjsmcmbmxszyn9ckf3rql338d485h8awh";
+ name = "kpat-17.12.3.tar.xz";
};
};
kpimtextedit = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kpimtextedit-17.08.3.tar.xz";
- sha256 = "1xyfzvmsfikx2xnhgwx9wkdhvfq72f3mz67hlw2jsbm3ir889ysb";
- name = "kpimtextedit-17.08.3.tar.xz";
- };
- };
- kppp = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kppp-17.08.3.tar.xz";
- sha256 = "00y19x306r3pnax1b2cv8bndd6vq1qp30r1hrgw8npy5mm4mn8jw";
- name = "kppp-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz";
+ sha256 = "0b6f1hsh3q183lkinaz9f94akaf1z2g1pb7sm83f6c4yjn9qfg9c";
+ name = "kpimtextedit-17.12.3.tar.xz";
};
};
kqtquickcharts = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kqtquickcharts-17.08.3.tar.xz";
- sha256 = "0w8hlnhdgqrmad4ii07f9hsyx6vlaqnvlc54prnah1bqzymvc2ms";
- name = "kqtquickcharts-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kqtquickcharts-17.12.3.tar.xz";
+ sha256 = "0gigdramz5kmjyzd7yff8j0c3sisblqy0xjc301hkhh7ss93r2d0";
+ name = "kqtquickcharts-17.12.3.tar.xz";
};
};
krdc = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/krdc-17.08.3.tar.xz";
- sha256 = "13rmn1p495dzx49d1y22na25vrpzk9mcc2axg412pv038iphf8id";
- name = "krdc-17.08.3.tar.xz";
- };
- };
- kremotecontrol = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kremotecontrol-17.08.3.tar.xz";
- sha256 = "1p23q7bvppv8fabvpwi793zplb4kry8njczma7c4nya4mkdk9370";
- name = "kremotecontrol-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/krdc-17.12.3.tar.xz";
+ sha256 = "1flk8pvnr4kf273xzfxb7pcsam3mb056pbvmva1k864kbb6bzdps";
+ name = "krdc-17.12.3.tar.xz";
};
};
kreversi = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kreversi-17.08.3.tar.xz";
- sha256 = "0ma0y1n38hw5rawzazlaqfa4vsawgvaq8j2pa5n7z23nwckh19wd";
- name = "kreversi-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kreversi-17.12.3.tar.xz";
+ sha256 = "1hmh80dpg25ay06dmd1g6a0a7zcd2di99s989msi85wzgk6vh0fg";
+ name = "kreversi-17.12.3.tar.xz";
};
};
krfb = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/krfb-17.08.3.tar.xz";
- sha256 = "1k7rziw0l0bdjxi5i92w1zsjbakzbklc95dyn2jsnm36jljjqpv1";
- name = "krfb-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/krfb-17.12.3.tar.xz";
+ sha256 = "0anfcb1xsr638k3d3ljy9khbxf7v9sj5vbksyhfjrzsifj4m2skv";
+ name = "krfb-17.12.3.tar.xz";
};
};
kross-interpreters = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kross-interpreters-17.08.3.tar.xz";
- sha256 = "1pqlm14xr9p18dfh8pczg8fjskpvzxh5s5n7nxj9q31yz6kbxzrb";
- name = "kross-interpreters-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kross-interpreters-17.12.3.tar.xz";
+ sha256 = "0v3ly21lc8riv4by87kjilab5zqd6wvwl92a983ybd5bivl1a98s";
+ name = "kross-interpreters-17.12.3.tar.xz";
};
};
kruler = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kruler-17.08.3.tar.xz";
- sha256 = "1qizjvysfnh5x3fa8hav3y9pyaiq8hpwi1grw9dd921cbb16cww4";
- name = "kruler-17.08.3.tar.xz";
- };
- };
- ksaneplugin = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ksaneplugin-17.08.3.tar.xz";
- sha256 = "0y7f269wv0alcvx906nill92nzlld5b1sg6q3xki89b6b9fgliig";
- name = "ksaneplugin-17.08.3.tar.xz";
- };
- };
- kscd = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kscd-17.08.3.tar.xz";
- sha256 = "08r9zhp7d7xf8iyi56hvlm5vyjqrjpj9dc8ynda0n7hyngxrbvm0";
- name = "kscd-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kruler-17.12.3.tar.xz";
+ sha256 = "0r12vwg9jsvg8bldrfdnmcygn6rkx9dp8r0948jhf662qs7a0jsa";
+ name = "kruler-17.12.3.tar.xz";
};
};
kshisen = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kshisen-17.08.3.tar.xz";
- sha256 = "18nwnxn7i0p2b78cxv8ppsl4lrzdm4ck6hqqdf738npli271shq0";
- name = "kshisen-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kshisen-17.12.3.tar.xz";
+ sha256 = "1an28mxgc1ic6acj3r59q9nnmq267fy6k48xzdxqdxhivs74bjx0";
+ name = "kshisen-17.12.3.tar.xz";
};
};
ksirk = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ksirk-17.08.3.tar.xz";
- sha256 = "1601fh93jcy7x622hpvdrb9ddb262n9ivakxli054cz2bq3dbpim";
- name = "ksirk-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ksirk-17.12.3.tar.xz";
+ sha256 = "07y300qk3jls8cscf0xxgq52gxmc4j5rkn2pxhxymm0yr07ip1xz";
+ name = "ksirk-17.12.3.tar.xz";
+ };
+ };
+ ksmtp = {
+ version = "17.12.3";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/17.12.3/src/ksmtp-17.12.3.tar.xz";
+ sha256 = "1dws2jrizixi108mw1lgb7jz6dgs5xvvmj16bkf9x54rhvjb7r9b";
+ name = "ksmtp-17.12.3.tar.xz";
};
};
ksnakeduel = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ksnakeduel-17.08.3.tar.xz";
- sha256 = "1a7xki783799ala0zx1jngvhsky994sk32xyza2lfir5ym1w0pkm";
- name = "ksnakeduel-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ksnakeduel-17.12.3.tar.xz";
+ sha256 = "0w4nw1pyznn4dkcqgf2d5c2r7z5xg5gc97whw1i67wqq9sbi98hy";
+ name = "ksnakeduel-17.12.3.tar.xz";
};
};
kspaceduel = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kspaceduel-17.08.3.tar.xz";
- sha256 = "1wskg788mc51dh3hv0d7hrqyy14gnzzw2sqhc0pd65jj8hra7kh2";
- name = "kspaceduel-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kspaceduel-17.12.3.tar.xz";
+ sha256 = "13pqdb3f0zjnv71y93kha3wkq9kivl8g01sa5g9ydjmnxahzhqc6";
+ name = "kspaceduel-17.12.3.tar.xz";
};
};
ksquares = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ksquares-17.08.3.tar.xz";
- sha256 = "04bc3ppiai39v8dq02r7nzr4nvpzjj90glg6qssxqyxwrz18kk20";
- name = "ksquares-17.08.3.tar.xz";
- };
- };
- kstars = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kstars-17.08.3.tar.xz";
- sha256 = "0i165snb4wnw2kzbhcawgwwqppgq5fmw23rqa4q2k3alaz9smcdn";
- name = "kstars-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ksquares-17.12.3.tar.xz";
+ sha256 = "19cbmc2mnljlndijb11k9l67q2cmdd5yjsjwv61rawq25xwfh667";
+ name = "ksquares-17.12.3.tar.xz";
};
};
ksudoku = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ksudoku-17.08.3.tar.xz";
- sha256 = "1dmqss272z7s7vbh71zg7s5drn66a2yyrv53f34yk3d93mhk8dq2";
- name = "ksudoku-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ksudoku-17.12.3.tar.xz";
+ sha256 = "0c335klnzq4bf91c2iib3iqhx24nf264p86mypk2as2mbcr02j9n";
+ name = "ksudoku-17.12.3.tar.xz";
};
};
ksystemlog = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ksystemlog-17.08.3.tar.xz";
- sha256 = "0smhbdpj2xf9q8l8cjhk4x80qq6apn6mmf7dna9hznp6nd6jrsgv";
- name = "ksystemlog-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ksystemlog-17.12.3.tar.xz";
+ sha256 = "0lnjdiwq3xlqi2lw0p9vj6fbqzmmqf0y6aivyxb7lbrjgjvh64lr";
+ name = "ksystemlog-17.12.3.tar.xz";
};
};
kteatime = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kteatime-17.08.3.tar.xz";
- sha256 = "0pp08b2rjz329kdaqq5a490r353n346ah0ag6wfxmpchqy11lr3r";
- name = "kteatime-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kteatime-17.12.3.tar.xz";
+ sha256 = "0f7cf0p7cnmw6mpc3135wk9l2j63yfd2fz06vngnl0zdysf4iwfz";
+ name = "kteatime-17.12.3.tar.xz";
};
};
ktimer = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktimer-17.08.3.tar.xz";
- sha256 = "15k1rfih9k7zpcsdyiwl60jmp1w1svwb8c6cykjzqpc9acyfpba5";
- name = "ktimer-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktimer-17.12.3.tar.xz";
+ sha256 = "1ghh3433wai87ifspvsvmjvamzminf9i73vbpf61ph5qgahx804x";
+ name = "ktimer-17.12.3.tar.xz";
};
};
ktnef = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktnef-17.08.3.tar.xz";
- sha256 = "0fh0ybb3nijhxhkwcmcygw413blkmra83az1jhkmlpp6q5459jin";
- name = "ktnef-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktnef-17.12.3.tar.xz";
+ sha256 = "13irgbcq6g363n65i92c2ciw35rxmq1x5hdlrdbidp718n44n84n";
+ name = "ktnef-17.12.3.tar.xz";
};
};
ktouch = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktouch-17.08.3.tar.xz";
- sha256 = "0z21wb82m3sds4sjkkadb48zxcfj1qbab07i3cs3g3a730zdj5ld";
- name = "ktouch-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktouch-17.12.3.tar.xz";
+ sha256 = "04frgq9lyk51p66lv48pgk8b4f4jxh73fpr907dnwbsyqkg6l795";
+ name = "ktouch-17.12.3.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-accounts-kcm-17.08.3.tar.xz";
- sha256 = "17h75xkavyl2920j57nm6zp81l70ksyjndrrrqxv8clig1bqfc89";
- name = "ktp-accounts-kcm-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-accounts-kcm-17.12.3.tar.xz";
+ sha256 = "0fi3065yq38pn2x7r5a0fynbq7xyklbzvlp4gwr4bhg41fqm74hm";
+ name = "ktp-accounts-kcm-17.12.3.tar.xz";
};
};
ktp-approver = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-approver-17.08.3.tar.xz";
- sha256 = "0dvwwpy50ixylacrxnfh4aqpsbc4nfsqkwr358917w5mambfji42";
- name = "ktp-approver-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-approver-17.12.3.tar.xz";
+ sha256 = "06x1ycp5biapalf5yk0lh9wwda1mx5a4ssv1p3q9kb7f7v1i8wkp";
+ name = "ktp-approver-17.12.3.tar.xz";
};
};
ktp-auth-handler = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-auth-handler-17.08.3.tar.xz";
- sha256 = "0pm0bvivwlaq083sql74qq5wrlm7wix1k9i4cr3fck73am9h526b";
- name = "ktp-auth-handler-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-auth-handler-17.12.3.tar.xz";
+ sha256 = "03vha3rf7989wi47hn004g4m1lgi236in395yl4f2bl2h0qq1g21";
+ name = "ktp-auth-handler-17.12.3.tar.xz";
};
};
ktp-call-ui = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-call-ui-17.08.3.tar.xz";
- sha256 = "1kwprh9g97hraywjcv2ppddaxh7cw6gsy4zs8mjvh0zpnn3cy7xm";
- name = "ktp-call-ui-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-call-ui-17.12.3.tar.xz";
+ sha256 = "0l85q8xykz0vj26yvcqcm3l6w84iada8hr32sn71151rv6palv0m";
+ name = "ktp-call-ui-17.12.3.tar.xz";
};
};
ktp-common-internals = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-common-internals-17.08.3.tar.xz";
- sha256 = "10r5flyy4vph1x39dp2mskqksnf5h0qvskl31ln65vz9m8zrhq3w";
- name = "ktp-common-internals-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-common-internals-17.12.3.tar.xz";
+ sha256 = "0vzppfy2ik3j9aw2rzb272h8q57vv6z3pqycfwbsd4j751hccx80";
+ name = "ktp-common-internals-17.12.3.tar.xz";
};
};
ktp-contact-list = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-list-17.08.3.tar.xz";
- sha256 = "04j2swlqwzppxsbqnwyrz60lgi9l8d7x8hf4xmmhrv1al6vzmb5q";
- name = "ktp-contact-list-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-list-17.12.3.tar.xz";
+ sha256 = "1clyfaabjjafmazw3gli10b00v0yb8m05bd6lwia7anslhs9pjfb";
+ name = "ktp-contact-list-17.12.3.tar.xz";
};
};
ktp-contact-runner = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-runner-17.08.3.tar.xz";
- sha256 = "1sh0arsy3z413ng0b89sc6a4rh2rnh50k2mhkrdzcvfbwlf74bhw";
- name = "ktp-contact-runner-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-runner-17.12.3.tar.xz";
+ sha256 = "0rj7l0dr0kqcijaxwq06chbmjb5xr12zcs02mjc08af5kc2girsq";
+ name = "ktp-contact-runner-17.12.3.tar.xz";
};
};
ktp-desktop-applets = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-desktop-applets-17.08.3.tar.xz";
- sha256 = "03m834rh9v6ash8vm1cs2jpyxma6jaag61h5a51s3ykp0rgv984c";
- name = "ktp-desktop-applets-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-desktop-applets-17.12.3.tar.xz";
+ sha256 = "16n8gj6x9cbk9bbpdf8zchrjajpw0dh2n5vf2ngyhw59w3rlwisj";
+ name = "ktp-desktop-applets-17.12.3.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-filetransfer-handler-17.08.3.tar.xz";
- sha256 = "0vpl977p9lv58p04v6f9v0g4fda7xkhdggf3n4sjnwhis3n0nnx6";
- name = "ktp-filetransfer-handler-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-filetransfer-handler-17.12.3.tar.xz";
+ sha256 = "1l2w39k9gmlnysphh4scc0krmxf0s9h1frj9blml9qfd8n92v5y8";
+ name = "ktp-filetransfer-handler-17.12.3.tar.xz";
};
};
ktp-kded-module = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-kded-module-17.08.3.tar.xz";
- sha256 = "0mzzbi50ad2z11wi77957fhmwmqnqhfwjll4s7bj4fq6i3kpncmb";
- name = "ktp-kded-module-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-kded-module-17.12.3.tar.xz";
+ sha256 = "1752m9sr7mb7hgrbarr2vnllvd67n6c059i3k2ds4npajvcdszhp";
+ name = "ktp-kded-module-17.12.3.tar.xz";
};
};
ktp-send-file = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-send-file-17.08.3.tar.xz";
- sha256 = "1al9w5n0w6i3x0izylx2jviakj3j19izlys9j7phc2gnm99g8mfa";
- name = "ktp-send-file-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-send-file-17.12.3.tar.xz";
+ sha256 = "02z13fy21v8yl3q164lw9265k3mw5mdhmr8f0dlpkx2x3mgdgjch";
+ name = "ktp-send-file-17.12.3.tar.xz";
};
};
ktp-text-ui = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktp-text-ui-17.08.3.tar.xz";
- sha256 = "1ib9hskw3qdrpnb0caj12wqkzg0vh2i9wlx582zchn4k4hqkwsxw";
- name = "ktp-text-ui-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktp-text-ui-17.12.3.tar.xz";
+ sha256 = "0zhqhq7zq4xp44df77fms1jp14pfz1gdandblgcbyx55fqgkx38v";
+ name = "ktp-text-ui-17.12.3.tar.xz";
};
};
ktuberling = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/ktuberling-17.08.3.tar.xz";
- sha256 = "1jvyg09c5458m066sd0x6p2z41rpgbdvkgmw1f6wiybqwxg82h43";
- name = "ktuberling-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/ktuberling-17.12.3.tar.xz";
+ sha256 = "1rqn9fzniyz3nnrjk6qjpbcs7m0gfnl2m671dgj87pwfsddicyr4";
+ name = "ktuberling-17.12.3.tar.xz";
};
};
kturtle = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kturtle-17.08.3.tar.xz";
- sha256 = "1ral1y1s2jsc8zm1bwiliblywlpsb7q79cjqafz31r6cb72rkcs4";
- name = "kturtle-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kturtle-17.12.3.tar.xz";
+ sha256 = "1m7pppqy1c6kscy95hx284p0iinx00iafpihii8hl4bvvam2sws8";
+ name = "kturtle-17.12.3.tar.xz";
};
};
kubrick = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kubrick-17.08.3.tar.xz";
- sha256 = "02hzlkqrb55dc45zgqx3r58r7syb3kr2dfwws3s96j5i4q1bp5p8";
- name = "kubrick-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kubrick-17.12.3.tar.xz";
+ sha256 = "0ls51xvkvxpr6pzpj67jmfbcwx7wrc9lyb149y59bmfbckc1cimp";
+ name = "kubrick-17.12.3.tar.xz";
};
};
kwalletmanager = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kwalletmanager-17.08.3.tar.xz";
- sha256 = "1ggrswys6ip3lxj6qjy32i36rlmzn2cxddjildlb2b2hk6c3k36r";
- name = "kwalletmanager-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kwalletmanager-17.12.3.tar.xz";
+ sha256 = "1lwslsx15ymyssnwl9yam26j3m5153sjyc4cvv5sxflk5wghaad1";
+ name = "kwalletmanager-17.12.3.tar.xz";
};
};
kwave = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kwave-17.08.3.tar.xz";
- sha256 = "0gxmmz5ry6gjfrxwksrxvqyff8f3p807q5s4rcpfh975f10ixqqi";
- name = "kwave-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kwave-17.12.3.tar.xz";
+ sha256 = "1wqhjdjc1cf1zjbgpxmiw60bxlxld7mikv1lkph750wygjkmnrng";
+ name = "kwave-17.12.3.tar.xz";
};
};
kwordquiz = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/kwordquiz-17.08.3.tar.xz";
- sha256 = "0bzfil8pml6jmc0zgszxybyxvkdgzzq37l97z2qvhmjw8pfk0zsr";
- name = "kwordquiz-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/kwordquiz-17.12.3.tar.xz";
+ sha256 = "1w1z5hjg36jyzl247ff1xk4xhr49qhnkmcxhnyp8fsj5hq9in6xx";
+ name = "kwordquiz-17.12.3.tar.xz";
};
};
libgravatar = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libgravatar-17.08.3.tar.xz";
- sha256 = "0xx9xik5xcg9gs2hjf0z24v7bqqf5qk8x0743qlspyc35i8jq7hx";
- name = "libgravatar-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libgravatar-17.12.3.tar.xz";
+ sha256 = "1862yzcmk1w9y1k83hkh749mhk9hlba7hdlsbbj8hmf3jb7hrczm";
+ name = "libgravatar-17.12.3.tar.xz";
};
};
libkcddb = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkcddb-17.08.3.tar.xz";
- sha256 = "0yhs9acv87i8635dw79hpsiywgxcbnaa4vx0l95v50r3v2pknx7h";
- name = "libkcddb-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkcddb-17.12.3.tar.xz";
+ sha256 = "1qwizxb8y35qddiqvf0469gnjid2bc80dfnv4qixxs3ba094c2pi";
+ name = "libkcddb-17.12.3.tar.xz";
};
};
libkcompactdisc = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkcompactdisc-17.08.3.tar.xz";
- sha256 = "0r0w7qwi1pqcs9fv5rnpf7d2zjvaqd3yj2x12z2vc81qz4vrdr19";
- name = "libkcompactdisc-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkcompactdisc-17.12.3.tar.xz";
+ sha256 = "1brz12j45vfb4xixr3lhn9fs1hbf723kc46psdg24yghfmx5j28v";
+ name = "libkcompactdisc-17.12.3.tar.xz";
};
};
libkdcraw = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkdcraw-17.08.3.tar.xz";
- sha256 = "0hnbphkdmz3yd0callcwk2bqnkr2i9ljck63rz6yn4adnfdclkad";
- name = "libkdcraw-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkdcraw-17.12.3.tar.xz";
+ sha256 = "11p25ldv3ry4khb52mfay85wlfbrsvk6f52yx8shzvbzxyzxf0nc";
+ name = "libkdcraw-17.12.3.tar.xz";
};
};
libkdegames = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkdegames-17.08.3.tar.xz";
- sha256 = "1sc6y01z0alxdgrm3rlki6n5a3gblrim7cbxj9xbsghy6s8s3pn0";
- name = "libkdegames-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkdegames-17.12.3.tar.xz";
+ sha256 = "1kh1wpdajzd1i3j0kr79npzq4w41gisn27k8v26dq1wy727vy4kd";
+ name = "libkdegames-17.12.3.tar.xz";
};
};
libkdepim = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkdepim-17.08.3.tar.xz";
- sha256 = "19njszdhca7lk6cmkj4nnvj8zk7nakb9gq8bg34dqhhiq3nc6si5";
- name = "libkdepim-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkdepim-17.12.3.tar.xz";
+ sha256 = "0zz86mnz73jj78gdfh0s19wfypb0xwxsvjcijbkr340diri5862q";
+ name = "libkdepim-17.12.3.tar.xz";
};
};
libkeduvocdocument = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkeduvocdocument-17.08.3.tar.xz";
- sha256 = "0q978wn4brcszlf47iqnc93fqgcsvfcw2292n2hapf0cv8j8vzbm";
- name = "libkeduvocdocument-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkeduvocdocument-17.12.3.tar.xz";
+ sha256 = "0yqilmf61izbh44rsmspslnikawikxsq8nk8a4lvq9206yy6h11v";
+ name = "libkeduvocdocument-17.12.3.tar.xz";
};
};
libkexiv2 = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkexiv2-17.08.3.tar.xz";
- sha256 = "0j906k63j30sajb70kqglhz9lhai98bh9x2bcwma711b2f30q2r2";
- name = "libkexiv2-17.08.3.tar.xz";
- };
- };
- libkface = {
- version = "17.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkface-17.08.3.tar.xz";
- sha256 = "0im9k72rxpk17m8ckl06rvylsxwjhgh3yxji1visvxljwkdscbmx";
- name = "libkface-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkexiv2-17.12.3.tar.xz";
+ sha256 = "1xzrq9dn4x8afsf21sxqbsz1sk2vzp2g1ri5d5rz4vd1gj0sk3lg";
+ name = "libkexiv2-17.12.3.tar.xz";
};
};
libkgapi = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkgapi-17.08.3.tar.xz";
- sha256 = "1yw00c16g2h59x5wzaaicv8b9dvdhbp0mqv49m8krnw07awh7isz";
- name = "libkgapi-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkgapi-17.12.3.tar.xz";
+ sha256 = "015g1l4fkc5j403f0hak03iz2qi62gx4wlldm59hi1vgqq1xfp1y";
+ name = "libkgapi-17.12.3.tar.xz";
};
};
libkgeomap = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkgeomap-17.08.3.tar.xz";
- sha256 = "0k0ndgwwm78z8hybyi0clfpkvmrpaj9b3xyda57c410m73fbdr0m";
- name = "libkgeomap-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkgeomap-17.12.3.tar.xz";
+ sha256 = "1064yl3whr8g9qyirpgzvag2z4lal4qyljvlapfq3mpa3jxpcwdi";
+ name = "libkgeomap-17.12.3.tar.xz";
};
};
libkipi = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkipi-17.08.3.tar.xz";
- sha256 = "0c0bhw0wpm6y21wj15cs73150dh0vxddl4lypj3xjpknxspiv32x";
- name = "libkipi-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkipi-17.12.3.tar.xz";
+ sha256 = "0qqvrg1nvzcrxjvm1grxzm0vk7s9j1kzf73dk41cmvgwv9wirlgq";
+ name = "libkipi-17.12.3.tar.xz";
};
};
libkleo = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkleo-17.08.3.tar.xz";
- sha256 = "1nyf7c1q7dngk28852lkhz3h1cvi5xy4ydshkm376h32ps905yb7";
- name = "libkleo-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkleo-17.12.3.tar.xz";
+ sha256 = "0pp72ba58vwl1m9i72gdghbk3r5sa0pm8y7q9hz4a5qv919iny2k";
+ name = "libkleo-17.12.3.tar.xz";
};
};
libkmahjongg = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkmahjongg-17.08.3.tar.xz";
- sha256 = "1w7fzvp44dl74m5pl206mrwxpj3fh4fd0fwfinxps616jx1q76fd";
- name = "libkmahjongg-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkmahjongg-17.12.3.tar.xz";
+ sha256 = "10j9r8mb5x90zv91m32q0in2brqcwl3h7kv7lr6dqhd6jjmrx4gd";
+ name = "libkmahjongg-17.12.3.tar.xz";
};
};
libkomparediff2 = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libkomparediff2-17.08.3.tar.xz";
- sha256 = "01bd04av3jnsc2kxirfi4d8k2baaskdk2kasmbih1gml2mw9sbff";
- name = "libkomparediff2-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libkomparediff2-17.12.3.tar.xz";
+ sha256 = "0w6p8lvm2rn7y4qz0x3s87lwh1758xnyhwkkkng55n8v9rpjjw7l";
+ name = "libkomparediff2-17.12.3.tar.xz";
};
};
libksane = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libksane-17.08.3.tar.xz";
- sha256 = "1skmqiw3j8jsdaj2haridslkx27wf55swjkzgjk4cxsk96j7y4ib";
- name = "libksane-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libksane-17.12.3.tar.xz";
+ sha256 = "1rnxywpljiw4fb6djlm486z98l5f7vlwca0i0q99rj17gkxlddk2";
+ name = "libksane-17.12.3.tar.xz";
};
};
libksieve = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/libksieve-17.08.3.tar.xz";
- sha256 = "1nphwghis0mmmb92nr4f5d364nd5jyi1has9dc1hx6qz8p0wphwg";
- name = "libksieve-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/libksieve-17.12.3.tar.xz";
+ sha256 = "1cp1bfw2xd5fsnw5z061vfg8wbvv1bqk2lvcyvxgvm1im7892433";
+ name = "libksieve-17.12.3.tar.xz";
};
};
lokalize = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/lokalize-17.08.3.tar.xz";
- sha256 = "0d4ym1vif1ggdlbs2k3ralc6lsm81xnlfp3z3mlkvg0vv77sfbra";
- name = "lokalize-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/lokalize-17.12.3.tar.xz";
+ sha256 = "0n5f7myv45446kfpcaw7y278xsjxq5hnamfhc20h24m9pflp7bp9";
+ name = "lokalize-17.12.3.tar.xz";
};
};
lskat = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/lskat-17.08.3.tar.xz";
- sha256 = "07vhmk03z2jw6mlfv5mdhzafcqa06skzm6ssk70y3whkwkck385b";
- name = "lskat-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/lskat-17.12.3.tar.xz";
+ sha256 = "0n4kma0llqbgzcqsm7rb5rjidn8wlal9ay26041mic9hk51s3bm0";
+ name = "lskat-17.12.3.tar.xz";
};
};
mailcommon = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/mailcommon-17.08.3.tar.xz";
- sha256 = "1zgy8sjng40w8m0b8fdy62p9sng7nld84py1k8zjw8mzhqqzqxs5";
- name = "mailcommon-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/mailcommon-17.12.3.tar.xz";
+ sha256 = "17m54i4a9kn8lmpj3b42q2q9gqrympl9z2lgbhsacmak9aqrv94f";
+ name = "mailcommon-17.12.3.tar.xz";
};
};
mailimporter = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/mailimporter-17.08.3.tar.xz";
- sha256 = "0h3wsbca2lhw1zjv2l1q6fhdwnx9kznyiykcn7jgzsh6f7grzqa8";
- name = "mailimporter-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/mailimporter-17.12.3.tar.xz";
+ sha256 = "1q93lc98ak5kzz762ih906g0jj0vnib97x39sqq4awspy4a825pc";
+ name = "mailimporter-17.12.3.tar.xz";
};
};
marble = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/marble-17.08.3.tar.xz";
- sha256 = "0qmzy9b1gd40xzw4i978315dxf1ay1937wplb9nc670gmlrqnzy2";
- name = "marble-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/marble-17.12.3.tar.xz";
+ sha256 = "1pgqnvdmx7s33m2wyz73lwlpbjh9qfc3aqk532lznz3ncc54n07i";
+ name = "marble-17.12.3.tar.xz";
};
};
mbox-importer = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/mbox-importer-17.08.3.tar.xz";
- sha256 = "1nlzjvzwp4jalqbql39q9lszfxg9cba5bcbi4wgiv580pyq38h28";
- name = "mbox-importer-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/mbox-importer-17.12.3.tar.xz";
+ sha256 = "16gkjgqjh91kx2rgjz4idm888q6fxycqdmwy6bmks825260426rp";
+ name = "mbox-importer-17.12.3.tar.xz";
};
};
messagelib = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/messagelib-17.08.3.tar.xz";
- sha256 = "1nxi79dyavjvgn83bjjrdwg0ry298ib126dxyl7inx7qgc4nhddn";
- name = "messagelib-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/messagelib-17.12.3.tar.xz";
+ sha256 = "1pmdzyd8jka9wrflzv7lrr03nqf4r4vli2imhmg5hhjknn2b0ald";
+ name = "messagelib-17.12.3.tar.xz";
};
};
minuet = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/minuet-17.08.3.tar.xz";
- sha256 = "1jg47mb5wnpw60is5zmdrqhjwsq6bnd5vw0pfiiw1arws50rv2h6";
- name = "minuet-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/minuet-17.12.3.tar.xz";
+ sha256 = "1ahrcpkbs49kyhq0l5fcacn49pqfczy1b9zvydxmld5kxlpz7w8b";
+ name = "minuet-17.12.3.tar.xz";
};
};
okteta = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/okteta-17.08.3.tar.xz";
- sha256 = "1zs0g5mnlj2fd0wipxgajnvbl5s24a37v6zdkixck5fmvlj6g14v";
- name = "okteta-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/okteta-17.12.3.tar.xz";
+ sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
+ name = "okteta-17.12.3.tar.xz";
};
};
okular = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/okular-17.08.3.tar.xz";
- sha256 = "1zalj2v9fgxc50b339i3j4n3gpf87pjnnqbgvkmd041apsv6jbnk";
- name = "okular-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/okular-17.12.3.tar.xz";
+ sha256 = "0786kr75ly0h2jwabhzz3fc15swn8n90g1w3l27kphch5nf584ha";
+ name = "okular-17.12.3.tar.xz";
};
};
palapeli = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/palapeli-17.08.3.tar.xz";
- sha256 = "1i689gycqlpi83wfy9l2dqzdypaizdx7cx069fbm4akv8r4xfjfz";
- name = "palapeli-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/palapeli-17.12.3.tar.xz";
+ sha256 = "11kjj85axc7l1l1ip0gcf5p7f7g9rfwyn476wz25prsr2g2ijgln";
+ name = "palapeli-17.12.3.tar.xz";
};
};
parley = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/parley-17.08.3.tar.xz";
- sha256 = "0crrf7k8p9rz72q4zfbyxxfza5dm0z4nhhc4jqafra8vvbjyja2j";
- name = "parley-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/parley-17.12.3.tar.xz";
+ sha256 = "0swb7371vz9cxr2588hgcdxa5bmdb9n7h1yvmw28fbzgz98ax7g6";
+ name = "parley-17.12.3.tar.xz";
};
};
picmi = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/picmi-17.08.3.tar.xz";
- sha256 = "0zj3ang96rwzpjr3y8lig1dhqxd2ipcs3q873plra0lxmlhnzq6b";
- name = "picmi-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/picmi-17.12.3.tar.xz";
+ sha256 = "04cza4rvgzzvrzzw27n74k7kiwm7amcg12k97fr1rvlpd5irh2vn";
+ name = "picmi-17.12.3.tar.xz";
};
};
pimcommon = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/pimcommon-17.08.3.tar.xz";
- sha256 = "0d1avdhm78kfjvl8sybjqsmp7k1wl961bqlzgbxk9wq6411p9r8r";
- name = "pimcommon-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/pimcommon-17.12.3.tar.xz";
+ sha256 = "1yav8flw6rf5qdwgys3zkmijp81p56hwn6cd71ckfzdrjm11kikq";
+ name = "pimcommon-17.12.3.tar.xz";
};
};
pim-data-exporter = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/pim-data-exporter-17.08.3.tar.xz";
- sha256 = "0afn6rjz7vmz9q16a487ssns6nj7sbqbz4ydbhh1i3c8xhlnxg1m";
- name = "pim-data-exporter-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/pim-data-exporter-17.12.3.tar.xz";
+ sha256 = "0j5ynb0y602lnl571i247dbxna7xjqfphl7bcfqmg09ipjhxvk5b";
+ name = "pim-data-exporter-17.12.3.tar.xz";
};
};
pim-sieve-editor = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/pim-sieve-editor-17.08.3.tar.xz";
- sha256 = "0fw976hdrvw68025bs1bff47d4cs95ws7p4viacmz4na9m0cag7n";
- name = "pim-sieve-editor-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/pim-sieve-editor-17.12.3.tar.xz";
+ sha256 = "0bkd5qsrabwg5imnif8z0hvhsk00a2n23238f9y14g963bhyw4pp";
+ name = "pim-sieve-editor-17.12.3.tar.xz";
};
};
poxml = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/poxml-17.08.3.tar.xz";
- sha256 = "0vgh77rdqp8pq5k20794fl8m12azx6r2pkl0rijmwar2ln5k0k25";
- name = "poxml-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/poxml-17.12.3.tar.xz";
+ sha256 = "0r8wm2x13ayb3mi69c35plvwzw7r9525idk3indsxc0rhv5qkhfp";
+ name = "poxml-17.12.3.tar.xz";
};
};
print-manager = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/print-manager-17.08.3.tar.xz";
- sha256 = "0ncda47pk225hn45rv1wwibn0s974mm4s5fpi54hyanba6ganll5";
- name = "print-manager-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/print-manager-17.12.3.tar.xz";
+ sha256 = "0w1snq5ca7hza3x4gp17skia6g8yvarn9g3qacfwp13vad4v8zj7";
+ name = "print-manager-17.12.3.tar.xz";
};
};
rocs = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/rocs-17.08.3.tar.xz";
- sha256 = "1nvwjxsfqccrig25m9qkivrjn302g6blb6h2p3q1qnlszcw8b9wd";
- name = "rocs-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/rocs-17.12.3.tar.xz";
+ sha256 = "1dfg0klvix2mgnvw3dkh13694iac5jf0jk8rm9ssxcaljvix7h46";
+ name = "rocs-17.12.3.tar.xz";
};
};
signon-kwallet-extension = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/signon-kwallet-extension-17.08.3.tar.xz";
- sha256 = "0hpalgz4xfd9qh5mxgrs638v0as4x0a5133caci6lwaydrhgwrxg";
- name = "signon-kwallet-extension-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/signon-kwallet-extension-17.12.3.tar.xz";
+ sha256 = "0r9whz7p6v9wgbycdxzgxfm1ngxhjk4dzir5k5fqvmb6wrg05v4m";
+ name = "signon-kwallet-extension-17.12.3.tar.xz";
};
};
spectacle = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/spectacle-17.08.3.tar.xz";
- sha256 = "18z0sqd38146nc73kmwvshjxl0wgm1fh4zzxai1hcp7yiipndzm6";
- name = "spectacle-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/spectacle-17.12.3.tar.xz";
+ sha256 = "12g976ys2ga88n0a45zqkai28bmxw0vxy2qlgdmx7mxvkpwlccyr";
+ name = "spectacle-17.12.3.tar.xz";
};
};
step = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/step-17.08.3.tar.xz";
- sha256 = "1gnsfn2iz2lax30pdyqvm6s5b8zjsn4gs031dlr1xgsd98c1xq87";
- name = "step-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/step-17.12.3.tar.xz";
+ sha256 = "161r0abz18s32xpn8x2j5diwb6p4hggvlnv7p9yk1z3qm3fyj46v";
+ name = "step-17.12.3.tar.xz";
};
};
svgpart = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/svgpart-17.08.3.tar.xz";
- sha256 = "07i3ny0bl1fjfia2rbrb7n4qycdpz4gjpvx6v540ghq58dy7nfgw";
- name = "svgpart-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/svgpart-17.12.3.tar.xz";
+ sha256 = "1rcfdkpinqdbz7js7p9h0lxmnvln4y95af1icq2871w7mg4fzsf5";
+ name = "svgpart-17.12.3.tar.xz";
};
};
sweeper = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/sweeper-17.08.3.tar.xz";
- sha256 = "0jymkz024ywss8y2xpyndpr7pk89v7bbgr5anpnywfkgx3lv06xn";
- name = "sweeper-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/sweeper-17.12.3.tar.xz";
+ sha256 = "1pwjv4knj0by0sn8j788cxg3sl3vm0gql49yv47bansrvs458n4x";
+ name = "sweeper-17.12.3.tar.xz";
};
};
syndication = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/syndication-17.08.3.tar.xz";
- sha256 = "0yakzq927prd9pd1g7gld90pz1cxjwzic2c2cw9bw17x19yr748h";
- name = "syndication-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/syndication-17.12.3.tar.xz";
+ sha256 = "1bq220ir09sszj31xi8sk116k9xkhkmnmahigc73qc3hvgq0x808";
+ name = "syndication-17.12.3.tar.xz";
};
};
umbrello = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/umbrello-17.08.3.tar.xz";
- sha256 = "1g149nkp02b1sgsq83r0p3vfii8jsc4kx79znglcjlf20dg89j70";
- name = "umbrello-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/umbrello-17.12.3.tar.xz";
+ sha256 = "0j3qwisq9aqvgpqx54jd4idspbgvl72xffb8qn3wwyky9jpnmhr0";
+ name = "umbrello-17.12.3.tar.xz";
};
};
zeroconf-ioslave = {
- version = "17.08.3";
+ version = "17.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.08.3/src/zeroconf-ioslave-17.08.3.tar.xz";
- sha256 = "14prm7qjqh4xrgdxzbs8z8a8p2jjf2amcx7r1qx62fkhfbh6gw01";
- name = "zeroconf-ioslave-17.08.3.tar.xz";
+ url = "${mirror}/stable/applications/17.12.3/src/zeroconf-ioslave-17.12.3.tar.xz";
+ sha256 = "1glhci1vivkx3nvk6zwf2z09dii81vr5lcp3xf0aafl4p1vlxi3i";
+ name = "zeroconf-ioslave-17.12.3.tar.xz";
};
};
}
diff --git a/pkgs/applications/misc/airspy/default.nix b/pkgs/applications/misc/airspy/default.nix
new file mode 100644
index 000000000000..9b6771a3925b
--- /dev/null
+++ b/pkgs/applications/misc/airspy/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchFromGitHub
+, cmake , pkgconfig, libusb
+}:
+
+let
+ version = "1.0.9";
+in
+ stdenv.mkDerivation {
+ name = "airspy-${version}";
+
+ src = fetchFromGitHub {
+ owner = "airspy";
+ repo = "airspyone_host";
+ rev = "v${version}";
+ sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x";
+ };
+
+ postPatch = ''
+ substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d"
+ '';
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ libusb ];
+
+ cmakeFlags =
+ lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/airspy/airspyone_host;
+ description = "Host tools and driver library for the AirSpy SDR";
+ license = licenses.free;
+ platforms = with platforms; linux ++ darwin;
+ maintainers = with maintainers; [ markuskowa ];
+ };
+ }
diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix
new file mode 100644
index 000000000000..18f47b7652f8
--- /dev/null
+++ b/pkgs/applications/misc/airtame/default.nix
@@ -0,0 +1,100 @@
+{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
+, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg, fontconfig, freetype
+, gdk_pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
+, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender
+, libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264
+}:
+
+let libPath = lib.makeLibraryPath [
+ alsaLib
+ atk
+ cairo
+ cups
+ curl
+ dbus
+ expat
+ ffmpeg
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ glibc
+ gnome2.GConf
+ gtk2
+ libopus
+ nspr
+ nss
+ pango
+ stdenv.cc.cc
+ udev
+ x264
+ libX11
+ libXScrnSaver
+ libXcomposite
+ libXcursor
+ libXdamage
+ libXext
+ libXfixes
+ libXi
+ libXrandr
+ libXrender
+ libXtst
+ libpulseaudio
+ libxcb
+];
+in stdenv.mkDerivation rec {
+ pname = "airtame";
+ version = "3.1.1";
+ name = "${pname}-${version}";
+ longName = "${pname}-application";
+
+ src = fetchurl {
+ url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz";
+ sha256 = "1am1qz280r5g9i0vwwx5lr24fpdl5lazhpr2bhb34nlr5d8rsmzr";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ desktopItem = makeDesktopItem rec {
+ name = "airtame";
+ exec = longName;
+ comment = "Airtame Streaming Client";
+ desktopName = "Airtame";
+ icon = name;
+ genericName = comment;
+ categories = "Application;Network;";
+ };
+
+ installPhase = ''
+ opt="$out/opt/airtame"
+ mkdir -p "$opt"
+ cp -R . "$opt"
+ mkdir -p "$out/bin"
+ ln -s "$opt/${longName}" "$out/bin/"
+ mkdir -p "$out/share"
+ cp -r "${desktopItem}/share/applications" "$out/share/"
+ mkdir -p "$out/share/icons"
+ ln -s "$opt/icon.png" "$out/share/icons/airtame.png"
+
+ # Flags and rpath are copied from launch-airtame.sh.
+ interp="$(< $NIX_CC/nix-support/dynamic-linker)"
+ vendorlib="$opt/resources/app.asar.unpacked/streamer/vendor/airtame-core/lib"
+ rpath="${libPath}:$opt:$vendorlib:$opt/resources/app.asar.unpacked/encryption/out/lib"
+ rm $vendorlib/libcurl.so*
+ find "$opt" \( -type f -executable -o -name "*.so" -o -name "*.so.*" \) \
+ -exec patchelf --set-rpath "$rpath" {} \;
+ # The main binary also needs libudev which was removed by --shrink-rpath.
+ patchelf --set-interpreter "$interp" $opt/${longName}
+ wrapProgram $opt/${longName} --add-flags "--disable-gpu --enable-transparent-visuals"
+ '';
+
+ dontPatchELF = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://airtame.com/download;
+ description = "Wireless streaming client for Airtame devices";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ thanegill ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index bb934ff4812c..6907ce877645 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -12,6 +12,7 @@
libXcursor,
libXxf86vm,
libXi,
+ libXrandr,
xclip }:
with rustPlatform;
@@ -24,22 +25,23 @@ let
libX11
libXcursor
libXxf86vm
+ libXrandr
libXi
];
in buildRustPackage rec {
name = "alacritty-unstable-${version}";
- version = "2017-11-12";
+ version = "2018-03-04";
# At the moment we cannot handle git dependencies in buildRustPackage.
# This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
src = fetchgit {
url = https://github.com/Mic92/alacritty.git;
rev = "rev-${version}";
- sha256 = "0096fzrfzj0a2n2n531r4b6c8rlfj5qc90d6i4iin5axalk3i1h4";
+ sha256 = "0pxnc6r75c7rwnsqc0idi4a60arpgchl1i8yppibhv0px5w11mwa";
fetchSubmodules = true;
};
- cargoSha256 = "10blch8pzk1zk3w27sbcszhcnq908xh1q55vqgy8iv5x47rpl02q";
+ cargoSha256 = "0q2yy9cldng8znkmhysgrwi43z2x7a8nb1bnxpy9z170q8ds0m0j";
nativeBuildInputs = [
cmake
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 5abd8953a443..250590d0d302 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,15 +1,15 @@
-{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtdeclarative, qtsvg, qtx11extras, muparser,
- cmake, python3 }:
+{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase,
+ qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }:
mkDerivation rec {
name = "albert-${version}";
- version = "0.14.7";
+ version = "0.14.15";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${version}";
- sha256 = "1ryjrbrbgignhkvsv4021l4am8ml7g8v4bs5cp5jj288k4p2rf4n";
+ sha256 = "1rjp0bmzs8b9blbxz3sfcanyhgmds882pf1g3jx5qp85y64j8507";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index f1d84a919724..eb35eb9cf73b 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch";
sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j";
})
+ # fix build with gcc7
+ (fetchpatch {
+ url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch";
+ sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi";
+ })
];
installPhase = ''
@@ -58,7 +63,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.lgpl2;
- platforms = platforms.unix;
+ platforms = platforms.linux;
maintainers = [ maintainers.ardumont ];
};
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
index cfd4d6b32de3..f69152820e43 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }:
+{ stdenv, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:
stdenv.mkDerivation rec {
name = "artha-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ dbus_glib gtk2 wordnet ];
+ buildInputs = [ dbus-glib gtk2 wordnet ];
meta = with stdenv.lib; {
description = "An offline thesaurus based on WordNet";
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
index 71196e919915..0689843af612 100644
--- a/pkgs/applications/misc/bb/default.nix
+++ b/pkgs/applications/misc/bb/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
homepage = http://aa-project.sourceforge.net/bb;
description = "AA-lib demo";
license = licenses.gpl2;
- maintainers = maintainers.rnhmjoj;
- platforms = platforms.unix;
+ maintainers = [ maintainers.rnhmjoj ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index 196db45d9057..f0dce54675cd 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -1,13 +1,13 @@
{ stdenv, pythonPackages, fetchurl }:
pythonPackages.buildPythonApplication rec {
name = "bleachbit-${version}";
- version = "1.12";
+ version = "2.0";
namePrefix = "";
src = fetchurl {
url = "mirror://sourceforge/bleachbit/${name}.tar.bz2";
- sha256 = "1x58n429q1c77nfpf2g3vyh6yq8wha69zfzmxf1rvjvcvvmqs62m";
+ sha256 = "0ps98zx4n13q92bq7ykqi6hj3i7brdqgm87i9gk6ibvljp1vxdz9";
};
buildInputs = [ pythonPackages.wrapPython ];
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index b348f253b350..8133bf1c7634 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
-, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python
+, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd
, jackaudioSupport ? false, libjack2
, cudaSupport ? false, cudatoolkit
@@ -11,17 +11,17 @@
with lib;
stdenv.mkDerivation rec {
- name = "blender-2.79";
+ name = "blender-2.79a";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
- sha256 = "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9";
+ sha256 = "1mw45mvfk9f0fhn12vp3g2vwqzinrp3by0m3w01wj87h9ri5zkwc";
};
buildInputs =
[ boost cmake ffmpeg gettext glew ilmbase
libXi libX11 libXext libXrender
- freetype libjpeg libpng libsamplerate libsndfile libtiff mesa openal
+ freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal
opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc
(opensubdiv.override { inherit cudaSupport; })
]
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 8aa191c0f3c2..e75076e53d1c 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,14 +1,14 @@
{ stdenv, python3, fetchFromGitHub }:
with python3.pkgs; buildPythonApplication rec {
- version = "3.4";
+ version = "3.6";
name = "buku-${version}";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
- sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0";
+ sha256 = "1639sf200n9rxgkvvhlhnrjsb7vn42p1fl1rx562axh3vpr6j4c4";
};
nativeBuildInputs = [
@@ -33,7 +33,9 @@ with python3.pkgs; buildPythonApplication rec {
# Disables a test which requires internet
substituteInPlace tests/test_bukuDb.py \
- --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')"
+ --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \
+ --replace "self.assertEqual(shorturl, 'http://tny.im/yt')" "" \
+ --replace "self.assertEqual(url, 'https://www.google.com')" ""
'';
installPhase = ''
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index 3f22d1629e27..8800ebd83ca0 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -1,20 +1,26 @@
-{stdenv, fetchurl, ncurses, gettext, python3, makeWrapper }:
+{ stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }:
stdenv.mkDerivation rec {
name = "calcurse-${version}";
- version = "4.2.2";
+ version = "4.3.0";
src = fetchurl {
url = "http://calcurse.org/files/${name}.tar.gz";
- sha256 = "0il0y06akdqgy0f9p40m4x6arn66nh7sr1w1i41bszycs7div266";
+ sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i";
};
- buildInputs = [ncurses gettext python3 ];
+ buildInputs = [ ncurses gettext python3 ];
nativeBuildInputs = [ makeWrapper ];
+ # Build Python environment with httplib2 for calcurse-caldav
+ pythonEnv = python3Packages.python.buildEnv.override {
+ extraLibs = [ python3Packages.httplib2 ];
+ };
+ propagatedBuildInputs = [ pythonEnv ];
+
postInstall = ''
- makeWrapper ${python3}/bin/python3 $out/bin/calcurse-caldav
- '';
+ substituteInPlace $out/bin/calcurse-caldav --replace /usr/bin/python3 ${pythonEnv}/bin/python3
+ '';
meta = with stdenv.lib; {
description = "A calendar and scheduling application for the command line";
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d81e9ed4bbef..ae99bb772a68 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,28 +5,20 @@
}:
stdenv.mkDerivation rec {
- version = "3.12.0";
+ version = "3.19.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
- sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq";
+ sha256 = "0sann0aw6ngvmqp7049zg6hyqjrb5myq5ivr4r9x732c1cnjhhw9";
};
patches = [
# Patches from Debian that:
# - disable plugin installation (very insecure)
+ ./disable_plugins.patch
# - switches the version update from enabled to disabled by default
- (fetchpatch {
- name = "disable_plugins.patch";
- url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/disable_plugins.py-20111220183043-dcl08ccfagjxt1dv-1/disable_plugins.py";
- sha256 = "19spdx52dhbrfn9lm084yl3cfwm6f90imd51k97sf7flmpl569pk";
- })
- (fetchpatch {
- name = "no_updates_dialog.patch";
- url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/no_updates_dialog.pa-20081231120426-rzzufl0zo66t3mtc-16/no_updates_dialog.patch";
- sha256 = "16xwa2fa47jvs954fjrwr8rhh89aljgi1d1wrfxa40sknlmfwxif";
- })
+ ./no_updates_dialog.patch
# the unrar patch is not from debian
] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
@@ -49,7 +41,7 @@ stdenv.mkDerivation rec {
poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
] ++ (with python2Packages; [
- apsw cssselect cssutils dateutil html5-parser lxml mechanize netifaces pillow
+ apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow
python pyqt5 sip
regex msgpack
# the following are distributed with calibre, but we use upstream instead
diff --git a/pkgs/applications/misc/calibre/disable_plugins.patch b/pkgs/applications/misc/calibre/disable_plugins.patch
new file mode 100644
index 000000000000..9ef1dd04251d
--- /dev/null
+++ b/pkgs/applications/misc/calibre/disable_plugins.patch
@@ -0,0 +1,17 @@
+Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code.
+Author: Martin Pitt
+Bug-Debian: http://bugs.debian.org/640026
+
+Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py
+===================================================================
+--- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py 2011-12-16 05:49:14.000000000 +0100
++++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py 2011-12-20 19:29:04.798468930 +0100
+@@ -28,8 +28,6 @@
+ pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)
+ cm('welcome wizard', _('Run welcome wizard'),
+ icon='wizard.png', triggered=self.gui.run_wizard)
+- cm('plugin updater', _('Get plugins to enhance calibre'),
+- icon='plugins/plugin_updater.png', triggered=self.get_plugins)
+ if not DEBUG:
+ pm.addSeparator()
+ cm('restart', _('Restart in debug mode'), icon='debug.png',
diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch
new file mode 100644
index 000000000000..4d37c3b642f5
--- /dev/null
+++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch
@@ -0,0 +1,27 @@
+diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py
+--- calibre-2.9.0.orig/src/calibre/gui2/main.py 2014-11-09 20:09:54.081231882 +0800
++++ calibre-2.9.0/src/calibre/gui2/main.py 2014-11-09 20:15:48.193033844 +0800
+@@ -37,8 +37,9 @@
+ help=_('Start minimized to system tray.'))
+ parser.add_option('-v', '--verbose', default=0, action='count',
+ help=_('Ignored, do not use. Present only for legacy reasons'))
+- parser.add_option('--no-update-check', default=False, action='store_true',
+- help=_('Do not check for updates'))
++ parser.add_option('--update-check', dest='no_update_check', default=True,
++ action='store_false',
++ help=_('Check for updates'))
+ parser.add_option('--ignore-plugins', default=False, action='store_true',
+ help=_('Ignore custom plugins, useful if you installed a plugin'
+ ' that is preventing calibre from starting'))
+diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py
+--- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-09 20:09:54.082231864 +0800
++++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115 +0800
+@@ -154,6 +154,8 @@
+ self.update_checker.signal.update_found.connect(self.update_found,
+ type=Qt.QueuedConnection)
+ self.update_checker.start()
++ else:
++ self.update_checker = None
+
+ def recalc_update_label(self, number_of_plugin_updates):
+ self.update_found(self.last_newest_calibre_version, number_of_plugin_updates)
diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix
deleted file mode 100644
index d90e8a6dba66..000000000000
--- a/pkgs/applications/misc/camlistore/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, lib, go, fetchgit, git, buildGoPackage }:
-
-buildGoPackage rec {
- name = "camlistore-${version}";
- version = "0.9";
-
- src = fetchgit {
- url = "https://github.com/camlistore/camlistore";
- rev = "refs/tags/${version}";
- sha256 = "1ypplr939ny9drsdngapa029fgak0wic8sbna588m79cbl17psya";
- leaveDotGit = true;
- };
-
- buildInputs = [ git ];
-
- goPackagePath = "";
- buildPhase = ''
- cd go/src/camlistore
- go run make.go
- '';
-
- installPhase = ''
- mkdir -p $bin/bin
- rm bin/README
- cp bin/* $bin/bin
- '';
-
- meta = with stdenv.lib; {
- description = "A way of storing, syncing, sharing, modelling and backing up content";
- homepage = https://camlistore.org;
- license = licenses.asl20;
- maintainers = with maintainers; [ cstrahan ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index a46485c5ef73..4ef1adb8e6cc 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -1,20 +1,26 @@
-{ stdenv, python3Packages, fetchurl }:
+{ stdenv, python3Packages, fetchFromGitHub }:
with python3Packages;
buildPythonApplication rec {
name = "${pname}-${version}";
pname = "cheat";
- version = "2.2.1";
+ version = "2.2.2";
- propagatedBuildInputs = with python3Packages; [ docopt pygments ];
+ propagatedBuildInputs = [ docopt pygments ];
- src = fetchPypi {
- inherit pname version;
- sha256 = "0w4k1h02p2gjv5wcr1c7r0ynb7v50qajx4hpyxz0ndh96f6x30pl";
+ src = fetchFromGitHub {
+ owner = "chrisallenlane";
+ repo = "cheat";
+ rev = version;
+ sha256 = "1da4m4n6nivjakpll6jj0aszrv24g2zax74034lzpv3pbh84fvas";
};
# no tests available
doCheck = false;
+ postInstall = ''
+ install -D man1/cheat.1.gz $out/share/man/man1/cheat.1.gz
+ '';
+
meta = with stdenv.lib; {
description = "cheat allows you to create and view interactive cheatsheets on the command-line";
maintainers = with maintainers; [ mic92 ];
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 324fa12dc463..ff1712f12fec 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "cherrytree-${version}";
- version = "0.37.6";
+ version = "0.38.4";
src = fetchurl {
url = "http://www.giuspen.com/software/${name}.tar.xz";
- sha256 = "0x4cgsimpwh7wfbzbzw2f5ipxxjizpi4wa99s1cwizynfjr38y5s";
+ sha256 = "1zazyxkrli77wahn4c1z24qyz5bwlayl335f2kdxb44dicrx58g2";
};
buildInputs = with pythonPackages;
diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix
index d9ea487a83bb..4477cbbcc06a 100644
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor_icon_theme }:
+{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "clipit-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ];
+ buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ];
meta = with stdenv.lib; {
description = "Lightweight GTK+ Clipboard Manager";
diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix
index de18a211c450..7781f0df853a 100644
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/pkgs/applications/misc/confclerk/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
homepage = http://www.toastfreeware.priv.at/confclerk;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ ehmry ];
- inherit (qt4.meta) platforms;
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index 985a418e1582..f4ad3a1c5382 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchgit, qtbase, qtquick1, qmltermwidget,
+{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget,
qtquickcontrols, qtgraphicaleffects, qmake }:
stdenv.mkDerivation rec {
- version = "1.0.0";
+ version = "1.0.1";
name = "cool-retro-term-${version}";
- src = fetchgit {
- url = "https://github.com/Swordfish90/cool-retro-term.git";
- rev = "refs/tags/v${version}";
- sha256 = "19sf9ppp2xzwfjwmdqgq9pils4yafsz662n1h65sv5aq04c7gmxs";
- fetchSubmodules = false;
+ src = fetchFromGitHub {
+ owner = "Swordfish90";
+ repo = "cool-retro-term";
+ rev = version;
+ sha256 = "1ah54crqv13xsg9cvlwmgyhz90xjjy3vy8pbn9i0vc0ljmpgkqd5";
};
patchPhase = ''
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 37afea2bb6f6..45bd417abb4f 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "CopyQ-${version}";
- version = "3.1.2";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
- sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl";
+ sha256 = "0j46h87ifinkydi0m725p422m9svk3dpcz8dnrci4mxx0inn6qs3";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix
index 150c900ba9fb..857254c3cb03 100644
--- a/pkgs/applications/misc/cpp-ethereum/default.nix
+++ b/pkgs/applications/misc/cpp-ethereum/default.nix
@@ -13,7 +13,7 @@
, miniupnpc
, libmicrohttpd
, gmp
-, mesa
+, libGLU_combined
, extraCmakeFlags ? []
}:
stdenv.mkDerivation rec {
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
miniupnpc
libmicrohttpd
gmp
- mesa
+ libGLU_combined
];
dontStrip = true;
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 1012f187497a..edb10a0f6671 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
name = "cura-${version}";
- version = "3.0.3";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
rev = version;
- sha256 = "0ks8bb3mif6kyvb01ddhpn1c2l31s8fxivi70kmpm743sqv4kjaa";
+ sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp";
};
buildInputs = [ qtbase qtquickcontrols ];
@@ -28,7 +28,7 @@ mkDerivation rec {
meta = with lib; {
description = "3D printer / slicing GUI built on top of the Uranium framework";
- homepage = "https://github.com/Ultimaker/Cura";
+ homepage = https://github.com/Ultimaker/Cura;
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 575889ad2c6f..c3a19e6551a2 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "curaengine-${version}";
- version = "3.0.3";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
- sha256 = "0x1ss3hppw6062rmmxh0dpnm5cg6r2mp01k0nxyw5riiljj59ydy";
+ sha256 = "1yqpp6qhixzni3ik11vbk5kcdrhlz2j4ylzmh8f6c86r4d73a0cp";
};
nativeBuildInputs = [ cmake ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
- homepage = "https://github.com/Ultimaker/CuraEngine";
+ homepage = https://github.com/Ultimaker/CuraEngine;
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
new file mode 100644
index 000000000000..5bb91c1a70fe
--- /dev/null
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -0,0 +1,70 @@
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
+, fontconfig, freetype, glib, gtk2
+, jdk, libX11, libXrender, libXtst, zlib }:
+
+# The build process is almost like eclipse's.
+# See `pkgs/applications/editors/eclipse/*.nix`
+
+stdenv.mkDerivation rec {
+ name = "dbeaver-ce-${version}";
+ version = "5.0.0";
+
+ desktopItem = makeDesktopItem {
+ name = "dbeaver";
+ exec = "dbeaver";
+ icon = "dbeaver";
+ desktopName = "dbeaver";
+ comment = "SQL Integrated Development Environment";
+ genericName = "SQL Integrated Development Environment";
+ categories = "Application;Development;";
+ };
+
+ buildInputs = [
+ fontconfig freetype glib gtk2
+ jdk libX11 libXrender libXtst zlib
+ ];
+
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ src = fetchurl {
+ url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
+ sha256 = "0n7l7ph002z8npn08vdn0ghgkipz14cr73i9c69s7wiq2d2baahv";
+ };
+
+ installPhase = ''
+ mkdir -p $out/
+ cp -r . $out/dbeaver
+
+ # Patch binaries.
+ interpreter=$(cat $NIX_CC/nix-support/dynamic-linker)
+ patchelf --set-interpreter $interpreter $out/dbeaver/dbeaver
+
+ makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
+ --prefix PATH : ${jdk}/bin \
+ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ])} \
+ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+
+ # Create desktop item.
+ mkdir -p $out/share/applications
+ cp ${desktopItem}/share/applications/* $out/share/applications
+
+ mkdir -p $out/share/pixmaps
+ ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://dbeaver.jkiss.org;
+ description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more";
+ longDescription = ''
+ Free multi-platform database tool for developers, SQL programmers, database
+ administrators and analysts. Supports all popular databases: MySQL,
+ PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access,
+ Teradata, Firebird, Derby, etc.
+ '';
+ license = licenses.asl20;
+ platforms = [ "x86_64-linux" ];
+ maintainers = [ maintainers.samueldr ];
+ };
+}
diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix
new file mode 100644
index 000000000000..ca7e332cc286
--- /dev/null
+++ b/pkgs/applications/misc/ddgr/default.nix
@@ -0,0 +1,46 @@
+{stdenv, fetchpatch, fetchFromGitHub, python3Packages}:
+
+stdenv.mkDerivation rec {
+ version = "1.1";
+ name = "ddgr-${version}";
+
+ src = fetchFromGitHub {
+ owner = "jarun";
+ repo = "ddgr";
+ rev = "v${version}";
+ sha256 = "1q66kwip5y0kfkfldm1x54plz85mjyvv1xpxjqrs30r2lr0najgf";
+ };
+
+ buildInputs = [
+ (python3Packages.python.withPackages (ps: with ps; [
+ requests
+ ]))
+ ];
+
+ patches = [
+ (fetchpatch {
+ sha256 = "1rxr3biq0mk4m0m7dsxr70dhz4fg5siil5x5fy9nymcmhvcm1cdc";
+ name = "Fix-zsh-completion.patch";
+ url = "https://github.com/jarun/ddgr/commit/10c1a911a3d5cbf3e96357c932b0211d3165c4b8.patch";
+ })
+ ];
+
+ makeFlags = "PREFIX=$(out)";
+
+ postInstall = ''
+ mkdir -p "$out/share/bash-completion/completions/"
+ cp "auto-completion/bash/ddgr-completion.bash" "$out/share/bash-completion/completions/"
+ mkdir -p "$out/share/fish/vendor_completions.d/"
+ cp "auto-completion/fish/ddgr.fish" "$out/share/fish/vendor_completions.d/"
+ mkdir -p "$out/share/zsh/site-functions/"
+ cp "auto-completion/zsh/_ddgr" "$out/share/zsh/site-functions/"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/jarun/ddgr;
+ description = "Search DuckDuckGo from the terminal";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ markus1189 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix
index 170018dc972d..e5dc011d5531 100644
--- a/pkgs/applications/misc/deco/default.nix
+++ b/pkgs/applications/misc/deco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, scsh, feh, xlibs }:
+{ stdenv, fetchFromGitHub, scsh, feh, xorg }:
stdenv.mkDerivation rec {
pname = "deco";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
postFixup = ''
substituteInPlace $out/bin/deco --replace "/usr/bin/env scsh" "${scsh}/bin/scsh"
substituteInPlace $out/bin/deco --replace "feh" "${feh}/bin/feh"
- substituteInPlace $out/bin/deco --replace "xdpyinfo" "${xlibs.xdpyinfo}/bin/xdpyinfo"
+ substituteInPlace $out/bin/deco --replace "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix
deleted file mode 100644
index 0ee52b740f24..000000000000
--- a/pkgs/applications/misc/deepin-terminal/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, gee, wnck, gettext, libsecret, json_glib }:
-
-stdenv.mkDerivation rec {
- name = "deepin-terminal-${version}";
- version = "2.3.3";
-
- src = fetchFromGitHub {
- owner = "linuxdeepin";
- repo = "deepin-terminal";
- rev = version;
- sha256 = "0qam34g1rannv8kvw1zbps763a9ii9vbrkxyxxdk737hlpxdzg8h";
- };
-
- patchPhase = ''
- substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\"
- '';
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ unzip gtk3 vala cmake vte gee wnck gettext libsecret json_glib ];
-
- meta = {
- description = "The default terminal emulation for Deepin";
- longDescription = ''
- Deepin terminal, it sharpens your focus in the world of command line!
- It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features.
- '';
- homepage = https://github.com/linuxdeepin/deepin-terminal/;
- license = stdenv.lib.licenses.gpl3;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index 4a7c4d7ec304..1ea45c3574a5 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "devilspie2-${version}";
- version = "0.42";
+ version = "0.43";
src = fetchurl {
url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz";
- sha256 = "119zb9x5i3y4cp30h4113psqxb5d7zxiyijpq02g8kds1wqvrx8i";
+ sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc";
};
nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
new file mode 100644
index 000000000000..467c2b3c2d59
--- /dev/null
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }:
+
+let
+ wxInputs =
+ if stdenv.isDarwin then
+ [ wxmac darwin.apple_sdk.frameworks.Cocoa ]
+ else
+ [ wxGTK ];
+in
+stdenv.mkDerivation rec {
+ name = "diff-pdf-${version}";
+ version = "2017-12-30";
+
+ src = fetchFromGitHub {
+ owner = "vslavik";
+ repo = "diff-pdf";
+ rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc";
+ sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m";
+ };
+
+ nativeBuildInputs = [ autoconf automake pkgconfig ];
+ buildInputs = [ cairo poppler ] ++ wxInputs;
+
+ preConfigure = "./bootstrap";
+
+ meta = with stdenv.lib; {
+ homepage = http://vslavik.github.io/diff-pdf;
+ description = "Simple tool for visually comparing two PDF files";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index fd3d0b35729e..144e1fa566ca 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, poppler_qt4, qmake4Hook }:
+{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }:
stdenv.mkDerivation rec {
version = "2.1.3";
@@ -9,13 +9,19 @@ stdenv.mkDerivation rec {
sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566";
};
- patches = [ ./fix_path_poppler_qt4.patch ];
+ patches = [
+ (fetchpatch {
+ url = https://raw.githubusercontent.com/gentoo/gentoo/9b971631588ff46e7c2d501bc35cd0d9ce2d98e2/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch;
+ sha256 = "0sax8gcqcmzf74hmdr3rarqs4nsxmml9qmh6pqyjmgl3lypxhafg";
+ })
+ ./fix_path_poppler_qt5.patch
+ ];
- buildInputs = [ qt4 poppler_qt4 ];
- nativeBuildInputs = [ qmake4Hook ];
+ nativeBuildInputs = [ qmake qttools ];
+ buildInputs = [ qtbase poppler_qt5 ];
preConfigure = ''
- substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev}
+ substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev}
lrelease diffpdf.pro
'';
diff --git a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
similarity index 53%
rename from pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch
rename to pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
index e72cad8b7a25..9535ea2c6b0d 100644
--- a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch
+++ b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
@@ -2,15 +2,15 @@ diff -uNr diffpdf-2.1.3/diffpdf.pro diffpdf-2.1.3-new/diffpdf.pro
--- diffpdf-2.1.3/diffpdf.pro 2013-10-15 09:01:22.000000000 +0200
+++ diffpdf-2.1.3-new/diffpdf.pro 2015-07-07 23:13:36.445572148 +0200
@@ -47,9 +47,9 @@
- INCLUDEPATH += /c/poppler_lib/include/poppler/qt4
+ INCLUDEPATH += /c/poppler_lib/include/poppler/qt5
LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin
} else {
-- exists(/usr/include/poppler/qt4) {
+- exists(/usr/include/poppler/qt5) {
- INCLUDEPATH += /usr/include/poppler/cpp
-- INCLUDEPATH += /usr/include/poppler/qt4
-+ exists(@@NIX_POPPLER_QT4@@/include/poppler/qt4) {
-+ INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/cpp
-+ INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/qt4
+- INCLUDEPATH += /usr/include/poppler/qt5
++ exists(@@NIX_POPPLER_QT5@@/include/poppler/qt5) {
++ INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/cpp
++ INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/qt5
} else {
INCLUDEPATH += /usr/local/include/poppler/cpp
- INCLUDEPATH += /usr/local/include/poppler/qt4
+ INCLUDEPATH += /usr/local/include/poppler/qt5
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
new file mode 100644
index 000000000000..fbd9d47633a1
--- /dev/null
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -0,0 +1,140 @@
+{ stdenv
+, autoreconfHook
+, curl
+, fetchFromGitHub
+, git
+, libevent
+, libtool
+, libqrencode
+, libudev
+, libusb
+, makeWrapper
+, pkgconfig
+, qtbase
+, qttools
+, qtwebsockets
+, qtmultimedia
+, udevRule51 ? ''
+, SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402"
+, ''
+, udevRule52 ? ''
+, KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbbf%n"
+, ''
+, writeText
+}:
+
+# Enabling the digitalbitbox program
+#
+# programs.digitalbitbox.enable = true;
+#
+# will install the digitalbitbox package and enable the corresponding hardware
+# module and is by far the easiest way to get started with the Digital Bitbox on
+# NixOS.
+
+# In case you install the package only, please be aware that you may need to
+# apply some udev rules to allow the application to identify and access your
+# wallet. In a nixos-configuration, one may accomplish this by enabling the
+# digitalbitbox hardware module
+#
+# hardware.digitalbitbox.enable = true;
+#
+# or by adding the digitalbitbox package to system.udev.packages
+#
+# system.udev.packages = [ pkgs.digitalbitbox ];
+
+# See https://digitalbitbox.com/start_linux for more information.
+let
+ copyUdevRuleToOutput = name: rule:
+ "cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
+in stdenv.mkDerivation rec {
+ name = "digitalbitbox-${version}";
+ version = "2.2.2";
+
+ src = fetchFromGitHub {
+ owner = "digitalbitbox";
+ repo = "dbb-app";
+ rev = "v${version}";
+ sha256 = "1r77fvqrlaryzij5dfbnigzhvg1d12g96qb2gp8dy3xph1j0k3s1";
+ };
+
+ nativeBuildInputs = with stdenv.lib; [
+ autoreconfHook
+ curl
+ git
+ makeWrapper
+ pkgconfig
+ qttools
+ ];
+
+ buildInputs = with stdenv.lib; [
+ libevent
+ libtool
+ libudev
+ libusb
+ libqrencode
+
+ qtbase
+ qtwebsockets
+ qtmultimedia
+ ];
+
+ LUPDATE="${qttools.dev}/bin/lupdate";
+ LRELEASE="${qttools.dev}/bin/lrelease";
+ MOC="${qtbase.dev}/bin/moc";
+ QTDIR="${qtbase.dev}";
+ RCC="${qtbase.dev}/bin/rcc";
+ UIC="${qtbase.dev}/bin/uic";
+
+ configureFlags = [
+ "--enable-libusb"
+ ];
+
+ hardeningDisable = [
+ "format"
+ ];
+
+ postInstall = ''
+ mkdir -p "$out/lib"
+ cp src/libbtc/.libs/*.so* $out/lib
+ cp src/libbtc/src/secp256k1/.libs/*.so* $out/lib
+ cp src/hidapi/libusb/.libs/*.so* $out/lib
+ cp src/univalue/.libs/*.so* $out/lib
+
+ # [RPATH][patchelf] Avoid forbidden reference error
+ rm -rf $PWD
+
+ wrapProgram "$out/bin/dbb-cli" --prefix LD_LIBRARY_PATH : "$out/lib"
+ wrapProgram "$out/bin/dbb-app" --prefix LD_LIBRARY_PATH : "$out/lib"
+
+ # Provide udev rules as documented in https://digitalbitbox.com/start_linux
+ mkdir -p "$out/etc/udev/rules.d"
+ ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51}
+ ${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A QT based application for the Digital Bitbox hardware wallet";
+ longDescription = ''
+ Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices.
+
+ This package will only install the dbb-app and dbb-cli, however; in order for these applications to identify and access Digital Bitbox devices, one may want to enable the digitalbitbox hardware module by adding
+
+ hardware.digitalbitbox.enable = true;
+
+ to the configuration which is equivalent to adding this package to the udev.packages list.
+
+
+ The easiest way to use the digitalbitbox package in NixOS is by adding
+
+ programs.digitalbitbox.enable = true;
+
+ to the configuration which installs the package and enables the hardware module.
+ '';
+ homepage = "https://digitalbitbox.com/";
+ license = licenses.mit;
+ maintainers = with maintainers; [
+ vidbina
+ ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix
index 0c9fa5ea2d27..924b95d8b6a9 100644
--- a/pkgs/applications/misc/dmensamenu/default.nix
+++ b/pkgs/applications/misc/dmensamenu/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
name = "dmensamenu-${version}";
- version = "1.0.0";
+ version = "1.1.1";
propagatedBuildInputs = [
requests
@@ -12,8 +12,8 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "dotlambda";
repo = "dmensamenu";
- rev = "v${version}";
- sha256 = "05wbpmgjpm0ik9pcydj7r9w7i7bfpcij24bc4jljdwl9ilw62ixp";
+ rev = version;
+ sha256 = "0gc23k2zbv9zfc0v27y4spiva8cizxavpzd5pch5qbawh2lak6a3";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 8ef4f3ae8974..f8b175eb86a1 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
stdenv.mkDerivation rec {
- name = "dmenu-4.7";
+ name = "dmenu-4.8";
src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
- sha256 = "1fgph549i0yw62x02jhfc8qmqk2rnzcnm46bxq6jig1cvkw3amm7";
+ sha256 = "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy";
};
buildInputs = [ libX11 libXinerama zlib libXft ];
diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix
deleted file mode 100644
index 340e8f161647..000000000000
--- a/pkgs/applications/misc/dmenu/wayland.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{stdenv, fetchurl #, libX11, libXinerama, enableXft, libXft, zlib
-, swc, wld, wayland, libxkbcommon, pixman, fontconfig
-}:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "dmenu-wayland-${version}";
- version = "git-2017-04-07";
- rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70";
-
- src = fetchurl {
- url = "https://github.com/michaelforney/dmenu/archive/${rev}.tar.gz";
- sha256 = "0y1jvh2815c005ns0bsjxsmz82smw22n6jsfg2g03a1pacakp6ys";
- };
-
- buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ];
-
- postPatch = ''
- sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run
- '';
-
- preConfigure = [
- ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk''
- ];
-
- meta = {
- description = "A generic, highly customizable, and efficient menu for the X Window System";
- homepage = http://tools.suckless.org/dmenu;
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ ];
- platforms = with stdenv.lib.platforms; all;
- };
-}
diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix
index cfe76701cebb..3888c4ce0a0d 100644
--- a/pkgs/applications/misc/dockbarx/default.nix
+++ b/pkgs/applications/misc/dockbarx/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pythonPackages, gnome2, keybinder }:
pythonPackages.buildPythonApplication rec {
- ver = "0.92";
+ ver = "0.93";
name = "dockbarx-${ver}";
src = fetchFromGitHub {
owner = "M7S";
repo = "dockbarx";
rev = ver;
- sha256 = "17n7jc3bk3f2i0i1ddpp05bakifc8y5xppads7ihpkj3qw9g35vl";
+ sha256 = "1h1g2vag5vnx87sa1f0qi8rq7wlr2ymvkrdr08kk7cma4wk0x6hg";
};
postPatch = ''
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index 1393af67bf8c..bd7fbe863163 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }:
+{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2 }:
stdenv.mkDerivation rec {
- name = "doomseeker-1.1";
+ name = "doomseeker-${version}";
+ version = "2018-03-03";
- src = fetchurl {
- url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2";
- sha256 = "0nmq8s842z30ngzikrmfx0xpnk4klxdv37y26chs002rnj010r7h";
+ src = fetchFromBitbucket {
+ owner = "Doomseeker";
+ repo = "doomseeker";
+ rev = "072110a8fe0643c4a72461e7768560813bb0a62b";
+ sha256 = "1w4g5f7yifqk2d054dqrmy8qj4n5hxdan7n59845m1xh2f2r8i0p";
};
- buildInputs = [ qt4 zlib bzip2 ];
+ patches = [ ./fix_paths.patch ];
- nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
+
+ nativeBuildInputs = [ cmake qttools pkgconfig ];
enableParallelBuilding = true;
- patchPhase = ''
- substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications
- '';
-
meta = with stdenv.lib; {
homepage = http://doomseeker.drdteam.org/;
description = "Multiplayer server browser for many Doom source ports";
diff --git a/pkgs/applications/misc/doomseeker/fix_paths.patch b/pkgs/applications/misc/doomseeker/fix_paths.patch
new file mode 100644
index 000000000000..08654c2384cb
--- /dev/null
+++ b/pkgs/applications/misc/doomseeker/fix_paths.patch
@@ -0,0 +1,40 @@
+diff -ru3 source-old/src/core/datapaths.cpp source-new/src/core/datapaths.cpp
+--- source-old/src/core/datapaths.cpp 1970-01-01 03:00:01.000000000 +0300
++++ source-new/src/core/datapaths.cpp 2018-03-04 00:10:25.247262567 +0300
+@@ -335,7 +335,7 @@
+ paths.append(workingDirectory());
+ paths.append("./");
+ #ifndef Q_OS_WIN32
+- paths.append(INSTALL_PREFIX "/" INSTALL_LIBDIR "/doomseeker/");
++ paths.append(INSTALL_PREFIX "/lib/doomseeker/");
+ #endif
+ paths = uniquePaths(paths);
+ return Strings::combineManyPaths(paths, "engines/");
+diff -ru3 source-old/src/core/pathfinder/pathfinder.cpp source-new/src/core/pathfinder/pathfinder.cpp
+--- source-old/src/core/pathfinder/pathfinder.cpp 1970-01-01 03:00:01.000000000 +0300
++++ source-new/src/core/pathfinder/pathfinder.cpp 2018-03-04 00:09:34.862556976 +0300
+@@ -128,9 +128,7 @@
+ << DataPaths::programFilesDirectory(DataPaths::x64)
+ << DataPaths::programFilesDirectory(DataPaths::x86);
+ #else
+- paths << "/usr/bin" << "/usr/local/bin" << "/usr/share/bin"
+- << "/usr/games/" << "/usr/local/games/"
+- << "/usr/share/games/" << gDefaultDataPaths->workingDirectory() << ".";
++ paths << gDefaultDataPaths->workingDirectory() << ".";
+ #endif
+ QStringList pathsCopy(paths);
+ foreach (const QString &path, pathsCopy)
+diff -ru3 source-old/src/core/pathfinder/wadpathfinder.cpp source-new/src/core/pathfinder/wadpathfinder.cpp
+--- source-old/src/core/pathfinder/wadpathfinder.cpp 1970-01-01 03:00:01.000000000 +0300
++++ source-new/src/core/pathfinder/wadpathfinder.cpp 2018-03-04 00:09:56.822865339 +0300
+@@ -84,10 +84,6 @@
+ QStringList defaultPaths()
+ {
+ QStringList paths;
+- #ifdef Q_OS_UNIX
+- paths << "/usr/local/share/games/doom/"
+- << "/usr/share/games/doom/";
+- #endif
+ return paths;
+ }
+ };
diff --git a/pkgs/applications/misc/dump1090/default.nix b/pkgs/applications/misc/dump1090/default.nix
index 3e9fe133d93c..29f6c6085602 100644
--- a/pkgs/applications/misc/dump1090/default.nix
+++ b/pkgs/applications/misc/dump1090/default.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
buildInputs = [ libusb rtl-sdr ];
- makeFlags = [ "PREFIX=$out" ];
+ makeFlags = [ "PREFIX=$(out)" ];
installPhase = ''
mkdir -p $out/bin $out/share
- cp -v dump1090 $out/bin/dump1090
+ cp -v dump1090 view1090 $out/bin
cp -vr public_html $out/share/dump1090
'';
diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 919ad10fa706..9906b1fd8587 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,34 +1,39 @@
{ stdenv, fetchFromGitHub, fetchpatch
-, pkgconfig, which, perl, gtk2, xrandr
-, cairo, dbus, gdk_pixbuf, glib, libX11, libXScrnSaver
+, pkgconfig, which, perl, libXrandr
+, cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg
}:
stdenv.mkDerivation rec {
name = "dunst-${version}";
- version = "1.2.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "dunst-project";
repo = "dunst";
rev = "v${version}";
- sha256 = "0jncnb4z4hg92ws08bkf52jswsd4vqlzyznwbynhh2jh6q0sl18b";
+ sha256 = "0i518v2z9fklzl5w60gkwwmg30yz3bd0k4rxjrxjabx73pvxm1mz";
};
- nativeBuildInputs = [ perl pkgconfig which ];
+ nativeBuildInputs = [ perl pkgconfig which systemd ];
buildInputs = [
cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
- libXinerama libnotify libxdg_basedir pango xproto librsvg gtk2 xrandr
+ libXinerama libnotify libxdg_basedir pango xproto librsvg libXrandr
];
outputs = [ "out" "man" ];
- makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ];
+ makeFlags = [
+ "PREFIX=$(out)"
+ "VERSION=$(version)"
+ "SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
+ "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
+ ];
meta = with stdenv.lib; {
description = "Lightweight and customizable notification daemon";
- homepage = http://www.knopwob.org/dunst/;
+ homepage = https://dunst-project.org/;
license = licenses.bsd3;
# NOTE: 'unix' or even 'all' COULD work too, I'm not sure
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 56c1a8168a82..76b61de56088 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,24 +1,31 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python3Packages, qtbase }:
-python2Packages.buildPythonApplication rec {
- version = "2.9.4";
+let
+
+ python = python3Packages.python;
+
+in
+
+python3Packages.buildPythonApplication rec {
+ version = "3.1.6";
name = "electron-cash-${version}";
src = fetchurl {
- url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
+ url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz";
# Verified using official SHA-1 and signature from
# https://github.com/fyookball/keys-n-hashes
- sha256 = "1y8mzwa6bb8zj4l92wm4c2icnr42wmhbfz6z5ymh356gwll914vh";
+ sha256 = "062k5iw0jcp10zxrffvgiyfg51c5xzs7gmm638icx01yy67d58dm";
};
- propagatedBuildInputs = with python2Packages; [
- dns
+ propagatedBuildInputs = with python3Packages; [
+ dnspython
ecdsa
- jsonrpclib
+ jsonrpclib-pelix
+ matplotlib
pbkdf2
pyaes
pycrypto
- pyqt4
+ pyqt5
pysocks
qrcode
requests
@@ -29,18 +36,25 @@ python2Packages.buildPythonApplication rec {
trezor
];
+ postPatch = ''
+ # Remove pyqt5 check
+ sed -i '/pyqt5/d' setup.py
+ '';
+
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
- pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+ pyrcc5 icons.qrc -o gui/qt/icons_rc.py
# Recording the creation timestamps introduces indeterminism to the build
sed -i '/Created: .*/d' gui/qt/icons_rc.py
'';
+ doCheck = false;
+
postInstall = ''
# Despite setting usr_share above, these files are installed under
# $out/nix ...
- mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out
- rm -rf $out/lib/python2.7/site-packages/nix
+ mv $out/${python.sitePackages}/nix/store"/"*/share $out
+ rm -rf $out/${python.sitePackages}/nix
substituteInPlace $out/share/applications/electron-cash.desktop \
--replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"
@@ -60,6 +74,7 @@ python2Packages.buildPythonApplication rec {
of the blockchain.
'';
homepage = https://www.electroncash.org/;
+ platforms = platforms.linux;
maintainers = with maintainers; [ lassulus ];
license = licenses.mit;
};
diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix
index e7a5a1be1979..c98efa547b39 100644
--- a/pkgs/applications/misc/electrum-dash/default.nix
+++ b/pkgs/applications/misc/electrum-dash/default.nix
@@ -1,16 +1,17 @@
{ stdenv, fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
+ version = "2.9.3.1";
name = "electrum-dash-${version}";
- version = "2.4.1";
src = fetchurl {
- url = "https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz";
- sha256 = "02k7m7fyn0cvlgmwxr2gag7rf2knllkch1ma58shysp7zx9jb000";
+ url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz";
+ #"https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz";
+ sha256 = "9b7ac205f63fd4bfb15d77a34a4451ef82caecf096f31048a7603bd276dfc33e";
};
propagatedBuildInputs = with python2Packages; [
- dns
+ dnspython
ecdsa
pbkdf2
protobuf
@@ -20,10 +21,11 @@ python2Packages.buildPythonApplication rec {
pyqt4
qrcode
requests
- slowaes
+ pyaes
tlslite
x11_hash
mnemonic
+ jsonrpclib
# plugins
trezor
diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix
index bb41f8665e57..8540c39d1336 100644
--- a/pkgs/applications/misc/electrum-ltc/default.nix
+++ b/pkgs/applications/misc/electrum-ltc/default.nix
@@ -1,33 +1,34 @@
{ stdenv
, fetchurl
-, python2Packages
+, python3Packages
}:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
name = "electrum-ltc-${version}";
- version = "2.6.4.2";
+ version = "3.0.6.2";
src = fetchurl {
url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
- sha256 = "0sqcyk6n6kgaiinnwh6mzbbn4whk3ga59r5bw5rqmnnfqk1xdnb4";
+ sha256 = "1bay4vfkanxsa8pj8n99sj55yc59s84nns97lbvagyp0p0lclia7";
};
- propagatedBuildInputs = with python2Packages; [
- pyqt4
- slowaes
+ propagatedBuildInputs = with python3Packages; [
+ pyaes
ecdsa
pbkdf2
requests
qrcode
- ltc_scrypt
+ py_scrypt
+ pyqt5
protobuf
- dns
- jsonrpclib
+ dnspython
+ jsonrpclib-pelix
+ pysocks
];
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
- pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+ pyrcc5 icons.qrc -o gui/qt/icons_rc.py
# Recording the creation timestamps introduces indeterminism to the build
sed -i '/Created: .*/d' gui/qt/icons_rc.py
'';
@@ -47,7 +48,7 @@ python2Packages.buildPythonApplication rec {
'';
homepage = https://electrum-ltc.org/;
license = licenses.mit;
- platforms = platforms.all;
+ platforms = platforms.linux;
maintainers = with maintainers; [ asymmetric ];
};
}
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index abe8d0dde84b..47dfa30436f5 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python3, python3Packages, zbar, fetchpatch }:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
name = "electrum-${version}";
- version = "2.9.3";
+ version = "3.1.0";
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2";
+ sha256 = "1hc0ylkq89459wy3av42hp73p34pmh7grsa3qm8fb1k0qg17zy78";
};
- propagatedBuildInputs = with python2Packages; [
- dns
+ propagatedBuildInputs = with python3Packages; [
+ dnspython
ecdsa
- jsonrpclib
+ jsonrpclib-pelix
matplotlib
pbkdf2
protobuf
pyaes
pycrypto
- pyqt4
+ pyqt5
pysocks
qrcode
requests
@@ -35,21 +35,24 @@ python2Packages.buildPythonApplication rec {
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
- pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+ pyrcc5 icons.qrc -o gui/qt/icons_rc.py
# Recording the creation timestamps introduces indeterminism to the build
sed -i '/Created: .*/d' gui/qt/icons_rc.py
+ sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" lib/qrscanner.py
'';
postInstall = ''
# Despite setting usr_share above, these files are installed under
# $out/nix ...
- mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out
- rm -rf $out/lib/python2.7/site-packages/nix
+ mv $out/${python3.sitePackages}/nix/store"/"*/share $out
+ rm -rf $out/${python3.sitePackages}/nix
substituteInPlace $out/share/applications/electrum.desktop \
--replace "Exec=electrum %u" "Exec=$out/bin/electrum %u"
'';
+ doCheck = false;
+
doInstallCheck = true;
installCheckPhase = ''
$out/bin/electrum help >/dev/null
diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 7248fe2c8754..d447e7f50d52 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "emem";
- version = "0.2.48";
+ version = "0.2.50";
name = "${pname}-${version}";
inherit jdk;
src = fetchurl {
url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
- sha256 = "0l68qqjh8lbqb2yqvggiga9qz2j32h3qklcfkycmcffn6l1nlqnq";
+ sha256 = "18x3s3jrph8k3pc75jgwkfqazygpsx93zjxx68zms58my17cybh1";
};
phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix
index 170e2385d4af..69767c11d6aa 100644
--- a/pkgs/applications/misc/evopedia/default.nix
+++ b/pkgs/applications/misc/evopedia/default.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
buildInputs = [ bzip2 qt4 libX11 ];
nativeBuildInputs = [ qmake4Hook ];
+ postInstall = ''
+ # Patch the `evopedia.desktop' file.
+ substituteInPlace $out/share/applications/evopedia.desktop \
+ --replace '/usr/bin/evopedia' $out/bin/evopedia
+ '';
+
meta = with stdenv.lib; {
description = "Offline Wikipedia Viewer";
homepage = http://www.evopedia.info;
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index d0b98863d203..74aab5e7e130 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "exercism-${version}";
- version = "2.4.0";
+ version = "2.4.1";
goPackagePath = "github.com/exercism/cli";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "exercism";
repo = "cli";
rev = "v${version}";
- sha256 = "1hl13sr4ymqg9sjhkxdmhf8cfw69cic3bysw34xfv2j6bjjxfwaa";
+ sha256 = "1nab4459zi2gkh18k9vsm54bz39c2sb60v2xy0i72j1vd99axjjj";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
index 68a16b196fa3..a50070c4eadd 100644
--- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
+++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
@@ -77,9 +77,9 @@ index 0000000..1bd9bb5
+
+
+
-+
-+
-+
++
++
++
+
+
+
@@ -91,6 +91,7 @@ index 0000000..1bd9bb5
+
+
+
++
+
+
+
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 7bd876f1d4aa..9ddd39981cc2 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
+{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
with stdenv.lib;
stdenv.mkDerivation rec {
- rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26";
- build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}";
+ rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a";
+ build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}";
name = "far2l-2.1.${build}";
src = fetchFromGitHub {
owner = "elfmz";
repo = "far2l";
rev = rev;
- sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05";
+ sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b";
};
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index add46f8871d5..93e5d297ffb3 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
-, pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc
-, keybinder3, clutter_gtk, libnotify
+, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc
+, keybinder3, clutter-gtk, libnotify
, libxkbcommon, xorg, udev
, bashInteractive
}:
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ];
buildInputs = [
- vala_0_23 gtk3 gnome3.gnome_common gnome3.libgee
- gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify
+ vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee
+ gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify
xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
libxkbcommon
] ++ optionals stdenv.isLinux [ udev ];
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index 6d67d3a340f5..be853e4213bc 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
- pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
- librsvg, vala_0_34, gnome3, wrapGAppsHook
+{ stdenv, fetchFromGitHub, automake, autoconf, libtool,
+ pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool,
+ librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection
}:
stdenv.mkDerivation rec {
@@ -15,19 +15,20 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- makeWrapper
pkgconfig
automake autoconf libtool
file
intltool
vala_0_34
- gnome3.yelp_tools
+ gnome3.yelp-tools
wrapGAppsHook
+ # For setup hook
+ gobjectIntrospection
];
buildInputs = [
libxml2
- json_glib
+ json-glib
sqlite
itstool
librsvg
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 939b38ca29f7..f05514f3fc58 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "gammu-${version}";
- version = "1.38.2";
+ version = "1.39.0";
src = fetchFromGitHub {
owner = "gammu";
repo = "gammu";
rev = version;
- sha256 = "1rk3p3sjyy6n6mlqs4qgyxna4swrh1zm7b77npxv8j341wxj3khv";
+ sha256 = "1hr053z2l5mjgip83fsxnd1rqsp5gwywzagzrgdg243apn1nz0gs";
};
patches = [ ./bashcomp-dir.patch ./systemd.patch ];
diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix
index 1b29def11ad8..2257b2a98fb7 100644
--- a/pkgs/applications/misc/ganttproject-bin/default.nix
+++ b/pkgs/applications/misc/ganttproject-bin/default.nix
@@ -51,6 +51,5 @@ stdenv.mkDerivation rec {
# ‘GPL3-compatible’. See ${downloadPage} for detailed information.
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix
new file mode 100644
index 000000000000..67bb5feff8c7
--- /dev/null
+++ b/pkgs/applications/misc/gcal/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, ncurses }:
+
+stdenv.mkDerivation rec {
+ name = "gcal-${version}";
+ version = "4.1";
+
+ src = fetchurl {
+ url = "mirror://gnu/gcal/${name}.tar.xz";
+ sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci";
+ };
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ ncurses ];
+
+ meta = {
+ description = "Program for calculating and printing calendars";
+ longDescription = ''
+ Gcal is the GNU version of the trusty old cal(1). Gcal is a
+ program for calculating and printing calendars. Gcal displays
+ hybrid and proleptic Julian and Gregorian calendar sheets. It
+ also displays holiday lists for many countries around the globe.
+ '';
+ homepage = https://www.gnu.org/software/gcal/;
+ license = stdenv.lib.licenses.gpl3Plus;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.romildo ];
+ };
+}
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index b6bb3c2fd83d..7fd3db860dfb 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -6,11 +6,11 @@ assert withBuildColors -> ncurses != null;
stdenv.mkDerivation rec {
name = "girara-${version}";
- version = "0.2.7";
+ version = "0.2.8";
src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
- sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq";
+ sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98";
};
preConfigure = ''
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index 509a54881cce..d4f2a056a9f6 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu,
- intltool, libstartup_notification, gtk_doc, wrapGAppsHook
+ intltool, libstartup_notification, gtk-doc, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- pkgconfig intltool gtk_doc wrapGAppsHook
+ pkgconfig intltool gtk-doc wrapGAppsHook
];
buildInputs = [
- gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring
+ gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring
];
propagatedBuildInputs = [
diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix
index dfe61b57b43d..423eea914b95 100644
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/pkgs/applications/misc/gmtp/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3
-, gsettings_desktop_schemas, wrapGAppsHook
+, gsettings-desktop-schemas, wrapGAppsHook
}:
-let version = "1.3.10"; in
+let version = "1.3.11"; in
stdenv.mkDerivation {
name = "gmtp-${version}";
src = fetchurl {
url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz";
- sha256 = "b21b9a8e66ae7bb09fc70ac7e317a0e32aff3917371a7241dea73c41db1dd13b";
+ sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ];
+ buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
new file mode 100644
index 000000000000..f99344b83d64
--- /dev/null
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gettext
+, libxml2, desktop-file-utils, wrapGAppsHook
+, glib, gtk3, libgtop, gnome3 }:
+
+let
+ pname = "gnome-usage";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0130bwinpkz307nalw6ndi5mk38k5g6jna4gbw2916d54df6a4nq";
+ };
+
+ nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];
+
+ buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ];
+
+ postPatch = ''
+ chmod +x build-aux/meson/postinstall.sh
+ patchShebangs build-aux/meson/postinstall.sh
+ '';
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio-ais/default.nix
index a67a8a44fced..dfb8415219c7 100644
--- a/pkgs/applications/misc/gnuradio-ais/default.nix
+++ b/pkgs/applications/misc/gnuradio-ais/default.nix
@@ -7,13 +7,14 @@ assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation rec {
name = "gnuradio-ais-${version}";
- version = "2016-08-26";
+ version = "2015-12-20";
src = fetchFromGitHub {
owner = "bistromath";
repo = "gr-ais";
- rev = "1863d1bf8a7709a8dfedb3ddb8e2b99112e7c872";
- sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6";
+ # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054
+ "rev" = "8502d0252a2a1a9b8d1a71795eaeb5d820684054";
+ "sha256" = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh";
};
nativeBuildInputs = [ pkgconfig ];
@@ -27,11 +28,13 @@ stdenv.mkDerivation rec {
done
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Gnuradio block for ais";
homepage = https://github.com/bistromath/gr-ais;
license = licenses.gpl3Plus;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ mog ];
};
}
diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio-gsm/default.nix
index bbdc74510eaa..6e0856ce66aa 100644
--- a/pkgs/applications/misc/gnuradio-gsm/default.nix
+++ b/pkgs/applications/misc/gnuradio-gsm/default.nix
@@ -27,11 +27,13 @@ stdenv.mkDerivation rec {
done
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Gnuradio block for gsm";
homepage = https://github.com/ptrkrysik/gr-gsm;
license = licenses.gpl3Plus;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ mog ];
};
}
diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio-nacl/default.nix
index cd3630c842c3..28836958e98c 100644
--- a/pkgs/applications/misc/gnuradio-nacl/default.nix
+++ b/pkgs/applications/misc/gnuradio-nacl/default.nix
@@ -27,11 +27,13 @@ stdenv.mkDerivation rec {
done
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Gnuradio block for encryption";
homepage = https://github.com/stwunsch/gr-nacl;
license = licenses.gpl3Plus;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ mog ];
};
}
diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
index e2d3e808476e..355ca0e95449 100644
--- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix
+++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd
-, makeWrapper, hackrf
+, makeWrapper, hackrf, airspy
, pythonSupport ? true, python, swig
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf
+ cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf airspy
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
@@ -26,11 +26,13 @@ stdenv.mkDerivation rec {
done
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Gnuradio block for OsmoSDR and rtl-sdr";
- homepage = http://sdr.osmocom.org/trac/wiki/GrOsmoSDR;
+ homepage = https://sdr.osmocom.org/trac/wiki/GrOsmoSDR;
license = licenses.gpl3Plus;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ bjornfor the-kenny ];
};
}
diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio-rds/default.nix
index 3d09441a7f03..44ed89d9002d 100644
--- a/pkgs/applications/misc/gnuradio-rds/default.nix
+++ b/pkgs/applications/misc/gnuradio-rds/default.nix
@@ -26,11 +26,13 @@ stdenv.mkDerivation rec {
done
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Gnuradio block for radio data system";
homepage = https://github.com/bastibl/gr-rds;
license = licenses.gpl2Plus;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ mog ];
};
}
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 0156122ec79a..58d8e9fae618 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -1,41 +1,51 @@
-{ stdenv, fetchurl
-# core dependencies
+{ stdenv, fetchFromGitHub, writeText, makeWrapper
+# Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html
+# => core dependencies
, cmake, pkgconfig, git, boost, cppunit, fftw
-# python wrappers
+# => python wrappers
+# May be able to upgrade to swig3
, python, swig2, numpy, scipy, matplotlib
-# grc - the gnu radio companion
+# => grc - the gnu radio companion
, cheetah, pygtk
-# gr-wavelet: collection of wavelet blocks
+# => gr-wavelet: collection of wavelet blocks
, gsl
-# gr-qtgui: the Qt-based GUI
-, qt4, qwt, pyqt4 #, pyqwt
-# gr-wxgui: the Wx-based GUI
+# => gr-qtgui: the Qt-based GUI
+, qt4, qwt, pyqt4
+# => gr-wxgui: the Wx-based GUI
, wxPython, lxml
-# gr-audio: audio subsystems (system/OS dependent)
-, alsaLib
-# uhd: the Ettus USRP Hardware Driver Interface
+# => gr-audio: audio subsystems (system/OS dependent)
+, alsaLib # linux 'audio-alsa'
+, CoreAudio # darwin 'audio-osx'
+# => uhd: the Ettus USRP Hardware Driver Interface
, uhd
-# gr-video-sdl: PAL and NTSC display
+# => gr-video-sdl: PAL and NTSC display
, SDL
+# Other
, libusb1, orc, pyopengl
-, makeWrapper
}:
stdenv.mkDerivation rec {
name = "gnuradio-${version}";
- version = "3.7.11";
+ version = "3.7.11.1";
- src = fetchurl {
- url = "https://gnuradio.org/releases/gnuradio/${name}.tar.gz";
- sha256 = "1m2jf8lafr6pr2dlm40nbvr6az8gwjfkzpbs4fxzv3l5hcqvmnc7";
+ src = fetchFromGitHub {
+ owner = "gnuradio";
+ repo = "gnuradio";
+ rev = "6d2221196082a4954c249dc6955e33d5832a56f2";
+ sha256 = "1fkrb8cnjbriy2x94lz73q6aqxar1rkvfbafp266ykdpm29b4xgm";
+ fetchSubmodules = true;
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- cmake git boost cppunit fftw python swig2 orc lxml qt4
- qwt alsaLib SDL libusb1 uhd gsl makeWrapper
+ nativeBuildInputs = [
+ cmake pkgconfig git makeWrapper cppunit orc
];
+ buildInputs = [
+ boost fftw python swig2 lxml qt4
+ qwt SDL libusb1 uhd gsl
+ ] ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ];
+
propagatedBuildInputs = [
cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl
];
@@ -48,22 +58,46 @@ stdenv.mkDerivation rec {
--replace BOOST_CONSTEXPR_OR_CONST const
'';
- preConfigure = ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable -std=c++11"
+ # Enables composition with nix-shell
+ grcSetupHook = writeText "grcSetupHook.sh" ''
+ addGRCBlocksPath() {
+ addToSearchPath GRC_BLOCKS_PATH $1/share/gnuradio/grc/blocks
+ }
+ addEnvHooks "$targetOffset" addGRCBlocksPath
'';
+ setupHook = [ grcSetupHook ];
+
+ # patch wxgui and pygtk check due to python importerror in a headless environment
+ preConfigure = ''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}"
+ sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt
+ sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt
+ find . -name "CMakeLists.txt" -exec sed -i '1iadd_compile_options($<$:-std=c++11>)' "{}" ";"
+ '';
+
+ # Framework path needed for qwt6_qt4 but not qwt5
+ cmakeFlags =
+ stdenv.lib.optionals stdenv.isDarwin [ "-DCMAKE_FRAMEWORK_PATH=${qwt}/lib" ];
+
# - Ensure we get an interactive backend for matplotlib. If not the gr_plot_*
# programs will not display anything. Yes, $MATPLOTLIBRC must point to the
# *dirname* where matplotlibrc is located, not the file itself.
# - GNU Radio core is C++ but the user interface (GUI and API) is Python, so
# we must wrap the stuff in bin/.
+ # Notes:
+ # - May want to use makeWrapper instead of wrapProgram
+ # - may want to change interpreter path on Python examples instead of wrapping
+ # - see https://github.com/NixOS/nixpkgs/issues/22688 regarding use of --prefix / python.withPackages
+ # - see https://github.com/NixOS/nixpkgs/issues/24693 regarding use of DYLD_FRAMEWORK_PATH on Darwin
postInstall = ''
printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc"
for file in $(find $out/bin $out/share/gnuradio/examples -type f -executable); do
wrapProgram "$file" \
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
- --set MATPLOTLIBRC "$out/share/gnuradio"
+ --set MATPLOTLIBRC "$out/share/gnuradio" \
+ ${stdenv.lib.optionalString stdenv.isDarwin "--set DYLD_FRAMEWORK_PATH /System/Library/Frameworks"}
done
'';
@@ -80,7 +114,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://www.gnuradio.org;
license = licenses.gpl3;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ bjornfor fpletz ];
};
}
diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix
index db2b453913f4..ffed3da03187 100644
--- a/pkgs/applications/misc/gnuradio/wrapper.nix
+++ b/pkgs/applications/misc/gnuradio/wrapper.nix
@@ -1,7 +1,6 @@
-{ stdenv, gnuradio, makeWrapper, python
-, extraPackages ? [] }:
+{ stdenv, gnuradio, makeWrapper, python, extraPackages ? [] }:
-with stdenv.lib;
+with { inherit (stdenv.lib) appendToName makeSearchPath; };
stdenv.mkDerivation {
name = (appendToName "with-packages" gnuradio).name;
@@ -11,13 +10,15 @@ stdenv.mkDerivation {
mkdir -p $out/bin
ln -s "${gnuradio}"/bin/* $out/bin/
- for file in $(find $out/bin -type f -executable); do
- wrapProgram "$file" \
- --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
- (map (path: "$(toPythonPath ${path})") extraPackages)} \
- --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages}
+ for file in $(find -L $out/bin -type f); do
+ if test -x "$(readlink -f "$file")"; then
+ wrapProgram "$file" \
+ --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
+ (map (path: "$(toPythonPath ${path})") extraPackages)} \
+ --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages}
+ fi
done
-
'';
+
inherit (gnuradio) meta;
}
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 358d9dff44a6..efd3bfe73dd9 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
+
+ # RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'
+ enableParallelBuilding = false;
+
meta = {
description = "Performance software for cyclists, runners and triathletes";
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index df8cb71d6f9e..f8ba66c4197c 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv
+{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv
, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
, zlib, fontconfig, dpkg }:
@@ -6,7 +6,7 @@ let
arch =
if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "i686-linux" then "i386"
- else abort "Unsupported architecture";
+ else throw "Unsupported system ${stdenv.system}";
sha256 =
if arch == "amd64"
then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"
@@ -19,7 +19,7 @@ let
libICE
libXi
libXv
- mesa
+ libGLU_combined
libXrender
libXrandr
libXfixes
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 026457fb8571..3b8b08c1b660 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, python}:
stdenv.mkDerivation rec {
- version = "3.3";
+ version = "3.5";
name = "googler-${version}";
src = fetchFromGitHub {
owner = "jarun";
repo = "googler";
rev = "v${version}";
- sha256 = "0gkzgcf0qss7fskgswryk835vivlv1f99ym1pbxy3vv9wcwx6a43";
+ sha256 = "0z5cngg1kr3b484zddqlg9yn7crbmnd78pdb8vzd32mkp3fahcxa";
};
propagatedBuildInputs = [ python ];
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index 8936d3f222f3..464e0ba53346 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation {
prePatch = ''
sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
'';
+
+ patches = [ ./pointer_int_comparison.patch ];
+ patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol
meta = with stdenv.lib; {
description = "Open Street Map viewer";
diff --git a/pkgs/applications/misc/gosmore/pointer_int_comparison.patch b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch
new file mode 100644
index 000000000000..4a715b6d8591
--- /dev/null
+++ b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch
@@ -0,0 +1,11 @@
+--- blah_/jni/gosmore.cpp 1970-01-01 01:00:01.000000000 +0100
++++ /dev/stdin 2018-03-18 00:21:08.474217132 +0100
+@@ -1273,7 +1273,7 @@
+ if (deg[i] < -180 || deg[i] > 180) break;
+ if (i == 0 && (strncasecmp (t, "lat", 3) == 0 ||
+ strncasecmp (t, "lon", 3) == 0)) { // lat=-25.7 lon=28.2
+- for (t += 3; t != '\0' && !isalnum (*t); t++) {}
++ for (t += 3; *t != '\0' && !isalnum (*t); t++) {}
+ }
+ if (i == 1) { // Success !
+ //printf ("%lf %lf %u\n", deg[lonFirst ? 1 : 0], deg[lonFirst ? 0 : 1],
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 46278f42e7bb..77e7b592f647 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "gphoto2-2.5.11";
+ name = "gphoto2-2.5.15";
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
- sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r";
+ sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf";
};
nativeBuildInputs = [ pkgconfig gettext libtool ];
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix
index a7485c4ee681..1810d6d5c476 100644
--- a/pkgs/applications/misc/gpx-viewer/default.nix
+++ b/pkgs/applications/misc/gpx-viewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }:
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "gpx-viewer-${version}";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
intltool pkgconfig
- shared_mime_info # For update-mime-database
- desktop_file_utils # For update-desktop-database
+ shared-mime-info # For update-mime-database
+ desktop-file-utils # For update-desktop-database
wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
];
buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ];
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 00735624ad96..d87ac459d021 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "gpxsee-${version}";
- version = "4.14";
+ version = "4.19";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "0yv3hcs5b8a88mp24h8r2sn69phwrahdff5pp74lz24270il3jgb";
+ sha256 = "1xjf2aawf633c1ydhpcsjhdlfkjkfsjbcgjd737xpfv1wjz99l4l";
};
nativeBuildInputs = [ qmake qttools ];
@@ -26,11 +26,14 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://tumic.wz.cz/gpxsee;
+ homepage = http://www.gpxsee.org/;
description = "GPX viewer and analyzer";
+ longDescription = ''
+ GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX,
+ TCX, KML, FIT, IGC and NMEA files.
+ '';
license = licenses.gpl3;
maintainers = [ maintainers.womfoo ];
platforms = platforms.linux;
};
-
}
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 27bda1e20928..b376e8283a2b 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
name = "gqrx-${version}";
- version = "2.8";
+ version = "2.11.1";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
- sha256 = "0niy4c05886mhbfmix93j2bnj4kzdh9bvrmymawl6z28glyz5d3c";
+ sha256 = "06l90m3lx05290lvgghrgqrcg6732p69dvv3bsyw7cyxy3fvdhm6";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 8b66b23df01a..9b8628d15270 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool,
- pango, gsettings_desktop_schemas,
+ pango, gsettings-desktop-schemas,
# Optional packages:
enableOSM ? true, osm-gps-map
}:
@@ -7,7 +7,7 @@
let
inherit (pythonPackages) python buildPythonApplication;
in buildPythonApplication rec {
- version = "4.2.6";
+ version = "4.2.8";
name = "gramps-${version}";
buildInputs = [ intltool gtk3 ]
@@ -22,7 +22,7 @@ in buildPythonApplication rec {
owner = "gramps-project";
repo = "gramps";
rev = "v${version}";
- sha256 = "0k0bx6msc2kvkg0nwa9v2mp3qy7lmnxjd97n6a1zdzlq8yzw29f1";
+ sha256 = "17y6rjvvcz7lwjck4f5nmhnn07i9k5vzk5dp1jk7j3ldxjagscsd";
};
pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ];
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 21a551bd6314..0a2a17fc8fa0 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -17,7 +17,7 @@ with lib;
let
inherit (python2Packages) python;
- inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome_common ];
+ inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ];
pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
in stdenv.mkDerivation rec {
name = "guake-${version}";
diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix
new file mode 100644
index 000000000000..7a04bd7194f2
--- /dev/null
+++ b/pkgs/applications/misc/gutenberg/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, rustPlatform, cmake, CoreServices, cf-private }:
+
+rustPlatform.buildRustPackage rec {
+ name = "gutenberg-${version}";
+ version = "0.3.1";
+
+ src = fetchFromGitHub {
+ owner = "Keats";
+ repo = "gutenberg";
+ rev = "v${version}";
+ sha256 = "03zhbwxp4dbqydiydx0hpp3vpg769zzn5i95h2sl868mpfia8gyd";
+ };
+
+ cargoSha256 = "0441lbmxx16aar6fn651ihk3psrx0lk3qdbbyih05xjlkkbk1qxs";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];
+
+ postInstall = ''
+ install -D -m 444 completions/gutenberg.bash \
+ -t $out/share/bash-completion/completions
+ install -D -m 444 completions/_gutenberg \
+ -t $out/share/zsh/site-functions
+ install -D -m 444 completions/gutenberg.fish \
+ -t $out/share/fish/vendor_completions.d
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An opinionated static site generator with everything built-in";
+ homepage = https://www.getgutenberg.io;
+ license = licenses.mit;
+ maintainers = [];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index 51a14fb20d0b..105f7beb98fe 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome_doc_utils
-, intltool, dbus_glib, gnome_python, dbus
-, hicolor_icon_theme
+{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils
+, intltool, dbus-glib, gnome_python, dbus
+, hicolor-icon-theme
}:
# TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
};
buildInputs = [
- docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme
+ docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme
];
propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index dc771fc2d5e4..b37a6ad732fe 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python }:
-pythonPackages.buildPythonApplication rec {
- version = "0.4.2";
- name = "haxor-news-${version}";
+with python.pkgs;
- src = fetchurl {
- url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz";
- sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs";
+buildPythonApplication rec {
+ pname = "haxor-news";
+ version = "0.4.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88";
};
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = [
click
colorama
requests
@@ -18,6 +20,14 @@ pythonPackages.buildPythonApplication rec {
six
];
+ doCheck = false;
+
+ checkInputs = [ mock ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover -s tests -v
+ '';
+
meta = with stdenv.lib; {
homepage = https://github.com/donnemartin/haxor-news;
description = "Browse Hacker News like a haxor";
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index b3ce98895e6f..097386547f57 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -1,11 +1,11 @@
-{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }:
+{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }:
let
ld_library_path = builtins.concatStringsSep ":" [
"${stdenv.cc.cc.lib}/lib64"
"/run/opengl-driver/lib"
(stdenv.lib.makeLibraryPath [
- mesa_glu
+ libGLU
xorg.libXmu
xorg.libXi
xorg.libXext
@@ -29,11 +29,11 @@ let
license_dir = "~/.config/houdini";
in
stdenv.mkDerivation rec {
- version = "16.0.671";
+ version = "16.5.405";
name = "houdini-runtime-${version}";
src = requireFile rec {
name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz";
- sha256 = "1d3c1a1128szlgaf3ilw5y20plz5azwp37v0ljawgm80y64hq15r";
+ sha256 = "14i0kzv881jqd5z9jshri1fxxi3pkxdmi5l4p2b51c9i3apsxmw6";
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:
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index 3c4f409d18f1..6b62b418d786 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -1,15 +1,12 @@
{ stdenv, fetchurl, readline, ncurses }:
-let
- version = "1.23";
-in
stdenv.mkDerivation rec {
-
- name = "hstr-${version}";
+ name = "hstr-${version}";
+ version = "1.24";
src = fetchurl {
url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
- sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv";
+ sha256 = "0w8is777fwq6r17zhl9xwrv9f7vanllzjiasx1pg6pxvppq7rh0x";
};
buildInputs = [ readline ncurses ];
diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix
index 91cf494d2574..2b6e58a6ab36 100644
--- a/pkgs/applications/misc/hubstaff/default.nix
+++ b/pkgs/applications/misc/hubstaff/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE, libXext
-, freetype, libXrender, fontconfig, libXft, libXinerama, libnotify, glib
-, gtk3, libappindicator-gtk3, curl }:
+{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE
+, libXext , freetype, libXrender, fontconfig, libXft, libXinerama
+, libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3
+, curl }:
let
- version = "1.2.14-36df5e3";
+ version = "1.3.1-ff75f26";
rpath = stdenv.lib.makeLibraryPath
[ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3
- curl ];
+ curl libXfixes libXScrnSaver ];
in
@@ -18,16 +19,16 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh";
- sha256 = "0yzhxk9zppj94llnf8naa6ca61f7c8jaj6b1m25zffnnz37m1sdb";
+ sha256 = "0jm5l34r6lkfkg8vsdfqbr0axngxznhagwcl9y184lnyji91fmdl";
};
nativeBuildInputs = [ unzip makeWrapper ];
unpackCmd = ''
# MojoSetups have a ZIP file at the end. ZIP’s magic string is
- # most often PK\x03\x04. This *should* work for future updates,
+ # most often PK\x03\x04. This has worked for all past updates,
# but feel free to come up with something more reasonable.
- dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text $'PK\x03\x04' $curSrc | cut -d: -f1)
+ dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text ''$'PK\x03\x04' $curSrc | cut -d: -f1)
dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null
unzip -q data.zip "data/*"
rm data.zip
@@ -38,17 +39,18 @@ stdenv.mkDerivation {
installPhase = ''
# TODO: handle 32-bit arch?
rm -r x86
+ rm -r x86_64/lib64
opt=$out/opt/hubstaff
mkdir -p $out/bin $opt
cp -r . $opt/
- prog=$opt/x86_64/HubstaffClient.bin.x86_64
+ for f in "$opt/x86_64/"*.bin.x86_64 ; do
+ patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $f
+ wrapProgram $f --prefix LD_LIBRARY_PATH : ${rpath}
+ done
- patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $prog
- wrapProgram $prog --prefix LD_LIBRARY_PATH : ${rpath}
-
- ln -s $prog $out/bin/HubstaffClient
+ ln -s $opt/x86_64/HubstaffClient.bin.x86_64 $out/bin/HubstaffClient
# Why is this needed? SEGV otherwise.
ln -s $opt/data/resources $opt/x86_64/resources
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 0dfc725b9ea6..f984cb712c7a 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,23 +2,23 @@
buildGoPackage rec {
name = "hugo-${version}";
- version = "0.29";
+ version = "0.36.1";
goPackagePath = "github.com/gohugoio/hugo";
src = fetchFromGitHub {
- owner = "gohugoio";
- repo = "hugo";
- rev = "v${version}";
- sha256 = "1vklws05534ig9rj55cqnxpqfsvns64kfdg6zjyrcpz7l0z07a33";
+ owner = "gohugoio";
+ repo = "hugo";
+ rev = "v${version}";
+ sha256 = "179lzkd6f81rssgcwlngx2mhr9nvbj0rsh6yjbf1fsrpxfzr2q9z";
};
goDeps = ./deps.nix;
- meta = {
+ meta = with stdenv.lib; {
description = "A fast and modern static website engine.";
homepage = https://gohugo.io;
- maintainers = with stdenv.lib.maintainers; [ schneefux ];
- license = stdenv.lib.licenses.asl20;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ schneefux ];
};
}
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 35faf6b57047..cf55ef4b64b2 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -1,3 +1,4 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/BurntSushi/toml";
@@ -13,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/PuerkitoBio/purell";
- rev = "b938d81255b5473c57635324295cb0fe398c7a58";
- sha256 = "0d44lrg04g9nibhdlagwq9n8g5ka1784pm0jzyl6cfpq8nc1ppj8";
+ rev = "1c4bec281e4bbc75b4f4a1bd923bdf1bd989a969";
+ sha256 = "05aif0xf3i6j6r0ivas8ywagkz92iynsa0xnkbrif4w1chzalx0f";
};
}
{
@@ -22,8 +23,8 @@
fetch = {
type = "git";
url = "https://github.com/PuerkitoBio/urlesc";
- rev = "bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5";
- sha256 = "13r896yy71i6jj1cwv2pjp53wjfxkg7bh884fggv6y79ly0qr63j";
+ rev = "de5bf2ad457846296e2031421a34e2568e304e35";
+ sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
};
}
{
@@ -31,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/alecthomas/chroma";
- rev = "b0295f66bdb7c61d54906003d7649185794e21b4";
- sha256 = "1hnvv13nphbzr9xm21fys7lgm0kd6qlbk58vc8fi802lxzsfmdis";
+ rev = "df4ec264daccb2ecb17bde9134830100701199c5";
+ sha256 = "1snw7byfkfvvw0579jc0yxk79j1v1rb0jdcvivfsalh064zmjdvd";
};
}
{
@@ -49,8 +50,8 @@
fetch = {
type = "git";
url = "https://github.com/chaseadamsio/goorgeous";
- rev = "098da33fde5f9220736531b3cb26a2dec86a8367";
- sha256 = "1cwag5vzgrzy22rvcp12whzgqbgrmdmaxar0fl4nwqxdhy90s67k";
+ rev = "dcf1ef873b8987bf12596fe6951c48347986eb2f";
+ sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb";
};
}
{
@@ -58,8 +59,8 @@
fetch = {
type = "git";
url = "https://github.com/cpuguy83/go-md2man";
- rev = "23709d0847197db6021a51fdb193e66e9222d4e7";
- sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f";
+ rev = "48d8747a2ca13185e7cc8efe6e9fc196a83f71a5";
+ sha256 = "01hpll16rvxhnvv35vs3z8p51x54c5jyl1gjdm0g7kwfwp2chvjx";
};
}
{
@@ -72,12 +73,12 @@
};
}
{
- goPackagePath = "github.com/dchest/cssmin";
+ goPackagePath = "github.com/disintegration/imaging";
fetch = {
type = "git";
- url = "https://github.com/dchest/cssmin";
- rev = "fb8d9b44afdc258bfff6052d3667521babcb2239";
- sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s";
+ url = "https://github.com/disintegration/imaging";
+ rev = "1884593a19ddc6f2ea050403430d02c1d0fc1283";
+ sha256 = "13wlkidihz7gc36hd1vy7i81d0v1rbnw97118z3slq1kv1j56zll";
};
}
{
@@ -85,8 +86,8 @@
fetch = {
type = "git";
url = "https://github.com/dlclark/regexp2";
- rev = "487489b64fb796de2e55f4e8a4ad1e145f80e957";
- sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5";
+ rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1";
+ sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2";
};
}
{
@@ -94,17 +95,8 @@
fetch = {
type = "git";
url = "https://github.com/eknkc/amber";
- rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448";
- sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a";
- };
- }
- {
- goPackagePath = "github.com/fortytw2/leaktest";
- fetch = {
- type = "git";
- url = "https://github.com/fortytw2/leaktest";
- rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513";
- sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz";
+ rev = "cdade1c073850f4ffc70a829e31235ea6892853b";
+ sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
};
}
{
@@ -112,8 +104,26 @@
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
- rev = "4da3e2cfbabc9f751898f250b49f2439785783a1";
- sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3";
+ rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/gobuffalo/envy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gobuffalo/envy";
+ rev = "50fabbbaf1e65fc9b739f37a00590c396485d84d";
+ sha256 = "0js2hggb1gybk28pk3hcsb1m6rswfdzvvr194z4my4za09ly5jax";
+ };
+ }
+ {
+ goPackagePath = "github.com/gobwas/glob";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gobwas/glob";
+ rev = "19c076cdf202b3d1c0489bdfa2f2f289f634474b";
+ sha256 = "0176psz3m0pks0ka6pb62g7ccq5izzj0i7c0j20lb7dp3kawphxs";
};
}
{
@@ -121,8 +131,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
- rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf";
- sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi";
+ rev = "f37d1588608ec036fa9b0b7b8afbde47dc06aea9";
+ sha256 = "1y0z7k4yi8aaw6yjm8s92hvbkyc51b5azpiywminjj1a84czvzvq";
};
}
{
@@ -130,8 +140,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-immutable-radix";
- rev = "8aac2701530899b64bdea735a1de8da899815220";
- sha256 = "032w4pk4gd5lwwgnvhh52xnrgyp7lgmlxsfs47gnxkgkya1x7lw6";
+ rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf";
+ sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv";
};
}
{
@@ -139,8 +149,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/golang-lru";
- rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
- sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
+ rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3";
+ sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2";
};
}
{
@@ -148,17 +158,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
- rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
- sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
- sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
+ sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
};
}
{
@@ -166,17 +167,17 @@
fetch = {
type = "git";
url = "https://github.com/jdkato/prose";
- rev = "c24611cae00c16858e611ef77226dd2f7502759f";
- sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1";
+ rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be";
+ sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7";
};
}
{
- goPackagePath = "github.com/kardianos/osext";
+ goPackagePath = "github.com/joho/godotenv";
fetch = {
type = "git";
- url = "https://github.com/kardianos/osext";
- rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
- sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
+ url = "https://github.com/joho/godotenv";
+ rev = "6bb08516677f8c8274c557fc801bee9ab564ab2c";
+ sha256 = "0jqczq5x5zwgs29vrmq87335c99gi5jrvxkwcpidz98yqg95db4f";
};
}
{
@@ -184,8 +185,8 @@
fetch = {
type = "git";
url = "https://github.com/kyokomi/emoji";
- rev = "ddd4753eac3f6480ca86b16cc6c98d26a0935d17";
- sha256 = "16vnpj8zxg3gg9ljwmvrlmdf4dqbxjagi8mldpq1cr481r35dsqh";
+ rev = "2e9a9507333f3ee28f3fab88c2c3aba34455d734";
+ sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a";
};
}
{
@@ -193,8 +194,8 @@
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
- rev = "be5ece7dd465ab0765a9682137865547526d1dfb";
- sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8";
+ rev = "2c9e9502788518c97fe44e8955cd069417ee89df";
+ sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl";
};
}
{
@@ -202,8 +203,17 @@
fetch = {
type = "git";
url = "https://github.com/markbates/inflect";
- rev = "6cacb66d100482ef7cc366289ccb156020e57e76";
- sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2";
+ rev = "80fa1ea41b0dc859816314ab0b85f07a6bc57923";
+ sha256 = "0fmpfcz8g0qsb6h94yqpcms2bdb68qac706b54x0k1crfzl1d1mj";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
+ sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
};
}
{
@@ -211,8 +221,17 @@
fetch = {
type = "git";
url = "https://github.com/miekg/mmark";
- rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f";
- sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
+ rev = "057eb9e3ae87944c038036d046101dec0c56e21f";
+ sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
+ sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
};
}
{
@@ -220,8 +239,17 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
- rev = "d0303fe809921458f417bcf828397a65db30a7e4";
- sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
+ rev = "00c29f56e2386353d58c599509e8dc3801b0d716";
+ sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
+ };
+ }
+ {
+ goPackagePath = "github.com/muesli/smartcrop";
+ fetch = {
+ type = "git";
+ url = "https://github.com/muesli/smartcrop";
+ rev = "c2a0373a193bac1daf8b6691e2ece069c5d7ac7f";
+ sha256 = "1jv68g9wddm2a1kf838anjnr4w17k7sqzz01h4z2lfashw3nanar";
};
}
{
@@ -229,8 +257,17 @@
fetch = {
type = "git";
url = "https://github.com/nicksnyder/go-i18n";
- rev = "3e70a1a463008cea6726380c908b1a6a8bdf7b24";
- sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i";
+ rev = "ec04da47793482067e2e376d810e1622277368e4";
+ sha256 = "1c7ip5jidvssr8d4dbx9nchf99m13wblgaz630f7wm73y99dc3lr";
+ };
+ }
+ {
+ goPackagePath = "github.com/olekukonko/tablewriter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/olekukonko/tablewriter";
+ rev = "b8a9be070da40449e501c3c4730a889e42d87a9e";
+ sha256 = "1z9frlk9avqhzjv6zz2rg7mvdhzcr9acdgagblijwwkx01f02hw7";
};
}
{
@@ -238,8 +275,8 @@
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
- rev = "69d355db5304c0f7f809a2edc054553e7142f016";
- sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm";
+ rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8";
+ sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh";
};
}
{
@@ -247,8 +284,8 @@
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
- rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c";
- sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4";
+ rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5";
+ sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
};
}
{
@@ -256,8 +293,8 @@
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
- rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5";
- sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5";
+ rev = "86672fcb3f950f35f2e675df2240550f2a50762f";
+ sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
};
}
{
@@ -265,8 +302,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
- rev = "9be650865eab0c12963d8753212f4f9c66cdcf12";
- sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34";
+ rev = "bbf41cb36dffe15dff5bf7e18c447801e7ffe163";
+ sha256 = "19jgsm6y1yp99h0fr77rhamdsn34r8545if7y9q377l3phrz2s0l";
};
}
{
@@ -274,8 +311,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/cast";
- rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4";
- sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050";
+ rev = "8965335b8c7107321228e3e3702cab9832751bac";
+ sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
};
}
{
@@ -283,8 +320,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
- rev = "34594c771f2c18301dc152640ad40ece28795373";
- sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38";
+ rev = "be77323fc05148ef091e83b3866c0d47c8e74a8b";
+ sha256 = "0kl0psbdg8cyznwvq13sva6r4ggmhwzfxdjmkl2vqhy83xq3a6yn";
};
}
{
@@ -301,8 +338,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
- rev = "0efa5202c04663c757d84f90f5219c1250baf94f";
- sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs";
+ rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
+ sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
};
}
{
@@ -319,8 +356,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
- rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
- sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
+ rev = "ee5fd03fd6acfd43e44aea0b4135958546ed8e73";
+ sha256 = "1fgb1ph3vrqcpdvypp3c1fwj15r587l9yvv5wqcq08shln5rbsnk";
};
}
{
@@ -328,17 +365,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
- rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7";
- sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "05e8a0eda380579888eb53c394909df027f06991";
- sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv";
+ rev = "aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5";
+ sha256 = "089balmspfs2x68wr4riwh7qvhf0b061wqqqfw8j4p9pxvwrxsdc";
};
}
{
@@ -355,8 +383,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
- rev = "426cfd8eeb6e08ab1932954e09e3c2cb2bc6e36d";
- sha256 = "0zbqvkn7amq9bnq38pxjqyn1xggphrisaw98x7diw3i0a5phk93r";
+ rev = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7";
+ sha256 = "017xpcshrj1r2w20xvpcx0rklpfmbz6h16msv12l3x0w6vy0800s";
};
}
{
@@ -364,8 +392,17 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f";
- sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k";
+ rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb";
+ sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5";
+ sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836";
};
}
{
@@ -373,8 +410,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695";
- sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n";
+ rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd";
+ sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
};
}
{
@@ -382,8 +419,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720";
- sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1";
+ rev = "9e2b64d659da1afe07ce1c9c1dfefc09d188f21e";
+ sha256 = "00ichxdybvs76gj805j828qxg7x4h4v64pq1s56ydaw07ja6lmry";
};
}
{
@@ -391,8 +428,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b";
- sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
+ rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4";
+ sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
};
}
]
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix
new file mode 100644
index 000000000000..2295e15cc3d3
--- /dev/null
+++ b/pkgs/applications/misc/icesl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }:
+let
+ lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ];
+in
+stdenv.mkDerivation rec {
+ name = "iceSL-${version}";
+ version = "2.1.10";
+
+ src = if stdenv.system == "x86_64-linux" then fetchzip {
+ url = "https://gforge.inria.fr/frs/download.php/file/37268/icesl${version}-amd64.zip";
+ sha256 = "0dv3mq6wy46xk9blzzmgbdxpsjdaxid3zadfrysxlhmgl7zb2cn2";
+ } else if stdenv.system == "i686-linux" then fetchzip {
+ url = "https://gforge.inria.fr/frs/download.php/file/37267/icesl${version}-i386.zip";
+ sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr";
+ } else throw "Unsupported architecture";
+
+ buildInputs = [ makeWrapper ];
+ installPhase = ''
+ cp -r ./ $out
+ mkdir $out/oldbin
+ mv $out/bin/IceSL-slicer $out/oldbin/IceSL-slicer
+ runHook postInstall
+ '';
+
+ postInstall = ''
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${lpath}" \
+ $out/oldbin/IceSL-slicer
+ makeWrapper $out/oldbin/IceSL-slicer $out/bin/icesl --prefix PATH : ${dialog}/bin
+ '';
+
+ meta = with lib; {
+ description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing.";
+ homepage = http://shapeforge.loria.fr/icesl/index.html;
+ license = licenses.inria-icesl;
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ maintainers = with maintainers; [ mgttlinger ];
+ };
+}
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
index af67db3f654a..2efd0ee969f1 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -2,12 +2,13 @@
stdenv.mkDerivation rec {
name = "ipmicfg-${version}";
- version = "1.27.0";
- buildVersion = "170620";
+ version = "1.27.1";
+ buildVersion = "170901";
src = fetchzip {
url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip";
- sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5";
+ sha256 = "11xhzw36pg4has8857pypf44cni8m2mg8qsqi1s4bfjbxlfgxgwk";
+ extraPostFetch = "chmod u+rwX,go-rwx+X $out/";
};
installPhase = ''
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index f90784759941..ebc13766cccb 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc }:
+{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }:
assert stdenv.isLinux;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildPhase = with xorg; ''
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so
- patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so
+ patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws
patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
'';
diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
index 9896fd15b85c..f24951624c58 100644
--- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix
+++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "j4-dmenu-desktop-${version}";
- version = "2.15";
+ version = "2.16";
src = fetchFromGitHub {
owner = "enkore";
repo = "j4-dmenu-desktop";
rev = "r${version}";
- sha256 = "1yn45i3hpim2hriaqkq7wmawwsmkynvy2xgz7dg6p5r0ikw5bn1r";
+ sha256 = "0714cri8bwpimmiirhzrkbri4xi24k0za6i1aw94d3fnblk2dg9f";
};
postPatch = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "A wrapper for dmenu that recognize .desktop files";
homepage = "https://github.com/enkore/j4-dmenu-desktop";
license = licenses.gpl3;
- maintainer = with maintainers; [ ericsagnes ];
- platforms = with platforms; unix;
+ maintainers = with maintainers; [ ericsagnes ];
+ platforms = with platforms; unix;
};
}
diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile
deleted file mode 100644
index 97ebb9705bd6..000000000000
--- a/pkgs/applications/misc/jekyll/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-gem 'jekyll'
-gem 'jekyll-feed'
-gem 'jekyll-paginate'
-gem 'rdiscount'
-gem 'RedCloth'
-gem 'minima'
diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock
deleted file mode 100644
index da4be83382fb..000000000000
--- a/pkgs/applications/misc/jekyll/Gemfile.lock
+++ /dev/null
@@ -1,59 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- RedCloth (4.3.2)
- addressable (2.5.0)
- public_suffix (~> 2.0, >= 2.0.2)
- colorator (1.1.0)
- ffi (1.9.18)
- forwardable-extended (2.6.0)
- jekyll (3.4.1)
- addressable (~> 2.4)
- colorator (~> 1.0)
- jekyll-sass-converter (~> 1.0)
- jekyll-watch (~> 1.1)
- kramdown (~> 1.3)
- liquid (~> 3.0)
- mercenary (~> 0.3.3)
- pathutil (~> 0.9)
- rouge (~> 1.7)
- safe_yaml (~> 1.0)
- jekyll-feed (0.9.1)
- jekyll (~> 3.3)
- jekyll-paginate (1.1.0)
- jekyll-sass-converter (1.5.0)
- sass (~> 3.4)
- jekyll-watch (1.5.0)
- listen (~> 3.0, < 3.1)
- kramdown (1.13.2)
- liquid (3.0.6)
- listen (3.0.8)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- mercenary (0.3.6)
- minima (2.1.0)
- jekyll (~> 3.3)
- pathutil (0.14.0)
- forwardable-extended (~> 2.6)
- public_suffix (2.0.5)
- rb-fsevent (0.9.8)
- rb-inotify (0.9.8)
- ffi (>= 0.5.0)
- rdiscount (2.2.0.1)
- rouge (1.11.1)
- safe_yaml (1.0.4)
- sass (3.4.23)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- RedCloth
- jekyll
- jekyll-feed
- jekyll-paginate
- minima
- rdiscount
-
-BUNDLED WITH
- 1.14.4
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile b/pkgs/applications/misc/jekyll/basic/Gemfile
new file mode 100644
index 000000000000..2d3446a81134
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile
@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+gem "jekyll"
+# jekyll alone might be enough for most use-cases
+gem "rouge"
+gem "activesupport", "~> 4.2"
+gem "jekyll-avatar"
+gem "jekyll-mentions"
+gem "jekyll-seo-tag"
+gem "jekyll-sitemap"
+gem "jemoji"
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
new file mode 100644
index 000000000000..d18546cb36f8
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -0,0 +1,101 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ activesupport (4.2.10)
+ i18n (~> 0.7)
+ minitest (~> 5.1)
+ thread_safe (~> 0.3, >= 0.3.4)
+ tzinfo (~> 1.1)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
+ colorator (1.1.0)
+ concurrent-ruby (1.0.5)
+ em-websocket (0.5.1)
+ eventmachine (>= 0.12.9)
+ http_parser.rb (~> 0.6.0)
+ eventmachine (1.2.5)
+ ffi (1.9.23)
+ forwardable-extended (2.6.0)
+ gemoji (3.0.0)
+ html-pipeline (2.7.1)
+ activesupport (>= 2)
+ nokogiri (>= 1.4)
+ http_parser.rb (0.6.0)
+ i18n (0.9.5)
+ concurrent-ruby (~> 1.0)
+ jekyll (3.7.3)
+ addressable (~> 2.4)
+ colorator (~> 1.0)
+ em-websocket (~> 0.5)
+ i18n (~> 0.7)
+ jekyll-sass-converter (~> 1.0)
+ jekyll-watch (~> 2.0)
+ kramdown (~> 1.14)
+ liquid (~> 4.0)
+ mercenary (~> 0.3.3)
+ pathutil (~> 0.9)
+ rouge (>= 1.7, < 4)
+ safe_yaml (~> 1.0)
+ jekyll-avatar (0.5.0)
+ jekyll (~> 3.0)
+ jekyll-mentions (1.2.0)
+ activesupport (~> 4.0)
+ html-pipeline (~> 2.3)
+ jekyll (~> 3.0)
+ jekyll-sass-converter (1.5.2)
+ sass (~> 3.4)
+ jekyll-seo-tag (2.4.0)
+ jekyll (~> 3.3)
+ jekyll-sitemap (1.2.0)
+ jekyll (~> 3.3)
+ jekyll-watch (2.0.0)
+ listen (~> 3.0)
+ jemoji (0.9.0)
+ activesupport (~> 4.0, >= 4.2.9)
+ gemoji (~> 3.0)
+ html-pipeline (~> 2.2)
+ jekyll (~> 3.0)
+ kramdown (1.16.2)
+ liquid (4.0.0)
+ listen (3.1.5)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ ruby_dep (~> 1.2)
+ mercenary (0.3.6)
+ mini_portile2 (2.3.0)
+ minitest (5.11.3)
+ nokogiri (1.8.2)
+ mini_portile2 (~> 2.3.0)
+ pathutil (0.16.1)
+ forwardable-extended (~> 2.6)
+ public_suffix (3.0.2)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ rouge (3.1.1)
+ ruby_dep (1.5.0)
+ safe_yaml (1.0.4)
+ sass (3.5.5)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ thread_safe (0.3.6)
+ tzinfo (1.2.5)
+ thread_safe (~> 0.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ activesupport (~> 4.2)
+ jekyll
+ jekyll-avatar
+ jekyll-mentions
+ jekyll-seo-tag
+ jekyll-sitemap
+ jemoji
+ rouge
+
+BUNDLED WITH
+ 1.14.6
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
new file mode 100644
index 000000000000..b5b21dec4382
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -0,0 +1,326 @@
+{
+ activesupport = {
+ dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7";
+ type = "gem";
+ };
+ version = "4.2.10";
+ };
+ addressable = {
+ dependencies = ["public_suffix"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+ type = "gem";
+ };
+ version = "2.5.2";
+ };
+ colorator = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ concurrent-ruby = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+ type = "gem";
+ };
+ version = "1.0.5";
+ };
+ em-websocket = {
+ dependencies = ["eventmachine" "http_parser.rb"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3";
+ type = "gem";
+ };
+ version = "0.5.1";
+ };
+ eventmachine = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z";
+ type = "gem";
+ };
+ version = "1.2.5";
+ };
+ ffi = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+ type = "gem";
+ };
+ version = "1.9.23";
+ };
+ forwardable-extended = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v";
+ type = "gem";
+ };
+ version = "2.6.0";
+ };
+ gemoji = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
+ html-pipeline = {
+ dependencies = ["activesupport" "nokogiri"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd";
+ type = "gem";
+ };
+ version = "2.7.1";
+ };
+ "http_parser.rb" = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
+ i18n = {
+ dependencies = ["concurrent-ruby"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+ type = "gem";
+ };
+ version = "0.9.5";
+ };
+ jekyll = {
+ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff";
+ type = "gem";
+ };
+ version = "3.7.3";
+ };
+ jekyll-avatar = {
+ dependencies = ["jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf";
+ type = "gem";
+ };
+ version = "0.5.0";
+ };
+ jekyll-mentions = {
+ dependencies = ["activesupport" "html-pipeline" "jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ jekyll-sass-converter = {
+ dependencies = ["sass"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
+ jekyll-seo-tag = {
+ dependencies = ["jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f9b2mvmx57zj49afb3x8cmzdmb1kh4rbpbv3v7w5bh47g2c9big";
+ type = "gem";
+ };
+ version = "2.4.0";
+ };
+ jekyll-sitemap = {
+ dependencies = ["jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xy93ysl1q8r4xhbnffycvsslja0dskh2z2pl1jnykwsy27dc89n";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ jekyll-watch = {
+ dependencies = ["listen"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ jemoji = {
+ dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b";
+ type = "gem";
+ };
+ version = "0.9.0";
+ };
+ kramdown = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za";
+ type = "gem";
+ };
+ version = "1.16.2";
+ };
+ liquid = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y";
+ type = "gem";
+ };
+ version = "4.0.0";
+ };
+ listen = {
+ dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
+ type = "gem";
+ };
+ version = "3.1.5";
+ };
+ mercenary = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
+ type = "gem";
+ };
+ version = "0.3.6";
+ };
+ mini_portile2 = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ type = "gem";
+ };
+ version = "2.3.0";
+ };
+ minitest = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+ type = "gem";
+ };
+ version = "5.11.3";
+ };
+ nokogiri = {
+ dependencies = ["mini_portile2"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+ type = "gem";
+ };
+ version = "1.8.2";
+ };
+ pathutil = {
+ dependencies = ["forwardable-extended"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz";
+ type = "gem";
+ };
+ version = "0.16.1";
+ };
+ public_suffix = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+ type = "gem";
+ };
+ version = "3.0.2";
+ };
+ rb-fsevent = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
+ type = "gem";
+ };
+ version = "0.10.2";
+ };
+ rb-inotify = {
+ dependencies = ["ffi"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+ type = "gem";
+ };
+ version = "0.9.10";
+ };
+ rouge = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3";
+ type = "gem";
+ };
+ version = "3.1.1";
+ };
+ ruby_dep = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ safe_yaml = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+ type = "gem";
+ };
+ version = "1.0.4";
+ };
+ sass = {
+ dependencies = ["sass-listen"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
+ type = "gem";
+ };
+ version = "3.5.5";
+ };
+ sass-listen = {
+ dependencies = ["rb-fsevent" "rb-inotify"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+ type = "gem";
+ };
+ version = "4.0.0";
+ };
+ 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";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index f3661030a2ba..ce3c318f6780 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -1,19 +1,36 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby
+, withOptionalDependencies ? false
+}:
+# Bundix:
+# nix-shell -p bundix zlib
bundlerEnv rec {
- name = "jekyll-${version}";
+ name = pname + "-" + version;
+ pname = "jekyll";
+ version = (import
+ (if withOptionalDependencies
+ then ./full/gemset.nix
+ else ./basic/gemset.nix))
+ .jekyll.version;
- version = (import gemset).jekyll.version;
inherit ruby;
- gemfile = ./Gemfile;
- lockfile = ./Gemfile.lock;
- gemset = ./gemset.nix;
+ gemdir = if withOptionalDependencies
+ then ./full
+ else ./basic;
meta = with lib; {
- description = "Simple, blog aware, static site generator";
- homepage = http://jekyllrb.com/;
+ description = "A blog-aware, static site generator, written in Ruby";
+ longDescription = ''
+ Jekyll is a simple, blog-aware, static site generator, written in Ruby.
+ Think of it like a file-based CMS, without all the complexity. Jekyll
+ takes your content, renders Markdown and Liquid templates, and spits out a
+ complete, static website ready to be served by Apache, Nginx or another
+ web server. Jekyll is the engine behind GitHub Pages, which you can use to
+ host sites right from your GitHub repositories.
+ '';
+ homepage = https://jekyllrb.com/;
license = licenses.mit;
- maintainers = with maintainers; [ pesterhazy ];
+ maintainers = with maintainers; [ primeos pesterhazy ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile
new file mode 100644
index 000000000000..aba5e06e3769
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/full/Gemfile
@@ -0,0 +1,30 @@
+source "https://rubygems.org"
+gem "jekyll"
+gem "rouge"
+gem "activesupport", "~> 4.2"
+gem "jekyll-avatar"
+gem "jekyll-mentions"
+gem "jekyll-seo-tag"
+gem "jekyll-sitemap"
+gem "jemoji"
+# Optional dependencies:
+gem "coderay", "~> 1.1.0"
+gem "jekyll-coffeescript"
+#gem "jekyll-docs"
+gem "jekyll-feed", "~> 0.9"
+gem "jekyll-gist"
+gem "jekyll-paginate"
+gem "jekyll-redirect-from"
+gem "kramdown", "~> 1.14"
+gem "mime-types", "~> 3.0"
+gem "rdoc", RUBY_VERSION >= "2.2.2" ? "~> 6.0" : "~> 5.1"
+gem "tomlrb", "~> 1.2"
+
+platform :ruby, :mswin, :mingw, :x64_mingw do
+ gem "classifier-reborn", "~> 2.2.0"
+ gem "liquid-c", "~> 3.0"
+ gem "pygments.rb", "~> 1.0"
+ gem "rdiscount", "~> 2.0"
+ gem "redcarpet", "~> 3.2", ">= 3.2.3"
+ gem "yajl-ruby", "~> 1.3.1"
+end
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
new file mode 100644
index 000000000000..190f1d66479d
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -0,0 +1,157 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ activesupport (4.2.10)
+ i18n (~> 0.7)
+ minitest (~> 5.1)
+ thread_safe (~> 0.3, >= 0.3.4)
+ tzinfo (~> 1.1)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
+ classifier-reborn (2.2.0)
+ fast-stemmer (~> 1.0)
+ coderay (1.1.2)
+ coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.11.1)
+ colorator (1.1.0)
+ concurrent-ruby (1.0.5)
+ em-websocket (0.5.1)
+ eventmachine (>= 0.12.9)
+ http_parser.rb (~> 0.6.0)
+ eventmachine (1.2.5)
+ execjs (2.7.0)
+ faraday (0.14.0)
+ multipart-post (>= 1.2, < 3)
+ fast-stemmer (1.0.2)
+ ffi (1.9.23)
+ forwardable-extended (2.6.0)
+ gemoji (3.0.0)
+ html-pipeline (2.7.1)
+ activesupport (>= 2)
+ nokogiri (>= 1.4)
+ http_parser.rb (0.6.0)
+ i18n (0.9.5)
+ concurrent-ruby (~> 1.0)
+ jekyll (3.7.3)
+ addressable (~> 2.4)
+ colorator (~> 1.0)
+ em-websocket (~> 0.5)
+ i18n (~> 0.7)
+ jekyll-sass-converter (~> 1.0)
+ jekyll-watch (~> 2.0)
+ kramdown (~> 1.14)
+ liquid (~> 4.0)
+ mercenary (~> 0.3.3)
+ pathutil (~> 0.9)
+ rouge (>= 1.7, < 4)
+ safe_yaml (~> 1.0)
+ jekyll-avatar (0.5.0)
+ jekyll (~> 3.0)
+ jekyll-coffeescript (1.1.1)
+ coffee-script (~> 2.2)
+ coffee-script-source (~> 1.11.1)
+ jekyll-feed (0.9.3)
+ jekyll (~> 3.3)
+ jekyll-gist (1.5.0)
+ octokit (~> 4.2)
+ jekyll-mentions (1.2.0)
+ activesupport (~> 4.0)
+ html-pipeline (~> 2.3)
+ jekyll (~> 3.0)
+ jekyll-paginate (1.1.0)
+ jekyll-redirect-from (0.13.0)
+ jekyll (~> 3.3)
+ jekyll-sass-converter (1.5.2)
+ sass (~> 3.4)
+ jekyll-seo-tag (2.4.0)
+ jekyll (~> 3.3)
+ jekyll-sitemap (1.2.0)
+ jekyll (~> 3.3)
+ jekyll-watch (2.0.0)
+ listen (~> 3.0)
+ jemoji (0.9.0)
+ activesupport (~> 4.0, >= 4.2.9)
+ gemoji (~> 3.0)
+ html-pipeline (~> 2.2)
+ jekyll (~> 3.0)
+ kramdown (1.16.2)
+ liquid (4.0.0)
+ liquid-c (3.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)
+ mercenary (0.3.6)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
+ mini_portile2 (2.3.0)
+ minitest (5.11.3)
+ multi_json (1.13.1)
+ multipart-post (2.0.0)
+ nokogiri (1.8.2)
+ mini_portile2 (~> 2.3.0)
+ octokit (4.8.0)
+ sawyer (~> 0.8.0, >= 0.5.3)
+ pathutil (0.16.1)
+ forwardable-extended (~> 2.6)
+ public_suffix (3.0.2)
+ pygments.rb (1.2.1)
+ multi_json (>= 1.0.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ rdiscount (2.2.0.1)
+ rdoc (6.0.1)
+ redcarpet (3.4.0)
+ rouge (3.1.1)
+ ruby_dep (1.5.0)
+ safe_yaml (1.0.4)
+ sass (3.5.5)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ sawyer (0.8.1)
+ addressable (>= 2.3.5, < 2.6)
+ faraday (~> 0.8, < 1.0)
+ thread_safe (0.3.6)
+ tomlrb (1.2.6)
+ tzinfo (1.2.5)
+ thread_safe (~> 0.1)
+ yajl-ruby (1.3.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ activesupport (~> 4.2)
+ classifier-reborn (~> 2.2.0)
+ coderay (~> 1.1.0)
+ jekyll
+ jekyll-avatar
+ jekyll-coffeescript
+ jekyll-feed (~> 0.9)
+ jekyll-gist
+ jekyll-mentions
+ jekyll-paginate
+ jekyll-redirect-from
+ jekyll-seo-tag
+ jekyll-sitemap
+ jemoji
+ kramdown (~> 1.14)
+ liquid-c (~> 3.0)
+ mime-types (~> 3.0)
+ pygments.rb (~> 1.0)
+ rdiscount (~> 2.0)
+ rdoc (~> 6.0)
+ redcarpet (~> 3.2, >= 3.2.3)
+ rouge
+ tomlrb (~> 1.2)
+ yajl-ruby (~> 1.3.1)
+
+BUNDLED WITH
+ 1.14.6
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
new file mode 100644
index 000000000000..3a115f8a4b0e
--- /dev/null
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -0,0 +1,538 @@
+{
+ activesupport = {
+ dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7";
+ type = "gem";
+ };
+ version = "4.2.10";
+ };
+ addressable = {
+ dependencies = ["public_suffix"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+ type = "gem";
+ };
+ version = "2.5.2";
+ };
+ classifier-reborn = {
+ dependencies = ["fast-stemmer"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04nxmm5b7j7r0ij9pcpdr7xqpig559gfzrw042ycxcfyav2pv6ij";
+ type = "gem";
+ };
+ version = "2.2.0";
+ };
+ coderay = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+ type = "gem";
+ };
+ version = "1.1.2";
+ };
+ coffee-script = {
+ dependencies = ["coffee-script-source" "execjs"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
+ type = "gem";
+ };
+ version = "2.4.1";
+ };
+ coffee-script-source = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xfshhlz808f8639wc88wgls1mww35sid8rd55vn0a4yqajf4vh9";
+ type = "gem";
+ };
+ version = "1.11.1";
+ };
+ colorator = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ concurrent-ruby = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+ type = "gem";
+ };
+ version = "1.0.5";
+ };
+ em-websocket = {
+ dependencies = ["eventmachine" "http_parser.rb"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3";
+ type = "gem";
+ };
+ version = "0.5.1";
+ };
+ eventmachine = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z";
+ type = "gem";
+ };
+ version = "1.2.5";
+ };
+ execjs = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1";
+ type = "gem";
+ };
+ version = "2.7.0";
+ };
+ faraday = {
+ dependencies = ["multipart-post"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr";
+ type = "gem";
+ };
+ version = "0.14.0";
+ };
+ fast-stemmer = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh";
+ type = "gem";
+ };
+ version = "1.0.2";
+ };
+ ffi = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+ type = "gem";
+ };
+ version = "1.9.23";
+ };
+ forwardable-extended = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v";
+ type = "gem";
+ };
+ version = "2.6.0";
+ };
+ gemoji = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
+ html-pipeline = {
+ dependencies = ["activesupport" "nokogiri"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd";
+ type = "gem";
+ };
+ version = "2.7.1";
+ };
+ "http_parser.rb" = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
+ i18n = {
+ dependencies = ["concurrent-ruby"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+ type = "gem";
+ };
+ version = "0.9.5";
+ };
+ jekyll = {
+ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff";
+ type = "gem";
+ };
+ version = "3.7.3";
+ };
+ jekyll-avatar = {
+ dependencies = ["jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf";
+ type = "gem";
+ };
+ version = "0.5.0";
+ };
+ jekyll-coffeescript = {
+ dependencies = ["coffee-script" "coffee-script-source"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06qf4j9f6ysjb4bq6gsdaiz2ksmhc5yb484v458ra3s6ybccqvvy";
+ type = "gem";
+ };
+ version = "1.1.1";
+ };
+ jekyll-feed = {
+ dependencies = ["jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0kr3kyaq4z3jixn6ay8h16bxxlv6slvvp7nqnl05jdymhkl0bmm9";
+ type = "gem";
+ };
+ version = "0.9.3";
+ };
+ jekyll-gist = {
+ dependencies = ["octokit"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03wz9j6yq3552nzf4g71qrdm9pfdgbm68abml9sjjgiaan1n8ns9";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ jekyll-mentions = {
+ dependencies = ["activesupport" "html-pipeline" "jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ jekyll-paginate = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ jekyll-redirect-from = {
+ dependencies = ["jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1crm5xqgv5asbbbaxfgky4ppib5rih59yzpa3yc94gh8b9cjixrj";
+ type = "gem";
+ };
+ version = "0.13.0";
+ };
+ jekyll-sass-converter = {
+ dependencies = ["sass"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
+ jekyll-seo-tag = {
+ dependencies = ["jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f9b2mvmx57zj49afb3x8cmzdmb1kh4rbpbv3v7w5bh47g2c9big";
+ type = "gem";
+ };
+ version = "2.4.0";
+ };
+ jekyll-sitemap = {
+ dependencies = ["jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xy93ysl1q8r4xhbnffycvsslja0dskh2z2pl1jnykwsy27dc89n";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ jekyll-watch = {
+ dependencies = ["listen"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ jemoji = {
+ dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b";
+ type = "gem";
+ };
+ version = "0.9.0";
+ };
+ kramdown = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za";
+ type = "gem";
+ };
+ version = "1.16.2";
+ };
+ liquid = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y";
+ type = "gem";
+ };
+ version = "4.0.0";
+ };
+ liquid-c = {
+ dependencies = ["liquid"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0a5n7q314ma32y7v9a1g6ps60b14zfn2q4nip4j5aknblz51v7gi";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
+ listen = {
+ dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
+ type = "gem";
+ };
+ version = "3.1.5";
+ };
+ mercenary = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
+ type = "gem";
+ };
+ version = "0.3.6";
+ };
+ mime-types = {
+ dependencies = ["mime-types-data"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
+ type = "gem";
+ };
+ version = "3.1";
+ };
+ mime-types-data = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
+ type = "gem";
+ };
+ version = "3.2016.0521";
+ };
+ mini_portile2 = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ type = "gem";
+ };
+ version = "2.3.0";
+ };
+ minitest = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+ type = "gem";
+ };
+ version = "5.11.3";
+ };
+ multi_json = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+ type = "gem";
+ };
+ version = "1.13.1";
+ };
+ multipart-post = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ nokogiri = {
+ dependencies = ["mini_portile2"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+ type = "gem";
+ };
+ version = "1.8.2";
+ };
+ octokit = {
+ dependencies = ["sawyer"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg";
+ type = "gem";
+ };
+ version = "4.8.0";
+ };
+ pathutil = {
+ dependencies = ["forwardable-extended"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz";
+ type = "gem";
+ };
+ version = "0.16.1";
+ };
+ public_suffix = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+ type = "gem";
+ };
+ version = "3.0.2";
+ };
+ "pygments.rb" = {
+ dependencies = ["multi_json"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lbvnwvz770ambm4d6lxgc2097rydn5rcc5d6986bnkzyxfqqjnv";
+ type = "gem";
+ };
+ version = "1.2.1";
+ };
+ rb-fsevent = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
+ type = "gem";
+ };
+ version = "0.10.2";
+ };
+ rb-inotify = {
+ dependencies = ["ffi"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+ type = "gem";
+ };
+ version = "0.9.10";
+ };
+ rdiscount = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3";
+ type = "gem";
+ };
+ version = "2.2.0.1";
+ };
+ rdoc = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vzhv04lp76iax258dh47zsxhjg34r9sg76vgikbyfywjzflvfyj";
+ type = "gem";
+ };
+ version = "6.0.1";
+ };
+ redcarpet = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
+ type = "gem";
+ };
+ version = "3.4.0";
+ };
+ rouge = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3";
+ type = "gem";
+ };
+ version = "3.1.1";
+ };
+ ruby_dep = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ safe_yaml = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+ type = "gem";
+ };
+ version = "1.0.4";
+ };
+ sass = {
+ dependencies = ["sass-listen"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
+ type = "gem";
+ };
+ version = "3.5.5";
+ };
+ sass-listen = {
+ dependencies = ["rb-fsevent" "rb-inotify"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+ type = "gem";
+ };
+ version = "4.0.0";
+ };
+ sawyer = {
+ dependencies = ["addressable" "faraday"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
+ type = "gem";
+ };
+ version = "0.8.1";
+ };
+ thread_safe = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+ type = "gem";
+ };
+ version = "0.3.6";
+ };
+ tomlrb = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09gh67v8s1pr7c37490sjp782gi4wf9k9cadp4l926h1sp27bcgz";
+ type = "gem";
+ };
+ version = "1.2.6";
+ };
+ tzinfo = {
+ dependencies = ["thread_safe"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+ type = "gem";
+ };
+ version = "1.2.5";
+ };
+ yajl-ruby = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rn4kc9fha990yd252wglh6rcyh35cavm1vpyfj8krlcwph09g30";
+ type = "gem";
+ };
+ version = "1.3.1";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix
deleted file mode 100644
index 5b1a35209aeb..000000000000
--- a/pkgs/applications/misc/jekyll/gemset.nix
+++ /dev/null
@@ -1,183 +0,0 @@
-{
- addressable = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
- type = "gem";
- };
- version = "2.5.0";
- };
- colorator = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72";
- type = "gem";
- };
- version = "1.1.0";
- };
- ffi = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
- type = "gem";
- };
- version = "1.9.18";
- };
- forwardable-extended = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v";
- type = "gem";
- };
- version = "2.6.0";
- };
- jekyll = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0qbnjx7bpshbcam6p9ss2g6gpd3gxz6h4w9yszphj3ip335yhawb";
- type = "gem";
- };
- version = "3.4.1";
- };
- jekyll-feed = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1dj62gy1jskkn703mi5h0bkg1psbpkdm2qqdw3bhjfid9358qvay";
- type = "gem";
- };
- version = "0.9.1";
- };
- jekyll-paginate = {
- source = {
- sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8";
- type = "gem";
- };
- version = "1.1.0";
- };
- jekyll-sass-converter = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "01m921763yfgx1gc33k5ixqz623f4c4azgnpqhgsc2q61fyfk3q1";
- type = "gem";
- };
- version = "1.5.0";
- };
- jekyll-watch = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "02rg3wi95w2l0bg1igl5k6pza723vn2b2gj975gycz1cpmhdjn6z";
- type = "gem";
- };
- version = "1.5.0";
- };
- kramdown = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1isiqc40q44zg57bd6cfnw1a2l0s2j5skw2awn2cz3gcm7wsf49d";
- type = "gem";
- };
- version = "1.13.2";
- };
- liquid = {
- source = {
- sha256 = "033png37ym4jrjz5bi7zb4ic4yxacwvnllm1xxmrnr4swgyyygc2";
- type = "gem";
- };
- version = "3.0.6";
- };
- listen = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1l0y7hbyfiwpvk172r28hsdqsifq1ls39hsfmzi1vy4ll0smd14i";
- type = "gem";
- };
- version = "3.0.8";
- };
- mercenary = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
- type = "gem";
- };
- version = "0.3.6";
- };
- minima = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1s7ks9fqfvqx7qicnkrg76wavg9mjas52f7iyhr89lz9mqiy7p39";
- type = "gem";
- };
- version = "2.1.0";
- };
- pathutil = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0f444wx6vjd30lkkb2zn1k5a6g33lidrpyy7lmgy66n1gsiipzn7";
- type = "gem";
- };
- version = "0.14.0";
- };
- public_suffix = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
- type = "gem";
- };
- version = "2.0.5";
- };
- rb-fsevent = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1pdiasp9zlr306yld19szapi6kdjk38rpv1hih9x0ry40x6mb63n";
- type = "gem";
- };
- version = "0.9.8";
- };
- rb-inotify = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0bq14f3md5nm00kgxgf0r9lcbn0vgbwljgajif0slxcwv622fjg9";
- type = "gem";
- };
- version = "0.9.8";
- };
- rdiscount = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3";
- type = "gem";
- };
- version = "2.2.0.1";
- };
- RedCloth = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy";
- type = "gem";
- };
- version = "4.3.2";
- };
- rouge = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "13amckbdknnc5491ag28y8pqbyfpbzx5n4rlmadxhd3wkrhp92c8";
- type = "gem";
- };
- version = "1.11.1";
- };
- safe_yaml = {
- source = {
- sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
- type = "gem";
- };
- version = "1.0.4";
- };
- sass = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0da4mn3n60cm1ss1pw1rrpa7fxagglxiwcgvz1asf1qgf4mvcwyr";
- type = "gem";
- };
- version = "3.4.23";
- };
-}
\ No newline at end of file
diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix
index 54a383c31c28..e87288d71287 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "jgmenu-${version}";
- version = "0.7.4";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "johanmalm";
repo = "jgmenu";
rev = "v${version}";
- sha256 = "0vim7balxrxhbgq4jvf80lbh57xbw3qmhapy7n2iyv443ih4a7hi";
+ sha256 = "0nflj4fcpz7rcd1s0zlyi5ikxjykkmz3p5w4gzica1fdbyn2l7x3";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 46263f7d83b8..a73e4820e6c5 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "josm-${version}";
- version = "13053";
+ version = "13500";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6";
+ sha256 = "1dyys4y859dazjqpn3f7vd0cpyglk82y3igrdca293y0n0hrmi7v";
};
buildInputs = [ jre8 makeWrapper ];
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 015ef8760648..1cab20baef15 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig
-, zlib, libpng
+, zlib, libpng, openjpeg
, enableGSL ? true, gsl
, enableGhostScript ? true, ghostscript
, enableMuPDF ? true, mupdf
@@ -40,11 +40,7 @@ stdenv.mkDerivation rec {
# Patches from previous 1.10a version in nixpkgs
patches = [
# Compatibility with new openjpeg
- (fetchpatch {
- name = "mupdf-1.9a-openjpeg-2.1.1.patch";
- url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099";
- sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75";
- })
+ ./load-jpx.patch
(fetchurl {
name = "CVE-2017-5896.patch";
@@ -64,6 +60,14 @@ stdenv.mkDerivation rec {
# Don't remove mujs because upstream version is incompatible
rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
'';
+ postPatch = let
+ # OpenJPEG version is hardcoded in package source
+ openJpegVersion = with stdenv;
+ lib.concatStringsSep "." (lib.lists.take 2
+ (lib.splitString "." (lib.getVersion openjpeg)));
+ in ''
+ sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
+ '';
});
leptonica_modded = leptonica.overrideAttrs (attrs: {
prePatch = ''
diff --git a/pkgs/applications/misc/k2pdfopt/load-jpx.patch b/pkgs/applications/misc/k2pdfopt/load-jpx.patch
new file mode 100644
index 000000000000..02a3799d040a
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/load-jpx.patch
@@ -0,0 +1,29 @@
+--- a/source/fitz/load-jpx.c
++++ b/source/fitz/load-jpx.c
+@@ -484,12 +484,16 @@
+ /* Without the definition of OPJ_STATIC, compilation fails on windows
+ * due to the use of __stdcall. We believe it is required on some
+ * linux toolchains too. */
++#ifdef __cplusplus
++extern "C"
++{
+ #define OPJ_STATIC
+ #ifndef _MSC_VER
+ #define OPJ_HAVE_STDINT_H
+ #endif
++#endif
+
+-#include
++#include
+
+ /* OpenJPEG does not provide a safe mechanism to intercept
+ * allocations. In the latest version all allocations go
+@@ -971,4 +975,8 @@
+ fz_drop_pixmap(ctx, img);
+ }
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* HAVE_LURATECH */
diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix
index bf1b77534ce6..ba048761367c 100644
--- a/pkgs/applications/misc/kdbplus/default.nix
+++ b/pkgs/applications/misc/kdbplus/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
message = ''
Nix can't download kdb+ for you automatically. Go to
http://kx.com and download the free, 32-bit version for
- Linux. Then run "nix-prefetch-url file:///linux.zip" in the
- directory where you saved it. Note you need version 3.3.
+ Linux. Then run "nix-prefetch-url file://\$PWD/linux.zip" in
+ the directory where you saved it. Note you need version 3.3.
'';
name = "linux.zip";
sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940";
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index a95dd6adbce6..fe2503625938 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -13,26 +13,32 @@
, libfakekey
, libXtst
, qtx11extras
+, sshfs
+, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "kdeconnect";
- version = "1.2";
+ version = "1.2.1";
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz";
- sha256 = "0w3rdldnr6md70r4ch255vk712d37vy63ml7ly2fhr4cfnk2i1ay";
+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-v${version}.tar.xz";
+ sha256 = "01v432p9ylwss9gl6fvby8954bnjd91dni5jk1i44vv7x26yn8zg";
};
buildInputs = [
libfakekey libXtst
ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications
- qca-qt5 qtx11extras
+ qca-qt5 qtx11extras makeWrapper
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ postInstall = ''
+ wrapProgram $out/lib/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]}
+ '';
+
enableParallelBuilding = true;
meta = with lib; {
diff --git a/pkgs/applications/misc/keepass-plugins/keefox/default.nix b/pkgs/applications/misc/keepass-plugins/keefox/default.nix
deleted file mode 100644
index 0215c5a71c2f..000000000000
--- a/pkgs/applications/misc/keepass-plugins/keefox/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, buildEnv, fetchurl, mono, unzip }:
-
-let
- version = "1.6.4";
- drv = stdenv.mkDerivation {
- name = "keefox-${version}";
- src = fetchurl {
- url = "https://github.com/luckyrat/KeeFox/releases/download/v${version}/${version}.xpi";
- sha256 = "0nj4l9ssyfwbl1pxgxvd2h9q0mqhx7i0yzm4a2xjqlqwam534d1w";
- };
-
- meta = {
- description = "Keepass plugin for keefox Firefox add-on";
- homepage = http://keefox.org;
- platforms = with stdenv.lib.platforms; linux;
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.mjanczyk ];
- };
-
- buildInputs = [ unzip ];
-
- pluginFilename = "KeePassRPC.plgx";
-
- unpackCmd = "unzip $src deps/$pluginFilename ";
- sourceRoot = "deps";
-
- installPhase = ''
- mkdir -p $out/lib/dotnet/keepass/
- cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename
- '';
- };
-in
- # Mono is required to compile plugin at runtime, after loading.
- buildEnv { name = drv.name; paths = [ mono drv ]; }
diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
new file mode 100644
index 000000000000..b2980bcd8aea
--- /dev/null
+++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, buildEnv, fetchurl, mono }:
+
+let
+ version = "1.7.3.1";
+ drv = stdenv.mkDerivation {
+ name = "keepassrpc-${version}";
+ src = fetchurl {
+ url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
+ sha256 = "1y9b35qg27caj3pbaqqzrqpk61hbbd8617ziwdc9vl799i786m9k";
+ };
+
+ meta = with stdenv.lib; {
+ description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords";
+ homepage = https://github.com/kee-org/keepassrpc;
+ platforms = [ "x86_64-linux" ];
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ mjanczyk svsdep ];
+ };
+
+ pluginFilename = "KeePassRPC.plgx";
+
+ unpackCmd = ''
+ mkdir deps/
+ cp -p $src deps/$pluginFilename
+ '';
+ sourceRoot = "deps";
+
+ installPhase = ''
+ mkdir -p $out/lib/dotnet/keepass/
+ cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename
+ '';
+ };
+in
+ # Mono is required to compile plugin at runtime, after loading.
+ buildEnv { name = drv.name; paths = [ mono drv ]; }
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 49e4711550da..5e492fc621fe 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -1,24 +1,34 @@
-{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, gtk2, plugins ? [] }:
+{ stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem,
+ unzip, icoutils, gtk2, xorg, xdotool, xsel, plugins ? [] }:
-# KeePass looks for plugins in under directory in which KeePass.exe is
-# located. It follows symlinks where looking for that directory, so
-# buildEnv is not enough to bring KeePass and plugins together.
-#
-# This derivation patches KeePass to search for plugins in specified
-# plugin derivations in the Nix store and nowhere else.
with builtins; buildDotnetPackage rec {
baseName = "keepass";
- version = "2.37";
+ version = "2.38";
src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
- sha256 = "1wfbpfjng1blzkbjnxsdnny544297bm9869ianbr6l0hrvcgv3qx";
+ sha256 = "0m33gfpvv01xc28k4rrc8llbyk6qanm9rsqcnv8ydms0cr78dbbk";
};
sourceRoot = ".";
buildInputs = [ unzip makeWrapper icoutils ];
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ xsel = "${xsel}/bin/xsel";
+ xprop = "${xorg.xprop}/bin/xprop";
+ xdotool = "${xdotool}/bin/xdotool";
+ })
+ ];
+
+ # KeePass looks for plugins in under directory in which KeePass.exe is
+ # located. It follows symlinks where looking for that directory, so
+ # buildEnv is not enough to bring KeePass and plugins together.
+ #
+ # This derivation patches KeePass to search for plugins in specified
+ # plugin derivations in the Nix store and nowhere else.
pluginLoadPathsPatch =
let outputLc = toString (add 7 (length plugins));
patchTemplate = readFile ./keepass-plugins.patch;
diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/applications/misc/keepass/fix-paths.patch
new file mode 100644
index 000000000000..318f8a358985
--- /dev/null
+++ b/pkgs/applications/misc/keepass/fix-paths.patch
@@ -0,0 +1,87 @@
+diff --git a/KeePass/Native/NativeMethods.Unix.cs b/KeePass/Native/NativeMethods.Unix.cs
+index 7495a1c..4ef4727 100644
+--- a/KeePass/Native/NativeMethods.Unix.cs
++++ b/KeePass/Native/NativeMethods.Unix.cs
+@@ -128,7 +128,7 @@ namespace KeePass.Native
+ try
+ {
+ Application.DoEvents(); // E.g. for clipboard updates
+- string strOutput = NativeLib.RunConsoleApp("xdotool", strParams);
++ string strOutput = NativeLib.RunConsoleApp("@xdotool@", strParams);
+ Application.DoEvents(); // E.g. for clipboard updates
+ return (strOutput ?? string.Empty);
+ }
+diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs
+index e93a22a..3fd9a2b 100644
+--- a/KeePass/Util/ClipboardUtil.Unix.cs
++++ b/KeePass/Util/ClipboardUtil.Unix.cs
+@@ -62,7 +62,7 @@ namespace KeePass.Util
+ // "-out -selection clipboard");
+ // if(str != null) return str;
+
+- string str = NativeLib.RunConsoleApp("xsel",
++ string str = NativeLib.RunConsoleApp("@xsel@",
+ "--output --clipboard", null, XSelFlags);
+ if(str != null) return str;
+
+@@ -83,10 +83,10 @@ namespace KeePass.Util
+ if(string.IsNullOrEmpty(str))
+ {
+ // xsel with an empty input can hang, thus use --clear
+- if(NativeLib.RunConsoleApp("xsel", "--clear --primary",
++ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary",
+ null, XSelFlags) != null)
+ {
+- NativeLib.RunConsoleApp("xsel", "--clear --clipboard",
++ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard",
+ null, XSelFlags);
+ return;
+ }
+@@ -97,10 +97,10 @@ namespace KeePass.Util
+ }
+
+ // xsel does not support --primary and --clipboard together
+- if(NativeLib.RunConsoleApp("xsel", "--input --primary",
++ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary",
+ str, XSelFlags) != null)
+ {
+- NativeLib.RunConsoleApp("xsel", "--input --clipboard",
++ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard",
+ str, XSelFlags);
+ return;
+ }
+diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs
+index ddd8f57..150eb82 100644
+--- a/KeePassLib/Native/ClipboardU.cs
++++ b/KeePassLib/Native/ClipboardU.cs
+@@ -27,7 +27,7 @@ namespace KeePassLib.Native
+ {
+ internal static class ClipboardU
+ {
+- private const string XSel = "xsel";
++ private const string XSel = "@xsel@";
+ private const string XSelV = "--version";
+ private const string XSelR = "--output --clipboard";
+ private const string XSelC = "--clear --clipboard";
+diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs
+index 0da7019..f6a1022 100644
+--- a/KeePassLib/Utility/MonoWorkarounds.cs
++++ b/KeePassLib/Utility/MonoWorkarounds.cs
+@@ -41,7 +41,7 @@ namespace KeePassLib.Utility
+ {
+ public static class MonoWorkarounds
+ {
+- private const string AppXDoTool = "xdotool";
++ private const string AppXDoTool = "@xdotool@";
+
+ private static Dictionary g_dForceReq = new Dictionary();
+ private static Thread g_thFixClip = null;
+@@ -303,7 +303,7 @@ namespace KeePassLib.Utility
+ // }
+ // else { Debug.Assert(false); }
+
+- string strWmClass = (NativeLib.RunConsoleApp("xprop",
++ string strWmClass = (NativeLib.RunConsoleApp("@xprop@",
+ "-id " + strHandle + " WM_CLASS") ?? string.Empty);
+
+ if(strWmClass.IndexOf("\"" + PwDefs.ResClass + "\"",
diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/applications/misc/keepass/keepass-plugins-load.patch
index b7bea38e4c81..ca52e7ef191a 100644
--- a/pkgs/applications/misc/keepass/keepass-plugins-load.patch
+++ b/pkgs/applications/misc/keepass/keepass-plugins-load.patch
@@ -1 +1 @@
-+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {});
++ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {});
diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch
index 1793f04a1708..cde6e7252bc3 100644
--- a/pkgs/applications/misc/keepass/keepass-plugins.patch
+++ b/pkgs/applications/misc/keepass/keepass-plugins.patch
@@ -1,46 +1,13 @@
---- old/KeePass/Forms/MainForm.cs
-+++ new/KeePass/Forms/MainForm.cs
-@@ -386,42 +386,$OUTPUT_LC$ @@ namespace KeePass.Forms
+diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
+index 3d5fca0..4c3f3d4 100644
+--- a/KeePass/Forms/MainForm.cs
++++ b/KeePass/Forms/MainForm.cs
+@@ -406,7 +406,$OUTPUT_LC$ @@ namespace KeePass.Forms
+ m_pluginManager.Initialize(m_pluginDefaultHost);
+
m_pluginManager.UnloadAllPlugins();
- if(AppPolicy.Current.Plugins)
- {
-- string[] vExclNames = new string[] {
-- AppDefs.FileNames.Program, AppDefs.FileNames.XmlSerializers,
-- AppDefs.FileNames.NativeLib32, AppDefs.FileNames.NativeLib64,
-- AppDefs.FileNames.ShInstUtil
-- };
--
-- string strPlgRoot = UrlUtil.GetFileDirectory(
-- WinUtil.GetExecutable(), false, true);
-- m_pluginManager.LoadAllPlugins(strPlgRoot, SearchOption.TopDirectoryOnly,
-- vExclNames);
--
-- if(!NativeLib.IsUnix())
-- {
-- string strPlgSub = UrlUtil.EnsureTerminatingSeparator(strPlgRoot,
-- false) + AppDefs.PluginsDir;
-- m_pluginManager.LoadAllPlugins(strPlgSub, SearchOption.AllDirectories,
-- vExclNames);
-- }
-- else // Unix
-- {
-- try
-- {
-- DirectoryInfo diPlgRoot = new DirectoryInfo(strPlgRoot);
-- foreach(DirectoryInfo diSub in diPlgRoot.GetDirectories())
-- {
-- if(diSub == null) { Debug.Assert(false); continue; }
--
-- if(string.Equals(diSub.Name, AppDefs.PluginsDir,
-- StrUtil.CaseIgnoreCmp))
-- m_pluginManager.LoadAllPlugins(diSub.FullName,
-- SearchOption.AllDirectories, vExclNames);
-- }
-- }
-- catch(Exception) { Debug.Assert(false); }
-- }
-- }
-$DO_LOADS$+ }
+- if(AppPolicy.Current.Plugins) m_pluginManager.LoadAllPlugins();
+$DO_LOADS$+
// Delete old files *after* loading plugins (when timestamps
// of loaded plugins have been updated already)
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 72d9c7d2fb5d..4daa1938aba4 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -1,26 +1,53 @@
-{ stdenv, fetchFromGitHub, fetchpatch,
- cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras
-, withKeePassHTTP ? true
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools
+
+, curl
+, libargon2
+, libgcrypt
+, libsodium
+, zlib
+, libmicrohttpd
+, libXtst
+, qtbase
+, libgpgerror
+, glibcLocales
+, libyubikey
+, yubikey-personalization
+, libXi
+, qtx11extras
+
+, withKeePassBrowser ? true
+, withKeePassSSHAgent ? true
+, withKeePassHTTP ? false
+, withKeePassNetworking ? false
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "keepassxc-${version}";
- version = "2.2.2";
+ version = "2.3.0";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = "${version}";
- sha256 = "01pqpa3vzk2q1vrj2lqayr7a3nzpnj176yhnqbrwlm3s9rga4wzn";
+ sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f";
};
- cmakeFlags = [
- "-DWITH_GUI_TESTS=ON"
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-old-style-cast";
+
+ patches = [ ./darwin.patch ];
+
+ cmakeFlags = [
+ "-DKEEPASSXC_BUILD_TYPE=Release"
+ "-DWITH_GUI_TESTS=ON"
"-DWITH_XC_AUTOTYPE=ON"
"-DWITH_XC_YUBIKEY=ON"
- ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON");
+ ]
+ ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON")
+ ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON")
+ ++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON")
+ ++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON");
doCheck = true;
checkPhase = ''
@@ -28,13 +55,37 @@ stdenv.mkDerivation rec {
make test ARGS+="-E testgui --output-on-failure"
'';
- buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ];
+ nativeBuildInputs = [ cmake makeWrapper qttools ];
+
+ buildInputs = [
+ curl
+ glibcLocales
+ libXi
+ libXtst
+ libargon2
+ libgcrypt
+ libgpgerror
+ libmicrohttpd
+ libsodium
+ libyubikey
+ qtbase
+ qtx11extras
+ yubikey-personalization
+ zlib
+ ];
+
+ postInstall = optionalString stdenv.isDarwin ''
+ # Make it work without Qt in PATH.
+ wrapProgram $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC \
+ --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}
+ '';
meta = {
- description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
- homepage = https://github.com/keepassxreboot/keepassxc;
- license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ];
- platforms = with stdenv.lib.platforms; linux;
+ description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications";
+ longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI and via CLI. Includes optional http-interface to allow browser-integration with plugins like PassIFox (https://github.com/pfn/passifox).";
+ homepage = https://keepassxc.org/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ s1lvester jonafato ];
+ platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassx/darwin.patch
new file mode 100644
index 000000000000..1edf0a573a31
--- /dev/null
+++ b/pkgs/applications/misc/keepassx/darwin.patch
@@ -0,0 +1,52 @@
+Remove the use of macdeployqt to avoid copying dependencies and
+reduce installation size from 90 MB to 9 MB.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -250,8 +250,8 @@ else()
+ set(PROGNAME keepassxc)
+ endif()
+
+-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
+- set(CMAKE_INSTALL_PREFIX "/Applications")
++if(APPLE AND WITH_APP_BUNDLE)
++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
+ set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
+ endif()
+
+@@ -262,7 +262,7 @@ if(MINGW)
+ set(PLUGIN_INSTALL_DIR ".")
+ set(DATA_INSTALL_DIR "share")
+ elseif(APPLE AND WITH_APP_BUNDLE)
+- set(CLI_INSTALL_DIR "/usr/local/bin")
++ set(CLI_INSTALL_DIR "../bin")
+ set(PROXY_INSTALL_DIR "/usr/local/bin")
+ set(BIN_INSTALL_DIR ".")
+ set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 69526967..38f7c5d4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE)
+ set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
+ include(CPack)
+
+- add_custom_command(TARGET ${PROGNAME}
+- POST_BUILD
+- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
+- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
+- COMMENT "Deploying app bundle")
+ endif()
+
+ install(TARGETS ${PROGNAME}
+diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
+index 08c53278..b833b692 100644
+--- a/src/autotype/mac/CMakeLists.txt
++++ b/src/autotype/mac/CMakeLists.txt
+@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE)
+ add_custom_command(TARGET keepassx-autotype-cocoa
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
+- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
+ COMMENT "Deploying autotype plugin")
+ else()
diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix
deleted file mode 100644
index b12c9fe25510..000000000000
--- a/pkgs/applications/misc/kgocode/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ fetchgit, stdenv, cmake, kdelibs4, automoc4 } :
-
-stdenv.mkDerivation rec {
- name = "kgocode-0.0.1";
-
- buildInputs = [ cmake kdelibs4 automoc4 ];
-
- src = fetchgit {
- url = https://bitbucket.org/lucashnegri/kgocode.git;
- rev = "024536e4b2f371db4f51c1d80fb6b444352ff6a6";
- sha256 = "10q4nvx3wz5wl3wwpfprz26j4x59s41bpdgafbg6604im58hklal";
- };
-
- meta = with stdenv.lib; {
- description = "Go code completion for Kate, KDevelop and others";
- longDescription = ''
- A plugin for KTextEditor (Kate, KDevelop, among others) that provides
- basic code completion for the Go programming language.
- Uses gocode as completion provider.
- '';
- homepage = https://bitbucket.org/lucashnegri/kgocode/overview;
- maintainers = with maintainers; [ qknight ];
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 3a87e854dc1f..5f3ac3d93c44 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }:
python3Packages.buildPythonApplication rec {
- version = "0.11.4";
+ version = "0.12.2";
name = "khard-${version}";
namePrefix = "";
src = fetchurl {
url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
- sha256 = "1hngg3z5cdjny7wdf2mf9wv35ffx7ivpq6mx7kgqf40fr5905l0r";
+ sha256 = "0lxcvzmafpvqcifgq2xjh1ca07z0vhihn5jnw8zrpmsqdc9p6b4j";
};
# setup.py reads the UTF-8 encoded readme.
@@ -19,7 +19,9 @@ python3Packages.buildPythonApplication rec {
configobj
vobject
argparse
- pyyaml
+ ruamel_yaml
+ ruamel_base
+ unidecode
];
# Fails; but there are no tests anyway.
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index e1afac735d8e..52f1c9fb1a1d 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, glew, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper }:
+{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz,
+ fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel,
+ libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
+ libxkbcommon, libXi, libXext }:
with python3Packages;
buildPythonApplication rec {
- version = "0.4.2";
+ version = "0.8.2";
name = "kitty-${version}";
format = "other";
@@ -10,13 +13,21 @@ buildPythonApplication rec {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "058676r2b83mjggbfc701v3vlviaslf7qciz8sm8lcda82k01wfp";
+ sha256 = "08s8l59bib363ykg4djcxrc1968n5j1cjlp6fwwv7xmf18wd1a6c";
};
- buildInputs = [ glew fontconfig glfw ncurses libunistring ];
+ buildInputs = [
+ fontconfig glfw ncurses libunistring harfbuzz libX11
+ libXrandr libXinerama libXcursor libxkbcommon libXi libXext
+ ];
nativeBuildInputs = [ pkgconfig ];
+ postPatch = ''
+ substituteInPlace kitty/utils.py \
+ --replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'"
+ '';
+
buildPhase = ''
python3 setup.py linux-package
'';
@@ -25,7 +36,7 @@ buildPythonApplication rec {
runHook preInstall
mkdir -p $out
cp -r linux-package/{bin,share,lib} $out
- wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick ]}"
+ wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}"
runHook postInstall
'';
@@ -33,6 +44,7 @@ buildPythonApplication rec {
homepage = https://github.com/kovidgoyal/kitty;
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
license = licenses.gpl3;
+ platforms = platforms.linux;
maintainers = with maintainers; [ tex ];
};
}
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 8479c4e16ace..699cb2fd0986 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig
, zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
-, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib
+, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
, gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
, xapian, ctpp2, zimlib
}:
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
rm $out/bin/kiwix
makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
- --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
+ --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
--suffix PATH : ${aria2}/bin
'';
diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
index f3bb825cbf74..bb55fc2d4a8b 100644
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -3,11 +3,12 @@
, fetchurl
, intltool
, python3Packages
+, gobjectIntrospection
, gtk3
, dbus
, libwnck3
, keybinder3
-, hicolor_icon_theme
+, hicolor-icon-theme
, wrapGAppsHook
}:
@@ -22,8 +23,12 @@ buildPythonApplication rec {
sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92";
};
- nativeBuildInputs = [ wrapGAppsHook intltool ];
- buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ];
+ nativeBuildInputs = [
+ wrapGAppsHook intltool
+ # For setup hook
+ gobjectIntrospection
+ ];
+ buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
configurePhase = ''
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index 2695ac1ef7d5..1867ec3a9c62 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,7 +1,7 @@
{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub
, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }:
-let version = "0.7.1"; in
+let version = "0.7.4"; in
mkDerivation {
name = "latte-dock-${version}";
@@ -10,7 +10,7 @@ mkDerivation {
owner = "psifidotos";
repo = "Latte-Dock";
rev = "v${version}";
- sha256 = "0vdmsjj1qqlzz26mznb56znv5x7akbvw65ybbzakclp4q1xrsrm2";
+ sha256 = "0w4fphgpdvql31wrypxyfahmr4cv5ap96wjc4270yyawnrqrx0y6";
};
buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index 47bcbb6fce91..4f1745c0d8ce 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -1,31 +1,37 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pcsclite, pkgconfig
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, pcsclite, talloc, python2
}:
stdenv.mkDerivation rec {
name = "libosmocore-${version}";
- version = "0.9.0";
+ version = "0.9.6";
src = fetchFromGitHub {
owner = "osmocom";
repo = "libosmocore";
- rev = "8649d57f507d359c99a89654aac7e19ce22db282";
- sha256 = "08mcpy9ljwb1i3l4cmlwn024q2psk5gg9f0ylgh99hy1ffx0n7am";
+ rev = "3cc757df1822114bf446dc2d5f6a95da92321a25";
+ sha256 = "0dk7065qcy2kjra0p8q2124p73jcyvvzz3cmhid1kx5scyxmr017";
};
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [
- pcsclite
+ propagatedBuildInputs = [
+ talloc
];
- preConfigure = ''
- autoreconf -i -f
- '';
+ nativeBuildInputs = [
+ autoreconfHook pkgconfig
+ ];
+
+ buildInputs = [
+ pcsclite python2
+ ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "libosmocore";
homepage = https://github.com/osmocom/libosmocore;
license = licenses.gpl2Plus;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ mog ];
};
}
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 3729978dddb0..36527cdbe7c3 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://lilyterm.luna.com.tw/;
license = licenses.gpl3;
- maintainers = with maintainers; [ AndersonTorres profpatsch ];
+ maintainers = with maintainers; [ AndersonTorres Profpatsch ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 837a221be946..959ed6b11bab 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -6,12 +6,12 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
in stdenv.mkDerivation rec {
name = "llpp-${version}";
- version = "26b";
+ version = "2018-03-02";
src = fetchgit {
url = "git://repo.or.cz/llpp.git";
- rev = "v${version}";
- sha256 = "1w8g1fp1c20sl34cx20plhnbghbsx2fwgp4vyhd1x0za29lw62nj";
+ rev = "0ab1fbbf142b6df6d6bae782e3af2ec50f32dec9";
+ sha256 = "1h0hrmxwm7ripgp051788p8ad0q38dc9nvjx87mdwlkwk9qc0dis";
fetchSubmodules = false;
};
@@ -21,7 +21,6 @@ in stdenv.mkDerivation rec {
dontStrip = true;
configurePhase = ''
- sed -i -e 's+fz_set_use_document_css (state.ctx, usedoccss);+/* fz_set_use_document_css (state.ctx, usedoccss); */+' link.c
sed -i -e 's+ocamlc --version+ocamlc -version+' build.sh
sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh
sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
new file mode 100644
index 000000000000..0a2a051223ac
--- /dev/null
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte
+, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs
+}:
+
+let version = "0.3.1"; in
+
+stdenv.mkDerivation rec {
+ name = "lxterminal-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz";
+ sha256 = "e91f15c8a726d5c13227263476583137a2639d4799c021ca0726c9805021b54c";
+ };
+
+ configureFlags = [
+ "--enable-man"
+ "--enable-gtk3"
+ ];
+
+ nativeBuildInputs = [
+ automake autoconf intltool pkgconfig
+ libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs
+ ];
+
+ buildInputs = [ gtk3 vte ];
+
+ patches = [
+ ./respect-xml-catalog-files-var.patch
+ ];
+
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
+ doCheck = true;
+
+ meta = {
+ description = "The standard terminal emulator of LXDE";
+ longDescription = ''
+ LXTerminal is the standard terminal emulator of LXDE. The terminal is a
+ desktop-independent VTE-based terminal emulator for LXDE without any
+ unnecessary dependencies.
+ '';
+ homepage = https://wiki.lxde.org/en/LXTerminal;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.velovix ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
new file mode 100644
index 000000000000..598f506118f2
--- /dev/null
+++ b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
@@ -0,0 +1,15 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index be626c5..b449b1b 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
+ [
+ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+ AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+- if $jh_found_xmlcatalog && \
+- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
++ # empty argument forces libxml to use XML_CATALOG_FILES variable
++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
+ AC_MSG_RESULT([found])
+ ifelse([$3],,,[$3
+ ])dnl
diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
index af8d00b59bfb..787ce7231f30 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -26,6 +26,6 @@ buildGoPackage rec {
homepage = https://github.com/McKael/madonctl;
license = licenses.mit;
platforms = platforms.unix;
- maintainers = with maintainers; [ matthiasbeyer ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 76d23f1a8f08..19a45e7d17be 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }:
let
- version = "4.3.61";
+ version = "4.3.82";
in
stdenv.mkDerivation {
name = "masterpdfeditor-${version}";
src = fetchurl {
url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
- sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm";
+ sha256 = "0bfqnpg2p5jxygcahqqljyb0gd2z28hj5n1j9g1x7px8f7wwiwl4";
};
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index f627a3cda22f..9e584217c598 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
- version = "1.0.10";
+ version = "1.0.12";
name = "mdp-${version}";
src = fetchFromGitHub {
owner = "visit1985";
repo = "mdp";
rev = version;
- sha256 = "1swp1hqryai84c8dpzsvjpgg5rz2vnn2vrp0dhwy8r0qgpmby2nn";
+ sha256 = "04izj9i9rxmgswjh2iawqs6qglfv44zfv042smmcvfh1pm43361i";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 0167132db789..8451c783aac6 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK
-, desktop_file_utils, libSM, imagemagick }:
+, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
- version = "17.10";
+ version = "17.12";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
+ sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ libzen libmediainfo wxGTK desktop_file_utils libSM
+ buildInputs = [ libzen libmediainfo wxGTK desktop-file-utils libSM
imagemagick ];
sourceRoot = "./MediaInfo/Project/GNU/GUI/";
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index e6175356348f..7b4b8f0d780b 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "17.10";
+ version = "17.12";
name = "mediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
+ sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix
new file mode 100644
index 000000000000..fc1c08dc2b2c
--- /dev/null
+++ b/pkgs/applications/misc/memo/default.nix
@@ -0,0 +1,38 @@
+{ fetchFromGitHub, ag, tree, stdenv, ... }:
+
+stdenv.mkDerivation rec {
+
+ name = "memo-${version}";
+
+ version = "0.2";
+
+ src = fetchFromGitHub {
+ owner = "mrVanDalo";
+ repo = "memo";
+ rev = "${version}";
+ sha256 = "0mww4w5m6jv4s0krm74cccrz0vlr8rrwiv122jk67l1v9r80pchs";
+ };
+
+ installPhase = ''
+ mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions}
+ substituteInPlace memo \
+ --replace "ack " "${ag}/bin/ag " \
+ --replace "tree " "${tree}/bin/tree "
+ mv memo $out/bin/
+ mv doc/memo.1 $out/share/man/man1/memo.1
+ mv completion/memo.bash $out/share/bash-completion/completions/memo.sh
+ '';
+
+ meta = {
+ description = "A simple tool written in bash to memorize stuff";
+ longDescription = ''
+ A simple tool written in bash to memorize stuff.
+ Memo organizes is structured through topics which are folders in ~/memo.
+ '';
+ homepage = http://palovandalo.com/memo/;
+ downloadPage = https://github.com/mrVanDalo/memo/releases;
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [ stdenv.lib.maintainers.mrVanDalo ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/mencal/default.nix b/pkgs/applications/misc/mencal/default.nix
new file mode 100644
index 000000000000..df0a4db7fc70
--- /dev/null
+++ b/pkgs/applications/misc/mencal/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+ name = "mencal-3.0";
+
+ src = fetchurl {
+ url = "http://kyberdigi.cz/projects/mencal/files/${name}.tar.gz";
+ sha256 = "9328d0b2f3f57847e8753c5184531f4832be7123d1b6623afdff892074c03080";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp mencal $out/bin/
+ '';
+
+ buildInputs = [ perl ];
+
+ meta = with stdenv.lib; {
+ description = "Menstruation calendar";
+ longDescription = ''
+ Mencal is a simple variation of the well-known unix command cal.
+ The main difference is that you can have some periodically repeating
+ days highlighted in color. This can be used to track
+ menstruation (or other) cycles conveniently.
+ '';
+ homepage = "http://www.kyberdigi.cz/projects/mencal/english.html";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.mmahut ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix
index 8f18f166d4a3..602d4a032efd 100644
--- a/pkgs/applications/misc/metamorphose2/default.nix
+++ b/pkgs/applications/misc/metamorphose2/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "a graphical mass renaming program for files and folders";
homepage = "https://github.com/metamorphose/metamorphose2";
license = with licenses; gpl3Plus;
- maintainer = with maintainers; [ ramkromberg ];
+ maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index d8d1cff6040b..09c4d1db2904 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, clang, gcc }:
+{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }:
stdenv.mkDerivation rec {
name = "milu-nightly-${version}";
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
preConfigure = ''
sed -i 's#/usr/bin/##g' Makefile
- sed -i "s#-lclang#-L$(clang --print-search-dirs |
- sed -ne '/libraries:/{s/libraries: =//; s/:/ -L/gp}') -lclang#g" Makefile
'';
installPhase = ''
@@ -28,8 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
unzip
- clang
- gcc
+ llvmPackages.libclang
];
meta = {
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 1317c0357923..701e4b2e052d 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "mlterm-${version}";
- version = "3.8.0";
+ version = "3.8.4";
src = fetchurl {
url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
- sha256 = "00dzx5rqsp73shgvn2jvgk85v3lirby06wxkqjcm1i1xwigidq3b";
+ sha256 = "07ih7953pr1jr99rayjn57ba5a0cr3niqkmvy9n59lcc1qwcrwf9";
};
nativeBuildInputs = [ pkgconfig autoconf ];
diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix
deleted file mode 100644
index ed2049ee5abe..000000000000
--- a/pkgs/applications/misc/monero/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }:
-
-let
- version = "0.11.1.0";
-in
-stdenv.mkDerivation {
- name = "monero-${version}";
-
- src = fetchFromGitHub {
- owner = "monero-project";
- repo = "monero";
- rev = "v${version}";
- sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148";
- };
-
- nativeBuildInputs = [ cmake pkgconfig ];
-
- buildInputs = [ boost miniupnpc openssl unbound ];
-
- # these tests take a long time and don't
- # always complete in the build environment
- postPatch = "sed -i '/add_subdirectory(tests)/d' CMakeLists.txt";
-
- NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
- doCheck = false;
-
- installPhase = ''
- install -Dt "$out/bin/" \
- bin/monerod \
- bin/monero-blockchain-export \
- bin/monero-blockchain-import \
- bin/monero-wallet-cli \
- bin/monero-wallet-rpc
- '';
-
- meta = with stdenv.lib; {
- description = "Private, secure, untraceable currency";
- homepage = https://getmonero.org/;
- license = licenses.bsd3;
- maintainers = [ maintainers.ehmry ];
- platforms = [ "x86_64-linux" ];
- };
-}
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index c95f935b8555..42f1b58061ef 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "moonlight-embedded-${version}";
- version = "2.4.2";
+ version = "2.4.6";
# fetchgit used to ensure submodules are available
src = fetchgit {
url = "git://github.com/irtimmer/moonlight-embedded";
rev = "refs/tags/v${version}";
- sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr";
+ sha256 = "0vs6rjmz8058s9lscagiif6pcizwfrvfpk9rxxgacfi0xisfgmf1";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix
new file mode 100644
index 000000000000..fdb236194f9c
--- /dev/null
+++ b/pkgs/applications/misc/mucommander/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre }:
+
+let
+ version = "0.9.2";
+ name = "mucommander-${version}";
+
+ src = fetchFromGitHub {
+ owner = "mucommander";
+ repo = "mucommander";
+ rev = version;
+ sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8";
+ };
+
+ postPatch = ''
+ # there is no .git anyway
+ substituteInPlace build.gradle \
+ --replace "git = org.ajoberstar.grgit.Grgit.open(file('.'))" "" \
+ --replace "revision = git.head().id" "revision = 'abcdefgh'"
+
+ # disable gradle plugins with native code and their targets
+ perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle
+ perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar)/ ... /^}/" build.gradle
+
+ # fix source encoding
+ find . -type f -name build.gradle \
+ -exec perl -i.bak3 -pe "s#(repositories\.jcenter\(\))#
+ \1
+ compileJava.options.encoding = 'UTF-8'
+ compileTestJava.options.encoding = 'UTF-8'
+ #" {} \;
+ '';
+
+ # fake build to pre-download deps into fixed-output derivation
+ deps = stdenv.mkDerivation {
+ name = "${name}-deps";
+ inherit src postPatch;
+ nativeBuildInputs = [ gradle_3_5 perl ];
+ buildPhase = ''
+ export GRADLE_USER_HOME=$(mktemp -d)
+ gradle --no-daemon build
+ '';
+ # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
+ installPhase = ''
+ find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
+ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+ | sh
+ '';
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "199a9rc1pp9jjwpy83743qhjczfz0d1mkbic6si9bh8l62nw8qc7";
+ };
+
+in stdenv.mkDerivation {
+ inherit name src postPatch;
+ nativeBuildInputs = [ gradle_3_5 perl makeWrapper ];
+
+ buildPhase = ''
+ export GRADLE_USER_HOME=$(mktemp -d)
+
+ # point to offline repo
+ find . -type f -name build.gradle \
+ -exec perl -i.bak3 -pe "s#repositories\.jcenter\(\)#
+ repositories { mavenLocal(); maven { url '${deps}' } }
+ #" {} \;
+
+ gradle --offline --no-daemon build
+ '';
+
+ installPhase = ''
+ mkdir $out
+ tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1
+ wrapProgram $out/bin/mucommander --set JAVA_HOME ${jre}
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.mucommander.com/;
+ description = "Cross-platform file manager";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ volth ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix
index 24a8b0c46a64..953c4c1d9a94 100644
--- a/pkgs/applications/misc/multimon-ng/default.nix
+++ b/pkgs/applications/misc/multimon-ng/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }:
let
- version = "1.0.0";
+ version = "1.1.4";
in
stdenv.mkDerivation {
name = "multimon-ng-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "EliasOenal";
repo = "multimon-ng";
- rev = "4cc984f35f859539c94aa56d3fc6218a6de51148";
+ rev = "${version}";
sha256 = "12z6f0ra2k0qh56pcvnwvlxd3msvr6yr97jvs7w5kf42jqbxdsga";
};
diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/pkgs/applications/misc/mupdf/darwin.patch
new file mode 100644
index 000000000000..e0c7d6a7a676
--- /dev/null
+++ b/pkgs/applications/misc/mupdf/darwin.patch
@@ -0,0 +1,35 @@
+diff --git a/Makerules b/Makerules
+--- a/Makerules
++++ b/Makerules
+@@ -81,22 +81,10 @@ HAVE_GLUT ?= yes
+ SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
+ SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
+
+-CC = xcrun cc
+-AR = xcrun ar
+-LD = xcrun ld
+-RANLIB_CMD = xcrun ranlib $@
+-
+-# Linux uses pkg-config for system libraries.
+-else ifeq "$(OS)" "Linux"
+-
+ HAVE_PTHREAD := yes
+ SYS_PTHREAD_CFLAGS :=
+ SYS_PTHREAD_LIBS := -lpthread
+
+-HAVE_GLUT := yes
+-SYS_GLUT_CFLAGS :=
+-SYS_GLUT_LIBS := -lglut -lGL
+-
+ ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
+ HAVE_LIBCRYPTO := yes
+ SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
+@@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
+ SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
+ endif
+ endif
+-SYS_CURL_DEPS += -lpthread -lrt
++SYS_CURL_DEPS += -lpthread
+
+ ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
+ HAVE_X11 := yes
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index ca6093644599..1b510221d121 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig
-, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg
-, enableX11 ? true, libX11, libXext
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg
+, jbig2dec, libjpeg , darwin
+, enableX11 ? true, libX11, libXext, libXi, libXrandr
, enableCurl ? true, curl, openssl
+, enableGL ? true, freeglut, libGLU
}:
let
@@ -13,58 +14,80 @@ let
in stdenv.mkDerivation rec {
- version = "1.11";
+ version = "1.12.0";
name = "mupdf-${version}";
src = fetchurl {
url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
- sha256 = "02phamcchgsmvjnb3ir7r5sssvx9fcrscn297z73b82n1jl79510";
+ sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw";
};
patches = [
# Compatibility with new openjpeg
(fetchpatch {
- name = "mupdf-1.11-openjpeg-version.patch";
- url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=c19349f42838e4dca02e564b97e0a5ab3e1b943f";
- sha256 = "0sx7jq84sr8bj6sg2ahg9cdgqz8dh4w6r0ah2yil8vrsznn4la8r";
+ name = "mupdf-1.12-openjpeg-version.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306";
+ sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk";
})
-
- (fetchurl {
- name = "mupdf-1.11-CVE-2017-6060.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614";
- sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc";
- })
-
(fetchpatch {
- name = "mupdf-1.11-shared_libs-1.patch";
- url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch";
- sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j";
+ name = "CVE-2018-6544.1.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d";
+ sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i";
})
+ (fetchpatch {
+ name = "CVE-2018-6544.2.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7";
+ sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627";
+ })
+ (fetchpatch {
+ # Bugs 698804/698810/698811, 698819: Keep PDF object numbers below limit.
+ name = "CVE-2017-17858.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=55c3f68d638ac1263a386e0aaa004bb6e8bde731";
+ sha256 = "1bf683d59i5009cv1hhmwmrp2rsb75cbf98qd44dk39cpvq8ydwv";
+ })
+ (fetchpatch {
+ # Bug 698825: Do not drop borrowed colorspaces.
+ name = "CVE-2018-1000051.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=321ba1de287016b0036bf4a56ce774ad11763384";
+ sha256 = "0jbcc9j565q5y305pi888qzlp83zww6nhkqbsmkk91gim958zikm";
+ })
+ (fetchpatch {
+ # Bug 698908 preprecondition: Add portable pseudo-random number generator based on the lrand48 family.
+ name = "CVE-2018-6187.0.1.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2d5b4683e912d6e6e1f1e2ca5aa0297beb3e6807";
+ sha256 = "028bxinbjs5gg9myjr3vs366qxg9l2iyba2j3pxkxsh1851hj728";
+ })
+ (fetchpatch {
+ # Bug 698908 precondition: Fix "being able to search for redacted text" bug.
+ name = "CVE-2018-6187.0.2.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=25593f4f9df0c4a9b9adaa84aaa33fe2a89087f6";
+ sha256 = "195y69c3f8yqxcsa0bxrmxbdc3fx1dzvz8v66i56064mjj0mx04s";
+ })
+ (fetchpatch {
+ # Bug 698908: Resize object use and renumbering lists after repair.
+ name = "CVE-2018-6187.1.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=3e30fbb7bf5efd88df431e366492356e7eb969ec";
+ sha256 = "0wzbqj750h06q1wa6vxbpv5a5q9pfg0cxjdv88yggkrjb3vrkd9j";
+ })
+ (fetchpatch {
+ # Bug 698908: Plug PDF object leaks when decimating pages in pdfposter.
+ name = "CVE-2018-6187.2.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a71e7c85a9f2313cde20d4479cd727a5f5518ed2";
+ sha256 = "1pcjkq8lg6l2m0186rl79lilg79crgdvz9hrmm3w60gy2gxkgksc";
+ })
+ (fetchpatch {
+ # Bug 698916: Indirect object numbers must be in range.
+ name = "CVE-2018-6192.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=5e411a99604ff6be5db9e273ee84737204113299";
+ sha256 = "134zc07fp0p1mwqa8xrkq3drg4crajzf1hjf4mdwmcy1jfj2pfhj";
+ })
+ ]
- (fetchurl {
- name = "mupdf-1.11-CVE-2017-14685.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=ab1a420613dec93c686acbee2c165274e922f82a";
- sha256 = "120xapwj0af333n3a32ypxk0jmjv2ia476jg8pzsfqk9a5qqkx46";
- })
+ # Use shared libraries to decrease size
+ ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.12-shared_libs-1.patch
- (fetchurl {
- name = "mupdf-1.11-CVE-2017-14686.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1";
- sha256 = "0pkn7mfqhmnsyia4rh4mw4q435bzvlc22crqa1bxpaa0gcyky51c";
- })
-
- (fetchurl {
- name = "mupdf-1.11-CVE-2017-14687.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2b16dbd8f73269cb15ca61ece75cf8d2d196ed28";
- sha256 = "01v41cwrdnz3k32fcadk2gk4knqrm3mavzp6pxhn19nwgmqkshjd";
- })
-
- (fetchurl {
- name = "mupdf-1.11-CVE-2017-15587.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=82df2631d7d0446b206ea6b434ea609b6c28b0e8";
- sha256 = "04kfww7y0wazg6372g44fa2k5kiiigq4616ihkvmp18rz86903n9";
- })
- ];
+ ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
+ ;
postPatch = ''
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
@@ -72,9 +95,15 @@ in stdenv.mkDerivation rec {
makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ]
- ++ lib.optionals enableX11 [ libX11 libXext ]
- ++ lib.optionals enableCurl [ curl openssl ];
+ buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ]
+ ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
+ ++ lib.optionals enableCurl [ curl openssl ]
+ ++ lib.optionals enableGL (
+ if stdenv.isDarwin then
+ with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]
+ else
+ [ freeglut libGLU ])
+ ;
outputs = [ "bin" "dev" "out" "man" "doc" ];
preConfigure = ''
@@ -117,6 +146,6 @@ in stdenv.mkDerivation rec {
description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ viric vrthra fpletz ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch
new file mode 100644
index 000000000000..b39f005ed74a
--- /dev/null
+++ b/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch
@@ -0,0 +1,41 @@
+--- mupdf-1.12.0-source.orig/Makefile 2017-12-13 15:00:30.000000000 +0100
++++ mupdf-1.12.0-source/Makefile 2017-12-31 00:05:23.003277481 +0100
+@@ -14,7 +14,7 @@
+ # Do not specify CFLAGS or LIBS on the make invocation line - specify
+ # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
+ # set a variable that was set on the command line.
+-CFLAGS += $(XCFLAGS) -Iinclude
++CFLAGS += $(XCFLAGS) -Iinclude -fPIC
+ LIBS += $(XLIBS) -lm
+
+ LIBS += $(FREETYPE_LIBS)
+@@ -312,9 +312,9 @@
+
+ # --- Library ---
+
+-MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdfthird.a
+-THREAD_LIB = $(OUT)/libmuthreads.a
++MUPDF_LIB = $(OUT)/libmupdf.so
++THIRD_LIB = $(OUT)/libmupdfthird.so
++THREAD_LIB = $(OUT)/libmuthreads.so
+
+ MUPDF_OBJ := \
+ $(FITZ_OBJ) \
+@@ -343,11 +343,14 @@
+
+ THREAD_OBJ := $(THREAD_OBJ)
+
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
+ $(THIRD_LIB) : $(THIRD_OBJ)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined
+ $(THREAD_LIB) : $(THREAD_OBJ)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread
+
+-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
+
+ # --- Tools and Apps ---
+
diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix
index 2faf082197c8..e6ac35d19a0c 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/pkgs/applications/misc/mwic/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec {
- version = "0.7.3";
+ version = "0.7.4";
name = "mwic-${version}";
src = fetchurl {
url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
- sha256 = "0baa2pnaba954k169p9rpzc66mhz9zqdd3lz9q95rp9dgygvchzn";
+ sha256 = "0c0xk7wx4vaamlry6srdixw1q6afmqznvxdzcg1skr0qjypw5i5q";
};
makeFlags=["PREFIX=\${out}"];
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index e8c6c9f24300..76517f874642 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, makeWrapper, cmake, pkgconfig
-, glibc, gnome_keyring, gtk, gtkmm, pcre, swig, sudo
+, glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo
, mysql, libxml2, libctemplate, libmysqlconnectorcpp
, vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs
-, libXdmcp, libuuid, libzip, libgnome_keyring, file
+, libXdmcp, libuuid, libzip, libgnome-keyring, file
, pythonPackages, jre, autoconf, automake, libtool
, boost, glibmm, libsigcxx, pangomm, libX11, openssl
, proj, cairo, libglade
@@ -21,9 +21,9 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo
+ buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo
paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file
- libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf
+ libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf
automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl
proj cairo cairo.dev makeWrapper libglade ] ;
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
wrapProgram "$out/bin/mysql-workbench" \
--prefix LD_LIBRARY_PATH : "${python}/lib" \
--prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \
- --prefix PATH : "${gnome_keyring}/bin" \
+ --prefix PATH : "${gnome-keyring}/bin" \
--prefix PATH : "${python}/bin" \
--set PYTHONPATH $PYTHONPATH \
--run '
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index 51b29a5c04c4..92269e03e58d 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, mesa,
+{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined,
libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}:
stdenv.mkDerivation rec {
name = "navit-svn-3537";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image mesa
+ buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined
libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ];
nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
index 74e7c694ea46..f25180505e87 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "netsurf-buildsystem-${version}";
- version = "1.5";
+ version = "1.6";
src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz";
- sha256 = "0wdgvasrjik1dgvvpqbppbpyfzkqd1v45x3g9rq7p67n773azinv";
+ sha256 = "0p5k708lcq8dip9xxck6hml32bjrbyipprm22bbsvdnsc0pqm71x";
};
makeFlags = [
diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix
index 02bb593ce710..e97452249bcf 100644
--- a/pkgs/applications/misc/netsurf/libcss/default.nix
+++ b/pkgs/applications/misc/netsurf/libcss/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
+ NIX_CFLAGS_COMPILE=[ "-Wno-error=implicit-fallthrough" ];
+
meta = with stdenv.lib; {
homepage = http://www.netsurf-browser.org/;
description = "Cascading Style Sheets library for netsurf browser";
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
new file mode 100644
index 000000000000..4ac152c26694
--- /dev/null
+++ b/pkgs/applications/misc/nixnote2/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}:
+
+mkDerivation rec {
+ name = "nixnote2-${version}";
+ version = "2.0.2";
+
+ src = fetchFromGitHub {
+ owner = "baumgarr";
+ repo = "nixnote2";
+ rev = "v${version}";
+ sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
+ };
+
+ buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ];
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ qmake ];
+
+ postPatch = ''
+ # Fix location of poppler-qt5.h
+ for f in threads/indexrunner.cpp html/noteformatter.cpp utilities/noteindexer.cpp gui/plugins/popplerviewer.h gui/plugins/pluginfactory.h gui/plugins/popplerviewer.cpp ; do
+ substituteInPlace $f \
+ --replace '#include ' '#include '
+ done
+
+ substituteInPlace help/about.html --replace '__VERSION__' '${version}'
+
+ substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy'
+ '';
+
+ postInstal = ''
+ cp images/windowIcon.png $out/share/pixmaps/nixnote2.png
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An unofficial client of Evernote";
+ homepage = http://www.nixnote.org/;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ htr ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index a2e96593ae2e..ae1c178e5716 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "nnn-${version}";
- version = "1.5";
+ version = "1.7";
src = fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "v${version}";
- sha256 = "10gcbklh0cp12293lzlwcplj0in90p95x4fyvg1smg4cxamkibvn";
+ sha256 = "03cgsdj4l19gla5fx9d1ydqirpsah9d7gx9jaik73x38zqsabr89";
};
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix
index 2aa04ce83e53..8e8126192dda 100644
--- a/pkgs/applications/misc/notify-osd/default.nix
+++ b/pkgs/applications/misc/notify-osd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus_glib, makeWrapper, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }:
stdenv.mkDerivation rec {
name = "notify-osd-${version}";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- glib libwnck3 libnotify dbus_glib makeWrapper
- gnome3.gsettings_desktop_schemas
+ glib libwnck3 libnotify dbus-glib makeWrapper
+ gnome3.gsettings-desktop-schemas
];
configureFlags = "--libexecdir=$(out)/bin";
diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix
new file mode 100644
index 000000000000..69f74d66dd01
--- /dev/null
+++ b/pkgs/applications/misc/nrsc5/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchFromGitHub,
+ autoconf, automake, libtool, cmake,
+ rtl-sdr, libao, fftwFloat
+} :
+let
+ src_faad2 = fetchFromGitHub {
+ owner = "dsvensson";
+ repo = "faad2";
+ rev = "b7aa099fd3220b71180ed2b0bc19dc6209a1b418";
+ sha256 = "0pcw2x9rjgkf5g6irql1j4m5xjb4lxj6468z8v603921bnir71mf";
+ };
+
+ version = "1.0";
+
+in stdenv.mkDerivation {
+ name = "nrsc5-${version}";
+
+ src = fetchFromGitHub {
+ owner = "theori-io";
+ repo = "nrsc5";
+ rev = "v${version}";
+ sha256 = "09zzh3h1zzf2lwrbz3i7rif2hw36d9ska8irvxaa9lz6xc1y68pg";
+ };
+
+ postUnpack = ''
+ export srcRoot=`pwd`
+ export faadSrc="$srcRoot/faad2-prefix/src/faad2_external"
+ mkdir -p $faadSrc
+ cp -r ${src_faad2}/* $faadSrc
+ chmod -R u+w $faadSrc
+ '';
+
+ postPatch = ''
+ sed -i '/GIT_REPOSITORY/d' CMakeLists.txt
+ sed -i '/GIT_TAG/d' CMakeLists.txt
+ sed -i "s:set (FAAD2_PREFIX .*):set (FAAD2_PREFIX \"$srcRoot/faad2-prefix\"):" CMakeLists.txt
+ '';
+
+ nativeBuildInputs = [ cmake autoconf automake libtool ];
+ buildInputs = [ rtl-sdr libao fftwFloat ];
+
+ cmakeFlags = [ "-DUSE_COLOR=ON" "-DUSE_FAAD2=ON" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/theori-io/nrsc5;
+ description = "HD-Radio decoder for RTL-SDR";
+ platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ markuskowa ];
+ };
+}
+
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index ad3d72e9ef50..35931707ed6b 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -53,7 +53,7 @@ pythonPackages.buildPythonApplication rec {
description = "Open source document analysis and OCR system";
license = licenses.asl20;
homepage = https://github.com/tmbdev/ocropy/;
- maintainers = with maintainers; [ domenkozar nckx viric ];
+ maintainers = with maintainers; [ domenkozar viric ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index a6d40c75c1c0..6587305a770f 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -54,14 +54,13 @@ let
in pythonPackages.buildPythonApplication rec {
name = "OctoPrint-${version}";
- version = "1.3.5";
- # 1.3.5, 2017-10-16, 77753ca02602d3a798d6b0a22535e6fd69ff448a
+ version = "1.3.6";
src = fetchFromGitHub {
owner = "foosel";
repo = "OctoPrint";
rev = version;
- sha256 = "13krv9i6gm4jn4cb327q4qma4xwwashjnc0dia8vlnbjbbvkrni4";
+ sha256 = "0pgpkjw5zjnks5bky51gjaksq8mhrzkl52kpgf799hl35pd08xr3";
};
# We need old Tornado
@@ -70,7 +69,7 @@ in pythonPackages.buildPythonApplication rec {
semantic-version flask_principal werkzeug flaskbabel tornado
psutil pyserial flask_login netaddr markdown sockjs-tornado
pylru pyyaml sarge feedparser netifaces click websocket_client
- scandir chainmap future dateutil futures wrapt
+ scandir chainmap future dateutil futures wrapt monotonic emoji
];
buildInputs = with pythonPackages; [ nose mock ddt ];
@@ -101,7 +100,7 @@ in pythonPackages.buildPythonApplication rec {
checkPhase = "nosetests";
meta = with stdenv.lib; {
- homepage = http://octoprint.org/;
+ homepage = https://octoprint.org/;
description = "The snappy web interface for your 3D printer";
license = licenses.agpl3;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index 9db6042e60f6..9e460bf2611a 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "ola-${version}";
- version = "0.10.5";
+ version = "0.10.6";
src = fetchFromGitHub {
owner = "OpenLightingProject";
repo = "ola";
rev = version;
- sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al";
+ sha256 = "1qazhkcakvzkf1dvav0alk33aaklawf8vckgwpf6fvwf7g2kyh63";
};
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A framework for controlling entertainment lighting equipment.";
maintainers = [ maintainers.globin ];
- licenses = with licenses; [ lgpl21 gpl2Plus ];
+ license = with licenses; [ lgpl21 gpl2Plus ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
new file mode 100644
index 000000000000..d4847e4ce493
--- /dev/null
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -0,0 +1,156 @@
+{ fetchurl
+, stdenv
+, aspellWithDicts
+, at-spi2-core ? null
+, atspiSupport ? true
+, bash
+, glib
+, glibcLocales
+, gnome3
+, gobjectIntrospection
+, gsettings-desktop-schemas
+, gtk3
+, hunspell
+, hunspellDicts
+, hunspellWithDicts
+, intltool
+, isocodes
+, libcanberra-gtk3
+, libudev
+, libxkbcommon
+, pkgconfig
+, procps
+, python3
+, wrapGAppsHook
+, xorg
+, yelp
+}:
+
+let
+ customHunspell = hunspellWithDicts [hunspellDicts.en-us];
+ majorVersion = "1.4";
+ version = "${majorVersion}.1";
+in python3.pkgs.buildPythonApplication rec {
+ name = "onboard-${version}";
+ src = fetchurl {
+ url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${name}.tar.gz";
+ sha256 = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865";
+ };
+
+ patches = [
+ # Allow loading hunspell dictionaries installed in NixOS system path
+ ./hunspell-use-xdg-datadirs.patch
+ ];
+
+ # For tests
+ LC_ALL = "en_US.UTF-8";
+ doCheck = false;
+ checkInputs = [
+ # for Onboard.SpellChecker.aspell_cmd doctests
+ (aspellWithDicts (dicts: with dicts; [ en ]))
+
+ # for Onboard.SpellChecker.hunspell_cmd doctests
+ customHunspell
+
+ # for Onboard.SpellChecker.hunspell doctests
+ hunspellDicts.en-us
+ hunspellDicts.es-es
+ hunspellDicts.it-it
+
+ python3.pkgs.nose
+ ];
+
+ propagatedBuildInputs = [
+ glib
+ python3
+ python3.pkgs.dbus-python
+ python3.pkgs.distutils_extra
+ python3.pkgs.pyatspi
+ python3.pkgs.pycairo
+ python3.pkgs.pygobject3
+ python3.pkgs.systemd
+ ];
+
+ buildInputs = [
+ bash
+ gnome3.dconf
+ gsettings-desktop-schemas
+ gtk3
+ hunspell
+ isocodes
+ libcanberra-gtk3
+ libudev
+ libxkbcommon
+ wrapGAppsHook
+ xorg.libXtst
+ xorg.libxkbfile
+ ] ++ stdenv.lib.optional atspiSupport at-spi2-core;
+
+ nativeBuildInputs = [
+ glibcLocales
+ intltool
+ pkgconfig
+ ];
+
+ propagatedUserEnvPkgs = [
+ gnome3.dconf
+ ];
+
+ preBuild = ''
+ # Unnecessary file, has been removed upstream
+ # https://github.com/NixOS/nixpkgs/pull/24986#issuecomment-296114062
+ rm -r Onboard/pypredict/attic
+
+ substituteInPlace ./scripts/sokSettings.py \
+ --replace "#!/usr/bin/python3" "" \
+ --replace "PYTHON_EXECUTABLE," "\"$out/bin/onboard-settings\"" \
+ --replace '"-cfrom Onboard.settings import Settings\ns = Settings(False)"' ""
+
+ chmod -x ./scripts/sokSettings.py
+
+ patchShebangs .
+
+ substituteInPlace ./Onboard/LanguageSupport.py \
+ --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \
+ --replace "/usr/bin/yelp" "${yelp}/bin/yelp"
+
+ substituteInPlace ./Onboard/Indicator.py \
+ --replace "/usr/bin/yelp" "${yelp}/bin/yelp"
+
+ substituteInPlace ./gnome/Onboard_Indicator@onboard.org/extension.js \
+ --replace "/usr/bin/yelp" "${yelp}/bin/yelp"
+
+ substituteInPlace ./Onboard/SpellChecker.py \
+ --replace "/usr/lib" "$out/lib"
+
+ substituteInPlace ./data/org.onboard.Onboard.service \
+ --replace "/usr/bin" "$out/bin"
+
+ substituteInPlace ./Onboard/utils.py \
+ --replace "/usr/share" "$out/share"
+ substituteInPlace ./onboard-defaults.conf.example \
+ --replace "/usr/share" "$out/share"
+ substituteInPlace ./Onboard/Config.py \
+ --replace "/usr/share/onboard" "$out/share/onboard"
+
+ substituteInPlace ./Onboard/WordSuggestions.py \
+ --replace "/usr/bin" "$out/bin"
+
+ # killall is dangerous on non-gnu platforms. Use pkill instead.
+ substituteInPlace ./setup.py \
+ --replace '"killall",' '"${procps}/bin/pkill", "-x",'
+ '';
+
+ postInstall = ''
+ cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override
+
+ glib-compile-schemas $out/share/glib-2.0/schemas/
+ '';
+
+ meta = {
+ homepage = https://launchpad.net/onboard;
+ description = "An onscreen keyboard useful for tablet PC users and for mobility impaired users.";
+ maintainers = with stdenv.lib.maintainers; [ johnramsden ];
+ license = stdenv.lib.licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch b/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch
new file mode 100644
index 000000000000..2463c8d5f5ac
--- /dev/null
+++ b/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch
@@ -0,0 +1,20 @@
+diff --git a/Onboard/SpellChecker.py b/Onboard/SpellChecker.py
+index 6a92757..46e755e 100644
+--- a/Onboard/SpellChecker.py
++++ b/Onboard/SpellChecker.py
+@@ -506,6 +506,10 @@ class hunspell(SCBackend):
+ if dicpath:
+ paths.extend(dicpath.split(pathsep))
+
++ datadirs = os.getenv("XDG_DATA_DIRS")
++ if datadirs:
++ paths.extend(map(lambda datadir: os.path.join(datadir, 'hunspell'), datadirs.split(pathsep)))
++
+ paths.extend(LIBDIRS)
+
+ home = os.getenv("HOME")
+@@ -723,4 +727,3 @@ class aspell_cmd(SCBackend):
+ _logger.error(_format("Failed to execute '{}', {}", \
+ " ".join(args), e))
+ return [id for id in dict_ids if id]
+-
diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
new file mode 100644
index 000000000000..4655b059b339
--- /dev/null
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, xorg, x11 }:
+
+stdenv.mkDerivation rec {
+ version = "1.2.sakura.5";
+ vname = "1.2.5";
+ name = "oneko-${vname}";
+ src = fetchurl {
+ url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz";
+ sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
+ };
+ buildInputs = [ xorg.imake xorg.gccmakedep x11 ];
+
+ configurePhase = "xmkmf";
+
+ installPhase = ''
+ make install BINDIR=$out/bin
+ make install.man MANPATH=$out/share/man
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Creates a cute cat chasing around your mouse cursor";
+ longDescription = ''
+ Oneko changes your mouse cursor into a mouse
+ and creates a little cute cat, which starts
+ chasing around your mouse cursor.
+ When the cat is done catching the mouse, it starts sleeping.
+ '';
+ homepage = "http://www.daidouji.com/oneko/";
+ license = licenses.publicDomain;
+ maintainers = [ maintainers.xaverdh ];
+ platforms = platforms.linux;
+ };
+}
+
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 4aebd3bb2a96..b8b6e42d5cf5 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, mesa }:
+{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU_combined }:
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 mesa ]}" \
+ --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU_combined ]}" \
$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 3420d6365b4b..1c5fde9353aa 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "opencpn-${version}";
- version = "4.2.0";
+ version = "4.8.2";
src = fetchFromGitHub {
owner = "OpenCPN";
repo = "OpenCPN";
rev = "v${version}";
- sha256 = "1m6fp9lf9ki9444h0dq6bj0vr7d0pcxkbjv3j2v76p0ksk2l8kw3";
+ sha256 = "0r6a279xhhf4jrmjb2xi5arxb4xd5wvqbs4hyyildlgpr1x7bd09";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
new file mode 100644
index 000000000000..8a941a719f29
--- /dev/null
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchFromGitHub
+, cmake, gcc-arm-embedded, python
+, qt5, SDL, gmock
+, dfu-util, avrdude
+}:
+
+let
+
+ version = "2.2.1";
+
+in stdenv.mkDerivation {
+
+ name = "opentx-${version}";
+
+ src = fetchFromGitHub {
+ owner = "opentx";
+ repo = "opentx";
+ rev = version;
+ sha256 = "01lnnkrxach21aivnx1k1iqhih02nixh8c4nk6rpw408p13him9g";
+ };
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = with qt5; [
+ gcc-arm-embedded
+ python python.pkgs.pyqt4
+ qtbase qtmultimedia qttranslations
+ SDL gmock
+ ];
+
+ postPatch = ''
+ sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|'
+ sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|'
+ '';
+
+ cmakeFlags = [
+ "-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations"
+ # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
+ #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
+ #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "OpenTX Companion transmitter support software";
+ longDescription = ''
+ OpenTX Companion is used for many different tasks like loading OpenTX
+ firmware to the radio, backing up model settings, editing settings and
+ running radio simulators.
+ '';
+ homepage = https://open-tx.org/;
+ license = stdenv.lib.licenses.gpl2;
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ maintainers = with maintainers; [ elitak ];
+ };
+
+}
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
new file mode 100644
index 000000000000..9bc9218305c3
--- /dev/null
+++ b/pkgs/applications/misc/orca/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication
+, autoreconfHook, wrapGAppsHook
+, intltool, yelp-tools, itstool, libxmlxx3
+, python, pygobject3, gtk3, gnome3, substituteAll
+, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
+, xkbcomp, gsettings-desktop-schemas, liblouis
+, speechd, brltty, setproctitle, gst_all_1, gst-python
+}:
+
+with lib;
+let
+ pname = "orca";
+ version = "3.27.91";
+in buildPythonApplication rec {
+ name = "${pname}-${version}";
+
+ format = "other";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0phlkn6ffqncvsg7ph3l4xw388baddav9s4pbkvqqa8myca9g4wg";
+ };
+
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ xkbcomp = "${xkbcomp}/bin/xkbcomp";
+ })
+ ];
+
+ nativeBuildInputs = [
+ autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
+ intltool yelp-tools itstool
+ ];
+
+ propagatedBuildInputs = [
+ pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle
+ ];
+
+ buildInputs = [
+ python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas
+ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+ ];
+
+ # Run intltoolize to create po/Makefile.in.in
+ preConfigure = ''
+ intltoolize
+ '';
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ meta = {
+ homepage = https://wiki.gnome.org/Projects/Orca;
+ description = "Screen reader";
+ longDescription = ''
+ A free, open source, flexible and extensible screen reader that provides
+ access to the graphical desktop via speech and refreshable braille.
+ It works with applications and toolkits that support the Assistive
+ Technology Service Provider Interface (AT-SPI). That includes the GNOME
+ Gtk+ toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and
+ WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued.
+
+ Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`.
+ '';
+ maintainers = with maintainers; [ berce ] ++ gnome3.maintainers;
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/orca/fix-paths.patch b/pkgs/applications/misc/orca/fix-paths.patch
new file mode 100644
index 000000000000..d3e77773f28f
--- /dev/null
+++ b/pkgs/applications/misc/orca/fix-paths.patch
@@ -0,0 +1,29 @@
+--- a/src/orca/orca.py
++++ b/src/orca/orca.py
+@@ -239,7 +239,7 @@
+
+ def _setXmodmap(xkbmap):
+ """Set the keyboard map using xkbcomp."""
+- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
+ stdin=subprocess.PIPE, stdout=None, stderr=None)
+ p.communicate(xkbmap)
+
+@@ -297,7 +297,7 @@
+ """
+
+ global _originalXmodmap
+- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-'])
++ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-'])
+
+ def _restoreXmodmap(keyList=[]):
+ """Restore the original xmodmap values for the keys in keyList.
+@@ -309,7 +309,7 @@
+
+ global _capsLockCleared
+ _capsLockCleared = False
+- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
+ stdin=subprocess.PIPE, stdout=None, stderr=None)
+ p.communicate(_originalXmodmap)
+
diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix
new file mode 100644
index 000000000000..5787adef2a3e
--- /dev/null
+++ b/pkgs/applications/misc/osm2xmap/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } :
+
+stdenv.mkDerivation rec {
+ name = "osm2xmap-${version}";
+ version = "2.0";
+
+ src = fetchFromGitHub {
+ sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w";
+ repo = "osm2xmap";
+ owner = "sembruk";
+ rev = "v${version}";
+ };
+
+ makeFlags = [
+ "GIT_VERSION=$(version)"
+ "GIT_TIMESTAMP="
+ "SHAREDIR=$(out)/share/"
+ "INSTALL_BINDIR=$(out)/bin"
+ "INSTALL_MANDIR=$(out)/share/man/man1"
+ "INSTALL_SHAREDIR=$(out)/share/"
+ ];
+
+ installFlags = [ "DESTDIR=$(out)" ];
+
+ buildInputs = [ libroxml proj libyamlcpp boost ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/sembruk/osm2xmap";
+ description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format.";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.mpickering ];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix
new file mode 100644
index 000000000000..46e00a979900
--- /dev/null
+++ b/pkgs/applications/misc/overmind/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, tmux, makeWrapper }:
+
+buildGoPackage rec {
+ name = "overmind-${version}";
+ version = "1.1.1";
+ goPackagePath = "github.com/DarthSim/overmind";
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux ]}"
+ '';
+
+ src = fetchFromGitHub {
+ owner = "DarthSim";
+ repo = "overmind";
+ rev = "v${version}";
+ sha256 = "0gdsbm54ln07jv1kgg53fiavx18xxw4f21lfcdl74ijk6bx4jbzv";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/DarthSim/;
+ description = "Process manager for Procfile-based applications and tmux";
+ license = with licenses; [ mit ];
+ maintainers = [ maintainers.adisbladis ];
+ };
+}
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index 691f3188b08c..47be9dc8200e 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib
, mono, gtk-sharp-2_0, gnome-sharp, hyena
, which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp
+ gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp
hyena which makeWrapper wrapGAppsHook
];
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 8e0fc6137210..515127e12ebb 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -1,19 +1,23 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
-, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }:
+, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
- version = "4.0.7";
+ version = "4.1";
src = fetchFromGitHub {
repo = "pdfpc";
owner = "pdfpc";
rev = "v${version}";
- sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c";
+ sha256 = "02cp0x5prqrizxdp0sf2sk5ip0363vyw6fxsb3zwyx4dw0vz4g96";
};
- nativeBuildInputs = [ cmake pkgconfig vala ];
+ nativeBuildInputs = [
+ cmake pkgconfig vala
+ # For setup hook
+ gobjectIntrospection
+ ];
buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
libpthreadstubs makeWrapper librsvg pcre ];
diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix
index e01956e36119..e06f4407534b 100644
--- a/pkgs/applications/misc/pdfshuffler/default.nix
+++ b/pkgs/applications/misc/pdfshuffler/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchsvn
, wrapGAppsHook, makeWrapper, gettext
, python3Packages, gtk3, poppler_gi
-, gnome3, gsettings_desktop_schemas, shared_mime_info,
+, gnome3, gsettings-desktop-schemas, shared-mime-info,
}:
python3Packages.buildPythonApplication rec {
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ];
buildInputs = [
- gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme
+ gtk3 gsettings-desktop-schemas poppler_gi gnome3.adwaita-icon-theme
];
propagatedBuildInputs = with python3Packages; [
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
];
preFixup = ''
- gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
'';
doCheck = false; # no tests
diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix
index ad2ab147340e..d55c7a2af12b 100644
--- a/pkgs/applications/misc/pell/default.nix
+++ b/pkgs/applications/misc/pell/default.nix
@@ -2,21 +2,22 @@
stdenv.mkDerivation rec {
pname = "pell";
- version = "0.0.2";
+ version = "0.0.4";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "ebzzry";
repo = pname;
- rev = "ec14de0a9b666433954184167bf3b82cf21193f8";
- sha256 = "0r2gbb4l9rr5x99m62zicknsp1gf9fr124xpyd8ak9izr5hvskn9";
+ rev = "f251625ece6bb5517227970287119e7d2dfcea8b";
+ sha256 = "0k8m1lv2kyrs8fylxmbgxg3jn65g57frf2bndc82gkr5svwb554a";
};
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share
cp pell $out/bin
- cp resources/notification.mp3 $out/share
+ cp resources/online.mp3 $out/share
+ cp resources/offline.mp3 $out/share
chmod +x $out/bin/pell
'';
@@ -24,7 +25,8 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/pell --replace "/usr/bin/env scsh" "${scsh}/bin/scsh"
substituteInPlace $out/bin/pell --replace "(play " "(${sox}/bin/play "
substituteInPlace $out/bin/pell --replace "(notify-send " "(${libnotify}/bin/notify-send "
- substituteInPlace $out/bin/pell --replace "/usr/share/pell/notification.mp3" "$out/share/notification.mp3"
+ substituteInPlace $out/bin/pell --replace "/usr/share/pell/online.mp3" "$out/share/online.mp3"
+ substituteInPlace $out/bin/pell --replace "/usr/share/pell/offline.mp3" "$out/share/offline.mp3"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix
new file mode 100644
index 000000000000..746a319c2e1e
--- /dev/null
+++ b/pkgs/applications/misc/perkeep/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }:
+
+# When perkeep is updated all deps in the let block should be removed
+let
+ gopherjs = fetchFromGitHub {
+ owner = "gopherjs";
+ repo = "gopherjs";
+ # Rev matching https://github.com/perkeep/perkeep/commit/2e46fca5cc1179dbd90bec49fec3870e6eca6c45
+ rev = "b40cd48c38f9a18eb3db20d163bad78de12cf0b7";
+ sha256 = "0kniz8dg5bymb03qriizza1h3gpymf97vsgq9vd222282pdj0vyc";
+ };
+
+ gotool = fetchFromGitHub {
+ owner = "kisielk";
+ repo = "gotool";
+ rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+ };
+
+ gcimporter15 = fetchgit {
+ url = "https://go.googlesource.com/tools";
+ rev = "f8f2f88271bf2c23f28a09d288d26507a9503c97";
+ sha256 = "1pchwizx1sdli59g8r0p4djfjkchcvh8msfpp3ibvz3xl250jh0n";
+ };
+
+in
+stdenv.mkDerivation rec {
+ name = "perkeep-${version}";
+ version = "20170505";
+
+ src = fetchzip {
+ url = "https://perkeep.org/dl/monthly/camlistore-${version}-src.zip";
+ sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa";
+ };
+
+ # When perkeep is updated postPatch should be removed
+ postPatch = ''
+ rm -r ./vendor/github.com/gopherjs/gopherjs/
+ cp -a ${gopherjs} ./vendor/github.com/gopherjs/gopherjs
+ mkdir -p ./vendor/github.com/kisielk/
+ cp -a ${gotool} ./vendor/github.com/kisielk/gotool
+ mkdir -p ./vendor/golang.org/x/tools/go
+ cp -a ${gcimporter15}/go/gcimporter15 ./vendor/golang.org/x/tools/go/gcimporter15
+
+ substituteInPlace vendor/github.com/gopherjs/gopherjs/build/build.go \
+ --replace '"github.com/fsnotify/fsnotify"' 'fsnotify "camlistore.org/pkg/misc/fakefsnotify"'
+
+ substituteInPlace ./make.go \
+ --replace "goVersionMinor = '8'" "goVersionMinor = '9'" \
+ --replace "gopherJSGoMinor = '8'" "gopherJSGoMinor = '9'"
+ '';
+
+ buildInputs = [ git go ];
+
+ goPackagePath = "";
+ buildPhase = ''
+ go run make.go
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp bin/* $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)";
+ homepage = https://perkeep.org;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ cstrahan ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index fd66ce8fc31c..e08035aef571 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pgmanage-${version}";
- version = "10.0.2";
+ version = "10.1.0";
src = fetchFromGitHub {
owner = "pgManage";
repo = "pgManage";
rev = "v${version}";
- sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a";
+ sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw";
};
buildInputs = [ postgresql openssl ];
diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix
index 6d0a348b1f76..1085fed09565 100644
--- a/pkgs/applications/misc/pinfo/default.nix
+++ b/pkgs/applications/misc/pinfo/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
src = fetchurl {
# homepage needed you to login to download the tarball
- url = "http://pkgs.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2"
+ url = "http://src.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2"
+ "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2";
sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j";
};
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index 3f39a356312e..9fb15aab2d45 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -48,9 +48,9 @@ let
ld32 =
if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
- else abort "Unsupported platform for PlayOnLinux: ${stdenv.system}";
+ else throw "Unsupported platform for PlayOnLinux: ${stdenv.system}";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
- libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ];
+ libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xorg.libX11 ];
in stdenv.mkDerivation {
name = "playonlinux-${version}";
diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix
index 2472b05a2e0b..b14bb445b5d1 100644
--- a/pkgs/applications/misc/pmenu/default.nix
+++ b/pkgs/applications/misc/pmenu/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pmenu-${version}";
- version = "2017-04-10";
+ version = "2018-01-01";
src = fetchFromGitLab {
owner = "o9000";
repo = "pmenu";
- rev = "87fec9ddf594f1046d03348de2bafcfa6e94cfd1";
- sha256 = "0ynhml46bi5k52v7fw2pjpcac9dswkmlvh6gynvnyqjp4p153fl4";
+ rev = "f98a5bdf20deb0b7f0543e5ce6a8f5574f695e07";
+ sha256 = "131nqafbmbfpgsgss27pz4cyb9fb29m5h1ai1fyvcn286rr9dnp2";
};
nativeBuildInputs = [ python2Packages.wrapPython ];
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index e88a49740745..a3b87fd34f68 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -21,11 +21,11 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;
stdenv.mkDerivation rec {
name = "polybar-${version}";
- version = "3.0.5";
+ version = "3.1.0";
src = fetchgit {
url = "https://github.com/jaagr/polybar";
- rev = "4e2e2a7a5e0fe81669031ade0f60e1d379b6516d";
- sha256 = "1iiks9q13pbkgbjhdns18a5zgr6d40ydcm4qn168m73fs6ivf1vn";
+ rev = "bf16a4d415ea7d8845f578544de0c71e56ad314e";
+ sha256 = "1jcvqxl0477j0snvh1rzqsm1dkfsybix2lgrlsgiczdxfknwz8iy";
};
meta = with stdenv.lib; {
@@ -39,14 +39,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.afldcr ];
platforms = platforms.unix;
};
- # This patch should be removed with next stable release.
- patches = [
- (fetchpatch {
- name = "polybar-remove-curlbuild.patch";
- url = "https://github.com/jaagr/polybar/commit/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch";
- sha256 = "14xr65vsjvd51hzg9linj09w0nnixgn26dh9lqxy25bxachcyzxy";
- })
- ];
buildInputs = [
cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index b62c6b77cac3..cd3a46ab09ba 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -3,7 +3,14 @@
stdenv.mkDerivation {
name = "procmail-3.22";
- patches = [ ./CVE-2014-3618.patch ];
+ patches = [
+ ./CVE-2014-3618.patch
+ (fetchurl {
+ url = https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30;
+ sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq";
+ name = "CVE-2017-16844";
+ })
+ ];
# getline is defined differently in glibc now. So rename it.
# Without the .PHONY target "make install" won't install anything on Darwin.
diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix
new file mode 100644
index 000000000000..5ba8e1b6e313
--- /dev/null
+++ b/pkgs/applications/misc/projectlibre/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }:
+
+stdenv.mkDerivation rec {
+ name = "projectlibre-${version}";
+ version = "1.7.0";
+
+ src = fetchgit {
+ url = "https://git.code.sf.net/p/projectlibre/code";
+ rev = "0c939507cc63e9eaeb855437189cdec79e9386c2"; # version 1.7.0 was not tagged
+ sha256 = "0vy5vgbp45ai957gaby2dj1hvmbxfdlfnwcanwqm9f8q16qipdbq";
+ };
+
+ buildInputs = [ ant jdk makeWrapper ];
+ buildPhase = ''
+ export ANT_OPTS=-Dbuild.sysclasspath=ignore
+ ${ant}/bin/ant -f openproj_build/build.xml
+ '';
+
+ resourcesPath = "openproj_build/resources";
+ desktopItem = "${resourcesPath}/projectlibre.desktop";
+
+ installPhase = ''
+ mkdir -p $out/share/{applications,projectlibre/samples,pixmaps,doc/projectlibre} $out/bin
+
+ substitute $resourcesPath/projectlibre $out/bin/projectlibre \
+ --replace "\"/usr/share/projectlibre\"" "\"$out/share/projectlibre\""
+ chmod +x $out/bin/projectlibre
+ wrapProgram $out/bin/projectlibre \
+ --prefix PATH : "${jre}/bin:${coreutils}/bin:${which}/bin"
+
+ cp -R openproj_build/dist/* $out/share/projectlibre
+ cp -R openproj_build/license $out/share/doc/projectlibre
+ cp $desktopItem $out/share/applications
+ cp $resourcesPath/projectlibre.png $out/share/pixmaps
+ cp -R $resourcesPath/samples/* $out/share/projectlibre/samples
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://www.projectlibre.com/";
+ description = "Project-Management Software similar to MS-Project";
+ maintainers = [ maintainers.Mogria ];
+ license = licenses.cpal10;
+ };
+}
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index a13f2bef0c65..556889e126c0 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Show the set of running processes as a tree";
license = "GPL";
- maintainers = [ stdenv.lib.maintainers.mornfall ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix
index abb1fb596fac..af74ea570ab3 100644
--- a/pkgs/applications/misc/ptask/default.nix
+++ b/pkgs/applications/misc/ptask/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = http://wpitchoune.net/ptask/;
description = "GTK-based GUI for taskwarrior";
license = licenses.gpl2;
- maintainer = [ maintainers.spacefrogg ];
+ maintainers = [ maintainers.spacefrogg ];
};
}
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index ecc4c341a686..dcbd14198f76 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchFromGitHub, perl, python2Packages, sqlite, gpsbabel
+{ stdenv, fetchFromGitHub, perl, python, sqlite, gpsbabel
, withWebKit ? false }:
let
# Pytrainer needs a matplotlib with GTK backend. Also ensure we are
# using the pygtk with glade support as needed by pytrainer.
- matplotlibGtk = python2Packages.matplotlib.override {
+ matplotlibGtk = python.pkgs.matplotlib.override {
enableGtk2 = true;
- pygtk = python2Packages.pyGtkGlade;
+ pygtk = python.pkgs.pyGtkGlade;
};
in
-python2Packages.buildPythonApplication rec {
+python.pkgs.buildPythonApplication rec {
name = "pytrainer-${version}";
- version = "1.11.0";
+ version = "1.12.0";
src = fetchFromGitHub {
owner = "pytrainer";
repo = "pytrainer";
rev = "v${version}";
- sha256 = "1x4f1ydjql0aisvxs5kyi9lx35b4q3768dx42fyzq1nxdwzaqyvy";
+ sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581";
};
namePrefix = "";
@@ -35,8 +35,13 @@ python2Packages.buildPythonApplication rec {
./pytrainer-webkit.patch
];
- propagatedBuildInputs = with python2Packages; [
- dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate
+ postPatch = ''
+ substituteInPlace ./setup.py \
+ --replace "'mysqlclient'," ""
+ '';
+
+ propagatedBuildInputs = with python.pkgs; [
+ dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy sqlalchemy_migrate psycopg2
] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ];
buildInputs = [ perl gpsbabel sqlite ];
@@ -45,6 +50,10 @@ python2Packages.buildPythonApplication rec {
dontPatchELF = true;
dontStrip = true;
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover
+ '';
+
meta = with stdenv.lib; {
homepage = https://github.com/pytrainer/pytrainer/wiki;
description = "Application for logging and graphing sporting excursions";
diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch
index 359e28c41c34..761064077a98 100644
--- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch
+++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch
@@ -1,7 +1,7 @@
-diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py
---- pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py 1980-01-02 00:00:00.000000000 +0100
-+++ pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py 2017-09-30 18:56:43.127016847 +0200
-@@ -69,7 +69,7 @@ class ActivityTest(unittest.TestCase):
+diff -Nurp source.orig/pytrainer/test/core/test_activity.py source/pytrainer/test/core/test_activity.py
+--- source.orig/pytrainer/test/core/test_activity.py 2018-02-27 22:15:32.078243354 +0100
++++ source/pytrainer/test/core/test_activity.py 2018-02-27 22:16:33.936867052 +0100
+@@ -92,7 +92,7 @@ class ActivityTest(unittest.TestCase):
self.assertEquals(self.activity.time, self.activity.duration)
def test_activity_starttime(self):
@@ -10,10 +10,10 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1
def test_activity_time_tuple(self):
self.assertEquals(self.activity.time_tuple, (2, 3, 46))
-diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py
---- pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py 1980-01-02 00:00:00.000000000 +0100
-+++ pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py 2017-09-30 18:55:45.078128980 +0200
-@@ -23,7 +23,7 @@ class GarminTCXv2Test(unittest.TestCase)
+diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrainer/test/imports/test_garmintcxv2.py
+--- source.orig/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:15:32.079243364 +0100
++++ source/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:17:10.778333751 +0100
+@@ -39,7 +39,7 @@ class GarminTCXv2Test(unittest.TestCase)
self.fail()
def test_workout_summary(self):
@@ -22,9 +22,18 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrai
try:
current_path = os.path.dirname(os.path.abspath(__file__))
data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/"
-diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py
---- pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py 1980-01-02 00:00:00.000000000 +0100
-+++ pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py 2017-09-30 18:56:23.448720166 +0200
+@@ -52,7 +52,7 @@ class GarminTCXv2Test(unittest.TestCase)
+ self.fail()
+
+ def test_summary_in_database(self):
+- summary = [(0, True, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')]
++ summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')]
+ activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1')
+ self.ddbb.session.add(activity)
+ self.ddbb.session.commit()
+diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py
+--- source.orig/pytrainer/test/lib/test_date.py 2018-02-27 22:15:32.079243364 +0100
++++ source/pytrainer/test/lib/test_date.py 2018-02-27 22:16:33.936867052 +0100
@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase
def test_getDateTime(self):
utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015')
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index 60a8cf2c6cd1..e162d0d317f7 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
name = "qlcplus-${version}";
- version = "4.11.0";
+ version = "4.11.1";
src = fetchFromGitHub {
owner = "mcallegari";
repo = "qlcplus";
rev = "QLC+_${version}";
- sha256 = "0a45ww341yjx9k54j5s8b5wj83rgbwxkdvgy0v5jbbdf9m78ifrg";
+ sha256 = "0lb1mdp7kbnkja14phgyknr65irwkxcmzk96rqacysvwrvzvfzyd";
};
nativeBuildInputs = [ qmake pkgconfig ];
@@ -34,5 +34,6 @@ mkDerivation rec {
maintainers = [ maintainers.globin ];
license = licenses.asl20;
platforms = platforms.all;
+ homepage = "http://www.qlcplus.org/";
};
}
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index 7330dfa4f199..bc09d0b4d0ac 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchFromBitbucket, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
+{ stdenv, fetchurl, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
stdenv.mkDerivation rec {
name = "qmapshack-${version}";
- version = "1.9.1";
+ version = "1.10.0";
- src = fetchFromBitbucket {
- owner = "maproom";
- repo = "qmapshack";
- rev = "V%20${version}";
- sha256 = "1yswdq1s9jjhwb3wfiy3kkiiaqzagw28vjqvl13jxcnmq7y763sr";
+ src = fetchurl {
+ url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
+ sha256 = "10qk6c5myw5dhkbw7pcrx3900kiqhs32vy47xl2844nzb4fq2liw";
};
nativeBuildInputs = [ cmake ];
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
description = "Plan your next outdoor trip";
license = licenses.gpl3;
- maintainter = with maintainers; [ dotlambda ];
+ maintainers = with maintainers; [ dotlambda ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix
index 932d8156a79a..49993f2f7ea7 100644
--- a/pkgs/applications/misc/qmetro/default.nix
+++ b/pkgs/applications/misc/qmetro/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
description = "Worldwide transit maps viewer";
license = licenses.gpl3;
- maintainter = with maintainers; [ orivej ];
+ maintainers = with maintainers; [ orivej ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index bc909742c6df..88628c63c9ce 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -1,8 +1,9 @@
-{ mkDerivation, stdenv, lib, fetchFromGitHub, procps ? null
+{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null
, qtbase, qtwebengine, qtwebkit
, cmake
-, syncthing, syncthing-inotify ? null
-, preferQWebView ? false }:
+, syncthing
+, preferQWebView ? false
+, preferNative ? true }:
mkDerivation rec {
version = "0.5.8";
@@ -16,17 +17,23 @@ mkDerivation rec {
};
buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit;
+
nativeBuildInputs = [ cmake ];
- cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1";
+ cmakeFlags = [ ]
+ ++ lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"
+ ++ lib.optional preferNative "-DQST_BUILD_NATIVEBROWSER=1";
- patches = [ ./qsyncthingtray-0.5.8-qt-5.6.3.patch ];
+ patches = [ (fetchpatch {
+ name = "support_native_browser.patch";
+ url = "https://patch-diff.githubusercontent.com/raw/sieren/QSyncthingTray/pull/225.patch";
+ sha256 = "0w665xdlsbjxs977pdpzaclxpswf7xys1q3rxriz181lhk2y66yy";
+ }) ] ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch;
postPatch = ''
${lib.optionalString stdenv.isLinux ''
substituteInPlace includes/platforms/linux/posixUtils.hpp \
--replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \
- --replace '"/usr/local/bin/syncthing-inotify"' '"${syncthing-inotify}/bin/syncthing-inotify"' \
--replace '"pgrep -x' '"${procps}/bin/pgrep -x'
''}
@@ -60,6 +67,8 @@ mkDerivation rec {
maintainers = with maintainers; [ zraexy peterhoeg ];
platforms = platforms.all;
# 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
- broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
+ # but qt > 5.6 works when only using the native browser
+ # https://github.com/sieren/QSyncthingTray/issues/223
+ broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative);
};
}
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index d300e411c942..e03dd65b9eb3 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -2,32 +2,29 @@
stdenv.mkDerivation rec {
name = "qtpass-${version}";
- version = "1.1.6";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "IJHack";
repo = "QtPass";
rev = "v${version}";
- sha256 = "0jq5a1cvqvsjwld0nldl6kmcz9g59hiccmbg98xwji04n8174y7j";
+ sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8";
};
+ patches = [ ./hidpi.patch ];
+
buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
nativeBuildInputs = [ makeWrapper qmake ];
- preConfigure = ''
- qmakeFlags="$qmakeFlags DESTDIR=$out"
- '';
-
- installPhase = ''
- mkdir $out/bin
- mv $out/qtpass $out/bin
- install -D {,$out/share/applications/}qtpass.desktop
- install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
- runHook postInstall
+ postPatch = ''
+ substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main"
+ substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src"
'';
postInstall = ''
+ install -D qtpass.desktop $out/share/applications/qtpass.desktop
+ install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
wrapProgram $out/bin/qtpass \
--suffix PATH : ${git}/bin \
--suffix PATH : ${gnupg}/bin \
diff --git a/pkgs/applications/misc/qtpass/hidpi.patch b/pkgs/applications/misc/qtpass/hidpi.patch
new file mode 100644
index 000000000000..629bcbb5baca
--- /dev/null
+++ b/pkgs/applications/misc/qtpass/hidpi.patch
@@ -0,0 +1,13 @@
+diff --git a/main/main.cpp b/main/main.cpp
+index 8a18409c..1cddd911 100644
+--- a/main/main.cpp
++++ b/main/main.cpp
+@@ -35,7 +35,7 @@
+ * @return
+ */
+ int main(int argc, char *argv[]) {
+- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
++ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QString text = "";
+ for (int i = 1; i < argc; ++i) {
+ if (i > 1)
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index f3198085b9ab..b13bc4cb7af2 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, file, less
+{ stdenv, fetchFromGitHub, pythonPackages, file, less
, imagePreviewSupport ? true, w3m ? null}:
with stdenv.lib;
@@ -6,18 +6,14 @@ with stdenv.lib;
assert imagePreviewSupport -> w3m != null;
pythonPackages.buildPythonApplication rec {
- name = "ranger-1.8.1";
+ name = "ranger-${version}";
+ version = "1.9.1";
- meta = {
- description = "File manager with minimalistic curses interface";
- homepage = http://ranger.nongnu.org/;
- license = stdenv.lib.licenses.gpl3;
- platforms = stdenv.lib.platforms.unix;
- };
-
- src = fetchurl {
- url = "http://ranger.nongnu.org/${name}.tar.gz";
- sha256 = "1d11qw0mr9aj22a7nhr6p2c3yzf359xbffmjsjblq44bjpwzjcql";
+ src = fetchFromGitHub {
+ owner = "ranger";
+ repo = "ranger";
+ rev = "v${version}";
+ sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj";
};
checkInputs = with pythonPackages; [ pytest ];
@@ -50,4 +46,11 @@ pythonPackages.buildPythonApplication rec {
--replace "set preview_images false" "set preview_images true" \
'';
+ meta = with stdenv.lib; {
+ description = "File manager with minimalistic curses interface";
+ homepage = http://ranger.github.io/;
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.magnetophon ];
+ };
}
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 59d22b967b57..169d6951d455 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchgit, pkgconfig , libssh2
+{ stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
-, qtsvg, qttools, qtquick1
+, qtsvg, qttools, qtquick1, qtcharts
, qmake
}:
@@ -15,30 +15,35 @@ in
stdenv.mkDerivation rec {
name = "redis-desktop-manager-${version}";
- version = "0.8.3";
+ version = "0.9.0-alpha5";
src = fetchgit {
url = "https://github.com/uglide/RedisDesktopManager.git";
fetchSubmodules = true;
rev = "refs/tags/${version}";
- sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
+ sha256 = "1grw4zng0ff0lvplzzld133hlz6zjn5f5hl3z6z7kc1nq5642yr9";
};
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
- qtquick1 qtquickcontrols qtsvg qttools
+ qtquick1 qtquickcontrols qtsvg qttools qtcharts
];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d.patch";
+ sha256 = "1bcamjkmif62rb0lbp111r0ppf4raqw664m5by7vr3pdkcjbbilq";
+ })
+ ];
+
+ patchFlags = "-d 3rdparty/gbreakpad -p1";
+
dontUseQmakeConfigure = true;
buildPhase = ''
srcdir=$PWD
- substituteInPlace src/resources/qml/ValueTabs.qml \
- --replace "import QtQuick.Controls 1.4" \
- "import QtQuick.Controls 1.2"
-
cat < src/version.h
#ifndef RDM_VERSION
#define RDM_VERSION "${version}-120"
@@ -71,7 +76,7 @@ EOF
meta = with lib; {
description = "Cross-platform open source Redis DB management tool";
- homepage = http://redisdesktop.com/;
+ homepage = https://redisdesktop.com/;
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/misc/redshift/575.patch b/pkgs/applications/misc/redshift/575.patch
new file mode 100644
index 000000000000..d731d8ec43ad
--- /dev/null
+++ b/pkgs/applications/misc/redshift/575.patch
@@ -0,0 +1,51 @@
+From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001
+From: Yegor Timoshenko
+Date: Tue, 16 Jan 2018 11:43:46 +0000
+Subject: [PATCH] Fix Autoconf script
+
+gettext/intltool macros are not used correctly, see:
+https://bugs.launchpad.net/inkscape/+bug/1418943
+---
+ bootstrap | 6 +-----
+ configure.ac | 5 +----
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/bootstrap b/bootstrap
+index 0599cf5..40b1dca 100755
+--- a/bootstrap
++++ b/bootstrap
+@@ -1,7 +1,3 @@
+ #!/bin/sh
+
+-# change to root directory
+-cd $(dirname "$0")
+-
+-autopoint --force && \
+- AUTOPOINT="intltoolize --automake --copy" autoreconf --force --install --verbose
++autoreconf --force --install && intltoolize
+diff --git a/configure.ac b/configure.ac
+index be0b51a..a2e7c42 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,6 +17,7 @@ AC_PROG_OBJC # For macOS support modules
+ AC_LANG([C])
+
+ AC_PROG_INTLTOOL([0.50])
++AC_SUBST(LIBINTL)
+
+ AC_CANONICAL_HOST
+
+@@ -51,10 +52,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [
+ ])
+ AC_LANG_POP([Objective C])
+
+-# Checks for libraries.
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
+-
+ GETTEXT_PACKAGE=redshift
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+--
+2.15.1
+
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 3fe0503d7f9d..b7ab092bbc04 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -1,68 +1,65 @@
-{ fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig
-, geoclue2
-, guiSupport ? true, hicolor_icon_theme, librsvg, gtk3, python, pygobject3, pyxdg
-, drmSupport ? true, libdrm
-, randrSupport ? true, libxcb
-, vidModeSupport ? true, libX11, libXxf86vm
-}:
+{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool
+, libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection
+, gtk3, python, pygobject3, pyxdg, libdrm, libxcb, hicolor-icon-theme }:
-let
- mkFlag = flag: name: if flag
- then "--enable-${name}"
- else "--disable-${name}";
-in
stdenv.mkDerivation rec {
name = "redshift-${version}";
version = "1.11";
- src = fetchurl {
- sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh";
- url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz";
+ src = fetchFromGitHub {
+ owner = "jonls";
+ repo = "redshift";
+ rev = "v${version}";
+ sha256 = "0jfi4wqklqw2rm0r2xwalyzir88zkdvqj0z5id0l5v20vsrfiiyj";
};
- buildInputs = [ geoclue2 ]
- ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme librsvg gtk3
- python pygobject3 pyxdg ]
- ++ stdenv.lib.optionals drmSupport [ libdrm ]
- ++ stdenv.lib.optionals randrSupport [ libxcb ]
- ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ];
- nativeBuildInputs = [ gettext intltool makeWrapper pkgconfig ];
-
- configureFlags = [
- (mkFlag guiSupport "gui")
- (mkFlag drmSupport "drm")
- (mkFlag randrSupport "randr")
- (mkFlag vidModeSupport "vidmode")
+ patches = [
+ # https://github.com/jonls/redshift/pull/575
+ ./575.patch
];
+ nativeBuildInputs = [
+ autoconf
+ automake
+ gettext
+ intltool
+ libtool
+ pkgconfig
+ wrapGAppsHook
+ wrapPython
+ ];
+
+ buildInputs = [
+ geoclue2
+ gobjectIntrospection
+ gtk3
+ libdrm
+ libxcb
+ python
+ hicolor-icon-theme
+ ];
+
+ pythonPath = [ pygobject3 pyxdg ];
+
+ preConfigure = "./bootstrap";
+
+ postFixup = "wrapPythonPrograms";
+
enableParallelBuilding = true;
- preInstall = stdenv.lib.optionalString guiSupport ''
- substituteInPlace src/redshift-gtk/redshift-gtk \
- --replace "/usr/bin/env python3" "${python}/bin/${python.executable}"
- '';
- postInstall = stdenv.lib.optionalString guiSupport ''
- wrapProgram "$out/bin/redshift-gtk" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix PYTHONPATH : "$PYTHONPATH" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share"
-
- install -Dm644 {.,$out/share/doc/redshift}/redshift.conf.sample
- '';
-
meta = with stdenv.lib; {
- description = "Gradually change screen color temperature";
+ description = "Screen color temperature manager";
longDescription = ''
- The color temperature is set 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.
+ 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.linux;
- maintainers = with maintainers; [ mornfall nckx ];
- };
+ maintainers = with maintainers; [ yegortimoshenko ];
+ };
}
diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix
new file mode 100644
index 000000000000..c1b1cfb48a28
--- /dev/null
+++ b/pkgs/applications/misc/regextester/default.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, fetchFromGitHub
+, gettext
+, libxml2
+, pkgconfig
+, gtk3
+, granite
+, gnome3
+, cmake
+, ninja
+, vala
+, elementary-cmake-modules
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "regextester-${version}";
+ version = "0.1.7";
+
+ src = fetchFromGitHub {
+ owner = "artemanufrij";
+ repo = "regextester";
+ rev = version;
+ sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n";
+ };
+
+ XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
+ "${granite}/share"
+ "${gnome3.libgee}/share"
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ wrapGAppsHook
+ vala
+ cmake
+ ninja
+ gettext
+ libxml2
+ elementary-cmake-modules
+ ];
+ buildInputs = [
+ gtk3
+ granite
+ gnome3.libgee
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A desktop application to test regular expressions interactively";
+ homepage = https://github.com/artemanufrij/regextester;
+ maintainers = with maintainers; [ samdroid-apps ];
+ platforms = platforms.linux;
+ license = licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 7ad8a85a419c..57cdfd08d5b0 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -11,33 +11,26 @@ let
url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
sha256 = "0b56iglg8g45biddwsdn1hmx9gsz4kxr64civwyy7f69f022ppab";
};
-
-in
-
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
# https://www.rescuetime.com/updates/linux_release_notes.html
name = "rescuetime-2.10.0.1322";
inherit src;
buildInputs = [ dpkg makeWrapper ];
+ # avoid https://github.com/NixOS/patchelf/issues/99
+ dontStrip = true;
unpackPhase = ''
mkdir pkg
dpkg-deb -x $src pkg
sourceRoot=pkg
'';
- installPhase = let
-
- lib = p: stdenv.lib.makeLibraryPath [ p ];
-
- in ''
+ installPhase = ''
mkdir -p $out/bin
cp usr/bin/rescuetime $out/bin
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${lib.makeLibraryPath [ qt4 libXtst libXext libX11 libXScrnSaver ]}" \
$out/bin/rescuetime
-
- wrapProgram $out/bin/rescuetime \
- --prefix LD_PRELOAD : ${lib qt4}/libQtGui.so.4:${lib qt4}/libQtCore.so.4:${lib libXtst}/libXtst.so.6:${lib libXext}/libXext.so.6:${lib libX11}/libX11.so.6:${lib libXScrnSaver}/libXss.so.1
'';
meta = with lib; {
description = "Helps you understand your daily habits so you can focus and be more productive";
diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
index fc7ff4842394..8928ee18064d 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/icons
cp ${icon} $out/share/icons/robomongo.png
- patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robo3t
+ patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robo3t
mkdir $out/bin
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://robomongo.org/;
description = "Query GUI for mongodb";
- platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64;
+ platforms = [ "x86_64-linux" ];
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.eperuffo ];
};
diff --git a/pkgs/applications/misc/rofi/config.patch b/pkgs/applications/misc/rofi/config.patch
new file mode 100644
index 000000000000..46982d51e00c
--- /dev/null
+++ b/pkgs/applications/misc/rofi/config.patch
@@ -0,0 +1,54 @@
+diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
+index 0646e4bc..f827dbfe 100755
+--- a/script/rofi-theme-selector
++++ b/script/rofi-theme-selector
+@@ -42,34 +42,7 @@ function find_themes()
+ DIRS=${XDG_DATA_DIRS}
+ OLDIFS=${IFS}
+ IFS=:
+- if [ -z "${XDG_DATA_DIRS}" ]
+- then
+- echo "XDG_DATA_DIRS needs to be set for this script to function correctly."
+- echo -n "Using dirs from \$PATH: "
+- DIRS=
+- # Iterate over items in $PATH
+- for p in ${PATH}; do
+- # Remove trailing / if exists.
+- x=${p%/}
+- # remove both /bin and /sbin and /games from end
+- x=${x%/bin}
+- x=${x%/sbin}
+- x=${x%/games}
+- # Add /share
+- x=${x}/share
+- # Check if entry exists Prepend : so :${x}: matches nicely
+- case ":${DIRS}" in
+- *$x:*);;
+- *) DIRS+="$x:";;
+- esac
+- done
+- # Remove trailing :
+- DIRS=${DIRS%:}
+- echo "${DIRS}"
+- fi
+- # Add user dir.
+- DIRS+=":${HOME}/.local/share/"
+- DIRS+=":${HOME}/.config/"
++ DIRS+=":%ROFIOUT%/"
+ for p in ${DIRS}; do
+ p=${p%/}
+ TD=${p}/rofi/themes
+@@ -164,7 +137,12 @@ Current theme: ${CUR}"""
+ ###
+ function set_theme()
+ {
+- CDIR="${HOME}/.config/rofi/"
++ if [ -d "${XDG_CONFIG_HOME}" ]; then
++ CDIR="${XDG_CONFIG_HOME}/rofi/"
++ else
++ CDIR="${HOME}/.config/rofi/"
++ fi
++
+ if [ ! -d "${CDIR}" ]
+ then
+ mkdir -p ${CDIR}
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index bdf14c03bcc2..734adf3eb589 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -4,25 +4,33 @@
}:
stdenv.mkDerivation rec {
- version = "1.4.2";
+ version = "1.5.0";
name = "rofi-${version}";
src = fetchurl {
url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz";
- sha256 = "0ys7grazqz5hw3nx2393df54ykcd5gw0zn66kik5fvzijpg3qfcx";
+ sha256 = "0h068wqf0n6gmil2g3lh263pm7spkp4k5rxbnfp52n8izqgyf7al";
};
+ # config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781
+ patches = [ ./config.patch ];
+
preConfigure = ''
patchShebangs "script"
# root not present in build /etc/passwd
sed -i 's/~root/~nobody/g' test/helper-expand.c
'';
+ postFixup = ''
+ substituteInPlace "$out"/bin/rofi-theme-selector \
+ --replace "%ROFIOUT%" "$out/share"
+ '';
+
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
];
- doCheck = true;
+ doCheck = false;
meta = with stdenv.lib; {
description = "Window switcher, run dialog and dmenu replacement";
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index cbf602b75dab..1d0c7d28de6e 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext
-, gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme
+{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext
+, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme
, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
, pkgconfig, python, pythonPackages, vte
, wrapGAppsHook}:
@@ -22,11 +22,11 @@ in stdenv.mkDerivation rec {
buildInputs =
[ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
- makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib
- gdk_pixbuf gsettings_desktop_schemas gtk3
- hicolor_icon_theme vte ];
+ makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib
+ gdk_pixbuf gsettings-desktop-schemas gtk3
+ hicolor-icon-theme vte ];
- NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
+ NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"
"-I${dbus_libs.dev}/include/dbus-1.0"
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix
index 652dd9d5e650..f1c3cbc55577 100644
--- a/pkgs/applications/misc/rtl-sdr/default.nix
+++ b/pkgs/applications/misc/rtl-sdr/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
# /etc/udev/rules.d/, and there is no option to install elsewhere. So install
# rules manually.
# * Propagate libusb-1.0 dependency in pkg-config file.
- postInstall = ''
+ postInstall = stdenv.lib.optionalString stdenv.isLinux ''
mkdir -p "$out/etc/udev/rules.d/"
cp ../rtl-sdr.rules "$out/etc/udev/rules.d/99-rtl-sdr.rules"
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr;
license = licenses.gpl2Plus;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
};
}
diff --git a/pkgs/applications/misc/rtl_433/default.nix b/pkgs/applications/misc/rtl_433/default.nix
new file mode 100644
index 000000000000..819c6c9391a9
--- /dev/null
+++ b/pkgs/applications/misc/rtl_433/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }:
+stdenv.mkDerivation rec {
+
+ version = "2018-02-23";
+ name = "rtl_433-${version}";
+
+ src = fetchFromGitHub {
+ owner = "merbanan";
+ repo = "rtl_433";
+ rev = "51d275c";
+ sha256 = "1j443wmws5xgc18s47bvw3pqljk747izypz52rmlrvs16v96cg2g";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+ buildInputs = [ libusb1 rtl-sdr ];
+
+ meta = with stdenv.lib; {
+ description = "Decode traffic from devices that broadcast on 433.9 MHz";
+ homepage = https://github.com/merbanan/rtl_433;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ earldouglas ];
+ platforms = platforms.all;
+ };
+
+}
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 02af4c28d593..5ca8bfcf5dfe 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -2,14 +2,14 @@
with pythonPackages;
buildPythonApplication rec {
- version = "1.19.0";
+ version = "1.22.1";
name = "rtv-${version}";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
- sha256 = "19rnw9cac06ns10vqn2cj0v61ycrj9g1ysa3hncamwxxibmkycp7";
+ sha256 = "1jil8cwhnpf2mclgah7s79j4c38hzm0j6di2mffrqhlsnn2vxbf4";
};
# Tests try to access network
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 281f2176833a..4ee9f461760c 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (rec {
inherit description;
homepage = http://software.schmorp.de/pkg/rxvt-unicode.html;
downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/";
- maintainers = [ maintainers.mornfall ];
+ maintainers = [ ];
platforms = platforms.unix;
};
})
diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 17798bb01e2d..7c74bb6cd459 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sakura-${version}";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchurl {
url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
- sha256 = "1vj07xnkalb8q6ippf4bmv5cf4266p1j9m80sxb6hncx0h8paj04";
+ sha256 = "0fhcn3540iw22l5zg3njh5z8cj0g2n9p6fvagjqa5zc323jfsc7b";
};
nativeBuildInputs = [ cmake perl pkgconfig ];
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index c093a7516031..e664a5a75274 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }:
stdenv.mkDerivation rec {
- version = "0.6.0";
+ version = "0.7.0";
name = "sc-im-${version}";
src = fetchFromGitHub {
owner = "andmarti1424";
repo = "sc-im";
rev = "v${version}";
- sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj";
+ sha256 = "0xi0n9qzby012y2j7hg4fgcwyly698sfi4i9gkvy0q682jihprbk";
};
nativeBuildInputs = [ pkgconfig ];
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
buildPhase = ''
cd src
+ sed 's/LDLIBS += -lm/& -lncurses/' -i Makefile
+
sed -e "\|^prefix = /usr/local| s|/usr/local|$out|" \
-e "\|^#LDLIBS += -lxlsreader| s|^#|| " \
-e "\|^#CFLAGS += -DXLS| s|^#|| " \
diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
new file mode 100644
index 000000000000..2c8753efcd74
--- /dev/null
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub
+, cmake, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook
+, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2 }:
+
+
+let
+ version = "0.5.4";
+ sqlGda = libgda.override {
+ mysqlSupport = true;
+ postgresSupport = true;
+ };
+
+in stdenv.mkDerivation rec {
+ name = "sequeler-${version}";
+
+ src = fetchFromGitHub {
+ owner = "Alecaddd";
+ repo = "sequeler";
+ rev = "v${version}";
+ sha256 = "05c7y6xdyq3h9bn90pbz03jhy9kabmgpxi4zz0i26q0qphljskbx";
+ };
+
+ nativeBuildInputs = [ cmake ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook ];
+
+ buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 ];
+
+ meta = with stdenv.lib; {
+ description = "Friendly SQL Client";
+ longDescription = ''
+ Sequeler is a native Linux SQL client built in Vala and Gtk. It allows you
+ to connect to your local and remote databases, write SQL in a handy text
+ editor with language recognition, and visualize SELECT results in a
+ Gtk.Grid Widget.
+ '';
+ homepage = https://github.com/Alecaddd/sequeler;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.etu ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix
new file mode 100644
index 000000000000..622f6e147524
--- /dev/null
+++ b/pkgs/applications/misc/sigal/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildPythonApplication, fetchPypi, pythonPackages }:
+
+buildPythonApplication rec {
+ version = "1.4.0";
+ pname = "sigal";
+
+ src = fetchPypi {
+ inherit version pname;
+ sha256 = "0da0n8jhjp2swr18zga87xc77r8c7qwqf5sp222ph9sn3yyyc35i";
+ };
+
+ buildInputs = with pythonPackages; [ pytest ];
+ propagatedBuildInputs = with pythonPackages; [
+ jinja2
+ markdown
+ pillow
+ pilkit
+ clint
+ click
+ blinker
+ ];
+
+ # No tests included
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Yet another simple static gallery generator";
+ homepage = http://sigal.saimon.org/en/latest/index.html;
+ license = licenses.mit;
+ maintainers = with maintainers; [ domenkozar matthiasbeyer ];
+ };
+}
+
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 7367c8207054..7fbf11573c49 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@
buildCommand = let
packages = [
- stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3
+ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix
index 712b5a7e750f..fc6be074a079 100644
--- a/pkgs/applications/misc/slade/default.nix
+++ b/pkgs/applications/misc/slade/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Doom editor";
homepage = http://slade.mancubus.net/;
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix
new file mode 100644
index 000000000000..9ee30d347b0a
--- /dev/null
+++ b/pkgs/applications/misc/slade/git.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:
+
+stdenv.mkDerivation {
+ name = "slade-git-3.1.2.2018.01.29";
+
+ src = fetchFromGitHub {
+ owner = "sirjuddington";
+ repo = "SLADE";
+ rev = "f7409c504b40c4962f419038db934c32688ddd2e";
+ sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld";
+ };
+
+ cmakeFlags = ["-DNO_WEBVIEW=1"];
+ nativeBuildInputs = [ cmake pkgconfig zip ];
+ buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Doom editor";
+ homepage = http://slade.mancubus.net/;
+ license = licenses.gpl2Plus;
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ maintainers = with maintainers; [ ertes ];
+ };
+}
diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix
new file mode 100644
index 000000000000..3a55ea6205ec
--- /dev/null
+++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix
@@ -0,0 +1,102 @@
+{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
+ boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU,
+ glew, eigen }:
+let
+ AlienWxWidgets = perlPackages.buildPerlPackage rec {
+ name = "Alien-wxWidgets-0.69";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz";
+ sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr";
+ };
+ propagatedBuildInputs = [
+ pkgconfig perlPackages.ModulePluggable perlPackages.ModuleBuild
+ gtk2 gtk3 wxGTK30
+ ];
+ };
+
+ Wx = perlPackages.Wx.overrideAttrs (oldAttrs: {
+ propagatedBuildInputs = [
+ perlPackages.ExtUtilsXSpp
+ AlienWxWidgets
+ ];
+ });
+
+ WxGLCanvas = perlPackages.buildPerlPackage rec {
+ name = "Wx-GLCanvas-0.09";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz";
+ sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka";
+ };
+ propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ];
+ doCheck = false;
+ };
+in
+stdenv.mkDerivation rec {
+ name = "slic3r-prusa-edition-${version}";
+ version = "1.39.1";
+
+ enableParallelBuilding = true;
+
+ buildInputs = [
+ cmake
+ perl
+ makeWrapper
+ eigen
+ glew
+ tbb
+ which
+ Wx
+ WxGLCanvas
+ ] ++ (with perlPackages; [
+ boost
+ ClassXSAccessor
+ EncodeLocale
+ ExtUtilsMakeMaker
+ ExtUtilsXSpp
+ GrowlGNTP
+ ImportInto
+ IOStringy
+ locallib
+ LWP
+ MathClipper
+ MathConvexHullMonotoneChain
+ MathGeometryVoronoi
+ MathPlanePath
+ ModuleBuild
+ Moo
+ NetDBus
+ OpenGL
+ threads
+ XMLSAX
+ ]);
+
+ prePatch = ''
+ sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp
+ '';
+
+ postInstall = ''
+ echo 'postInstall'
+ wrapProgram "$out/bin/slic3r-prusa3d" \
+ --prefix PERL5LIB : "$out/lib/slic3r-prusa3d:$PERL5LIB"
+
+ # it seems we need to copy the icons...
+ mkdir -p $out/bin/var
+ cp ../resources/icons/* $out/bin/var/
+ cp -r ../resources $out/bin/
+ '';
+
+ src = fetchFromGitHub {
+ owner = "prusa3d";
+ repo = "Slic3r";
+ sha256 = "0frkjgzmiy788ijkcqz3baxcrncqmk9s2vcd99hb8p2q13cg51ff";
+ rev = "version_${version}";
+ };
+
+ meta = with stdenv.lib; {
+ description = "G-code generator for 3D printer";
+ homepage = https://github.com/prusa3d/Slic3r;
+ license = licenses.agpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ tweber ];
+ };
+}
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index 5fffa6681cb2..6fa594dec046 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -1,16 +1,16 @@
-{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop_file_utils
-, shared_mime_info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer
-, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }:
+{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils
+, shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer
+, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2, hicolor-icon-theme, adwaita-icon-theme }:
stdenv.mkDerivation rec {
name = "spacefm-${version}";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "IgnorantGuru";
repo = "spacefm";
rev = "${version}";
- sha256 = "06askkrwls09d1x382zjrmnvcm0ghfgz4cms2qbhdkazfyy0ff65";
+ sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
};
configureFlags = [
@@ -23,13 +23,17 @@ stdenv.mkDerivation rec {
postInstall = ''
rm -f $out/etc/spacefm/spacefm.conf
- ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
+ ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
+ '';
+
+ preFixup = ''
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gtk3 udev desktop_file_utils shared_mime_info intltool
- wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks
+ gtk3 udev desktop-file-utils shared-mime-info intltool
+ wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2
] ++ (if ifuseSupport then [ ifuse ] else []);
# Introduced because ifuse doesn't build due to CVEs in libplist
# Revert when libplist builds again…
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 59e67fc65e2e..c7512a8ac271 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -1,27 +1,28 @@
-{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft
-, fontconfig, conf ? null, patches ? [], extraLibs ? []}:
+{ stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext
+, libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}:
with stdenv.lib;
let patches' = if patches == null then [] else patches;
in stdenv.mkDerivation rec {
- name = "st-0.7";
+ name = "st-0.8.1";
src = fetchurl {
url = "http://dl.suckless.org/st/${name}.tar.gz";
- sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000";
+ sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4";
};
- patches = patches' ++ [ ./st-fix-deletekey.patch ];
+ patches = patches';
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out
+ wrapProgram "$out/bin/st" --prefix PATH : "${dmenu}/bin"
'';
meta = {
diff --git a/pkgs/applications/misc/st/st-fix-deletekey.patch b/pkgs/applications/misc/st/st-fix-deletekey.patch
deleted file mode 100644
index cf0093220539..000000000000
--- a/pkgs/applications/misc/st/st-fix-deletekey.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 1896246..b41747f 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -315,8 +315,8 @@ static Key key[] = {
- { XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
- { XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
- { XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
-- { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
-- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
-+ { XK_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0},
-+ { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0},
- { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
- { XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0},
- { XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix
index 877990861fd7..b63a41bb9156 100644
--- a/pkgs/applications/misc/st/xst.nix
+++ b/pkgs/applications/misc/st/xst.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
homepage = https://github.com/neeasade/xst;
description = "Simple terminal fork that can load config from Xresources";
license = licenses.mit;
- maintainers = maintainers.vyp;
+ maintainers = [ maintainers.vyp ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
index 5701997fd299..f6286bfece3d 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
stdenv.mkDerivation rec {
- name = "stupidterm-2017-03-15";
+ name = "stupidterm-2018-03-10";
nativeBuildInputs = [ pkgconfig ];
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "esmil";
repo = "stupidterm";
- rev = "752316a783f52317ffd9f05d32e208dbcafc5ba6";
- sha256 = "1d8fyhr9sgpxgkwzkyiws0kvhmqfwwyycvcr1qf2wjldiax222lv";
+ rev = "0463519a96c9e4f9ce9fdc99d8e776499346ccba";
+ sha256 = "1vbk53xyjn33myb3fix6y7sxb1x3rndrkk5l9qa60qaw2ivkr965";
};
makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm";
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index 2cdf047a10fc..f9779beec0f4 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "styx-${version}";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "styx-static";
repo = "styx";
rev = "v${version}";
- sha256 = "044zpj92w96csaddf1qnnc2w2w9iq4b7rzlqqsqnd1s0a87lm1qd";
+ sha256 = "01lklz7l9klqmmsncikwjnk3glzyz15c30118s82yd1chwpwhpfl";
};
server = "${caddy.bin}/bin/caddy";
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 051b67bc972c..5e1e7bf32258 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake
, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib
-, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit
+, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite
}:
let
- version = "4.7.2";
+ version = "4.7.5";
libdc = stdenv.mkDerivation rec {
name = "libdivecomputer-ssrf-${version}";
src = fetchurl {
url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
- sha256 = "04wadhhva1bfnwk0kl359kcv0f83mgym2fzs441spw5llcl7k52r";
+ sha256 = "1xsgnmgc7yb46lflx8ynkbdxg2f6sny6xg6caqgx7rf0x1jmjj4x";
};
nativeBuildInputs = [ autoreconfHook ];
@@ -32,24 +32,25 @@ let
googlemaps = stdenv.mkDerivation rec {
name = "googlemaps-${version}";
- version = "2017-09-17";
+ version = "2017-12-18";
src = fetchFromGitHub {
owner = "vladest";
repo = "googlemaps";
- rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35";
- sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84";
+ rev = "79f3511d60dc9640de02a5f24656094c8982b26d";
+ sha256 = "11334w0bnfb97sv23vvj2b5hcwvr0171hxldn91jms9y12l5j15d";
};
nativeBuildInputs = [ qmake ];
- buildInputs = [ qtbase qtlocation ];
+ buildInputs = [ qtbase qtlocation libXcomposite ];
pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";
installPhase = ''
- mkdir $out $(dirname ${pluginsSubdir})
- mv plugins ${pluginsSubdir}
+ mkdir -p $out $(dirname ${pluginsSubdir}/geoservices)
+ mkdir -p ${pluginsSubdir}/geoservices
+ mv *.so ${pluginsSubdir}/geoservices
mv lib $out/
'';
@@ -69,7 +70,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
- sha256 = "06f215xx1nc2q2qff2ihcl86fkrlnkvacl1swi3fw9iik6nq3bjp";
+ sha256 = "0qqmnrmj2alr4rc2nqkv8sbdp92xb6j4j468wn6yqvgb23n77b82";
};
buildInputs = [
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 009eb488d7b4..68a192d78b84 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
-, gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }:
+, gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }:
let
@@ -36,7 +36,7 @@ let
patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so
'';
- buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ];
+ buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings-desktop-schemas ];
buildPhase = ''
ant furniture textures help
@@ -54,7 +54,7 @@ let
cp "${sweethome3dItem}/share/applications/"* $out/share/applications
makeWrapper ${jre}/bin/java $out/bin/$exec \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
'';
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 37623caa1d4e..6c4b32ca9aa6 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
-, gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }:
+, gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }:
let
@@ -26,7 +26,7 @@ let
categories = "Application;Graphics;2DGraphics;3DGraphics;";
};
- buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ];
+ buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ];
patchPhase = ''
sed -i -e 's,../SweetHome3D,${application.src},g' build.xml
@@ -43,7 +43,7 @@ let
cp ${module}-${version}.jar $out/share/java/.
cp "${editorItem}/share/applications/"* $out/share/applications
makeWrapper ${jre}/bin/java $out/bin/$exec \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
'';
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 2533014c5607..a337b5eae996 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -1,35 +1,37 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee
-, keybinder3, json_glib, zeitgeist, vala_0_23, hicolor_icon_theme
+{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee
+, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobjectIntrospection
}:
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "synapse-0.2.99.1";
+let
+ version = "0.2.99.3";
+in stdenv.mkDerivation rec {
+ name = "synapse-${version}";
src = fetchurl {
- url = "https://launchpad.net/synapse-project/0.3/0.2.99.1/+download/${name}.tar.xz";
- sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220";
+ url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz";
+ sha256 = "0rwd42164xqfi40r13yr29cx6zy3bckgxk00y53b376nl5yqacvy";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [
+ pkgconfig gettext vala_0_38
+ # For setup hook
+ gobjectIntrospection
+ ];
buildInputs = [
- intltool glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist
- vala_0_23 hicolor_icon_theme
+ glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist
+ hicolor-icon-theme
];
- meta = {
- longDescription = ''
- Semantic launcher written in Vala that you can use to start applications
- as well as find and access relevant documents and files by making use of
- the Zeitgeist engine
- '';
- description = ''
- Semantic launcher to start applications and find relevant files
- '';
- homepage = https://launchpad.net/synapse-project;
- license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ mahe ];
- platforms = with stdenv.lib.platforms; all;
+ meta = with stdenv.lib; {
+ longDescription = ''
+ Semantic launcher written in Vala that you can use to start applications
+ as well as find and access relevant documents and files by making use of
+ the Zeitgeist engine
+ '';
+ description = "Semantic launcher to start applications and find relevant files";
+ homepage = https://launchpad.net/synapse-project;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ mahe ];
+ platforms = with platforms; all;
};
}
diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix
index 23252d0c4807..c5429b6c8510 100644
--- a/pkgs/applications/misc/taskjuggler/default.nix
+++ b/pkgs/applications/misc/taskjuggler/default.nix
@@ -7,6 +7,7 @@ bundlerEnv {
gemdir = ./.;
meta = {
+ broken = true; # needs ruby 2.0
description = "A modern and powerful project management tool";
homepage = http://taskjuggler.org/;
license = lib.licenses.gpl2;
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index 1b3ca7dfc03c..0deda8ce35a3 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -1,48 +1,42 @@
-{ stdenv, fetchurl, taskwarrior, perl, ncurses }:
+{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses, taskwarrior }:
stdenv.mkDerivation rec {
- version = "0.8";
+ version = "2017-05-15";
name = "tasknc-${version}";
- src = fetchurl {
- url = "https://github.com/mjheagle8/tasknc/archive/v${version}.tar.gz";
- sha256 = "0max5schga9hmf3vfqk2ic91dr6raxglyyjcqchzla280kxn5c28";
+ src = fetchFromGitHub {
+ owner = "lharding";
+ repo = "tasknc";
+ rev = "c41d0240e9b848e432f01de735f28de93b934ae7";
+ sha256 = "0f7l7fy06p33vw6f6sjnjxfhw951664pmwhjl573jvmh6gi2h1yr";
};
+ nativeBuildInputs = [
+ makeWrapper
+ perl # For generating the man pages with pod2man
+ ];
+
+ buildInputs = [ ncurses ];
+
hardeningDisable = [ "format" ];
- #
- # I know this is ugly, but the Makefile does strange things in this package,
- # so we have to:
- #
- # 1. Remove the "doc" task dependency from the "all" target
- # 2. Remove the "tasknc.1" task dependency from the "install" target
- # 3. Remove the installing of the tasknc.1 file from the install target as
- # we just removed the build target for it.
- #
- # TODO : One could also provide a patch for the doc/manual.pod file so it
- # actually builds, but I'm not familiar with this, so this is the faster
- # approach for me. We have no manpage, though.
- #
- preConfigure = ''
- sed -i -r 's,(all)(.*)doc,\1\2,' Makefile
- sed -i -r 's,(install)(.*)tasknc\.1,\1\2,' Makefile
- sed -i -r 's,install\ -D\ -m644\ tasknc\.1\ (.*),,' Makefile
- '';
+ buildFlags = [ "VERSION=${version}" ];
installPhase = ''
- mkdir $out/bin/ -p
- mkdir $out/share/man1 -p
- mkdir $out/share/tasknc -p
- DESTDIR=$out PREFIX= MANPREFIX=share make install
+ mkdir -p $out/bin/
+ mkdir -p $out/share/man/man1
+ mkdir -p $out/share/tasknc
+
+ DESTDIR=$out PREFIX= MANPREFIX=/share/man make install
+
+ wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior}/bin
'';
- buildInputs = [ taskwarrior perl ncurses ];
- meta = {
- homepage = https://github.com/mjheagle8/tasknc;
+ meta = with stdenv.lib; {
+ homepage = https://github.com/lharding/tasknc;
description = "A ncurses wrapper around taskwarrior";
- maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
- platforms = stdenv.lib.platforms.linux; # Cannot test others
+ maintainers = with maintainers; [ matthiasbeyer infinisil ];
+ platforms = platforms.linux; # Cannot test others
};
}
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 74ef55ee8cc8..80e1b9b69efb 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p "$out/share/bash-completion/completions"
- ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/"
+ ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash"
mkdir -p "$out/share/fish/vendor_completions.d"
ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/"
'';
diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index 3959ad88ece9..59ea70e3da2d 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, pythonPackages, pango, keybinder, vte, gettext, intltool, file
+{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool, file, gtk3, gobjectIntrospection, cairo
+, wrapGAppsHook, gnome3
}:
pythonPackages.buildPythonApplication rec {
name = "terminator-${version}";
- version = "1.0";
+ version = "1.91";
src = fetchurl {
- url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
- sha256 = "1pfspcxsbax8a835kcld32fax6vcxsn1fmkny9zzvi4icplhkal8";
+ url = "https://launchpad.net/terminator/gtk3/${version}/+download/${name}.tar.gz";
+ sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69";
};
- nativeBuildInputs = [ file intltool ];
+ nativeBuildInputs = [ file intltool wrapGAppsHook ];
+ buildInputs = [ gtk3 gnome3.vte gobjectIntrospection cairo ];
pythonPath = with pythonPackages; [
- pygtk pygobject2 vte keybinder notify gettext pango psutil
+ pygobject3 vte keybinder notify gettext psutil
+ pycairo
];
postPatch = ''
@@ -32,7 +35,7 @@ pythonPackages.buildPythonApplication rec {
quadkonsole, etc. in that the main focus is arranging terminals in grids
(tabs is the most common default method, which Terminator also supports).
'';
- homepage = http://gnometerminator.blogspot.no/p/introduction.html;
+ homepage = https://gnometerminator.blogspot.no/p/introduction.html;
license = licenses.gpl2;
maintainers = with maintainers; [ bjornfor globin ];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index cf99304473c1..46276bbb03fb 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -3,16 +3,19 @@
}:
let
- version = "12";
+ version = "13";
termite = stdenv.mkDerivation {
name = "termite-${version}";
src = fetchgit {
url = "https://github.com/thestinger/termite";
rev = "refs/tags/v${version}";
- sha256 = "0s6dyg3vcqk5qcx90bs24wdnd3p56rdjdcanx4pcxvp6ksjl61jz";
+ sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj";
};
+ # https://github.com/thestinger/termite/pull/516
+ patches = [ ./url_regexp_trailing.patch ];
+
postPatch = "sed '1i#include ' -i termite.cc";
makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
diff --git a/pkgs/applications/misc/termite/url_regexp_trailing.patch b/pkgs/applications/misc/termite/url_regexp_trailing.patch
new file mode 100644
index 000000000000..96deaa073d71
--- /dev/null
+++ b/pkgs/applications/misc/termite/url_regexp_trailing.patch
@@ -0,0 +1,27 @@
+Based on https://github.com/thestinger/termite/pull/516
+Modified to apply to v13
+
+From 65a454ffa8e681f3f14729cba7c42e1570a85e8a Mon Sep 17 00:00:00 2001
+From: Paul Baecher
+Date: Thu, 7 Sep 2017 22:58:51 +0200
+Subject: [PATCH] Do not match punctuation at the end of URLs
+
+Punctuation at the end of URLs is most likely part of natural language
+or markup (for example in Markdown). Do not match it as part of the URL.
+---
+ url_regex.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/url_regex.hh b/url_regex.hh
+index 2ec6be8..3039b53 100644
+--- a/url_regex.hh
++++ b/url_regex.hh
+@@ -9,7 +9,7 @@
+ #define PORT "(?:\\:[[:digit:]]{1,5})?"
+ #define SCHEME "(?:[[:alpha:]][+-.[:alnum:]]*:)"
+ #define USERPASS USERCHARS_CLASS "+(?:\\:" PASSCHARS_CLASS "+)?"
+-#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*)?"
++#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*(?
-Date: Tue, 14 Mar 2017 07:51:02 -0500
-Subject: [PATCH] doc/themes: install all themes, not just 'dark.theme'.
-
----
- doc/themes/CMakeLists.txt | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/doc/themes/CMakeLists.txt b/doc/themes/CMakeLists.txt
-index a954576..3a3b453 100644
---- a/doc/themes/CMakeLists.txt
-+++ b/doc/themes/CMakeLists.txt
-@@ -2,5 +2,8 @@ cmake_minimum_required (VERSION 2.8)
-
- message ("-- Configuring theme documentation")
-
--install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes)
--install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
-+install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes)
-+install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
-+install (FILES dark_blue.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
-+install (FILES dark_green.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
-+install (FILES dark_red.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
---
-2.12.0
-
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 2c23ab9261f6..838e26463cd0 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre
, glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage
, libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp
-, libstartup_notification, hicolor_icon_theme, wrapGAppsHook
+, libstartup_notification, hicolor-icon-theme, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "tint2-${version}";
- version = "15.3";
+ version = "16.2";
src = fetchFromGitLab {
owner = "o9000";
repo = "tint2";
rev = version;
- sha256 = "1d83ppwckc2yix1grw8w31rlkyz6naa40pd3dg7n6nidx00zwn91";
+ sha256 = "1fp9kamb09qbply8jn0gqwgnv9xdds81jzpl0lkziz8dydyis4wm";
};
enableParallelBuilding = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender
libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs
- libXdmcp libstartup_notification hicolor_icon_theme ];
+ libXdmcp libstartup_notification hicolor-icon-theme ];
postPatch = ''
substituteInPlace CMakeLists.txt --replace /etc $out/etc
diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index eebab6643a68..6cf1f27a104b 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.15";
+ version = "1.4.17";
name = "tnef-${version}";
src = fetchFromGitHub {
owner = "verdammelt";
repo = "tnef";
rev = version;
- sha256 = "0wm5ylppkjg518ldb9kzlx58a9l8z66gpz9ljalmyq6a77khd7pj";
+ sha256 = "0cq2xh5wd74qn6k2nnw5rayxgqhjl3jbzf4zlc4babcwxrv32ldh";
};
doCheck = true;
diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix
new file mode 100644
index 000000000000..61e10b6d1a6a
--- /dev/null
+++ b/pkgs/applications/misc/todolist/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "todolist-${version}";
+ version = "0.8";
+
+ goPackagePath = "github.com/gammons/todolist";
+
+ src = fetchFromGitHub {
+ owner = "gammons";
+ repo = "todolist";
+ rev = "${version}";
+ sha256 = "0agv9a44q81qr960b7m1jxk0pb8ahk6lvmzmijvw4v6mbip2720z";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Simple GTD-style todo list for the command line";
+ homepage = "http://todolist.site";
+ license = licenses.mit;
+ maintainers = with maintainers; [ uvnikita ];
+ };
+}
diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index d1b1daa26d6f..1f8ab8b438dd 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
-pythonPackages.buildPythonApplication rec {
- version = "0.15.0";
+python3Packages.buildPythonApplication rec {
+ version = "0.17.1";
name = "toot-${version}";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = "${version}";
- sha256 = "08k913gw0ip2q686z9k63bcn1n5s4w6b7jj6jmmamm427xmibkph";
+ sha256 = "05fzsakm089bn03z8gip6yp4xfmwa054v40x2f3gqpl04r504gis";
};
- checkInputs = with pythonPackages; [ pytest ];
+ checkInputs = with python3Packages; [ pytest ];
- propagatedBuildInputs = with pythonPackages;
+ propagatedBuildInputs = with python3Packages;
[ requests beautifulsoup4 future ];
checkPhase = ''
diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix
index 853cc5171053..3810da40849b 100644
--- a/pkgs/applications/misc/translate-shell/default.nix
+++ b/pkgs/applications/misc/translate-shell/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "translate-shell";
- version = "0.9.4";
+ version = "0.9.6.6";
src = fetchFromGitHub {
owner = "soimort";
repo = "translate-shell";
rev = "v" + version;
- sha256 = "166zhic3k4z37vc8p1fnhc4xx7i7q0j30nr324frmp1mrnwrdib8";
+ sha256 = "0hbwvc554v6fi4ardidwsnn8hk7p68p155yjllvljjawkbq4qljq";
};
phases = [ "buildPhase" "installPhase" "postFixup" ];
diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index bcf43514f45e..ea79e29ff020 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -1,28 +1,34 @@
{ stdenv, fetchFromGitHub, asciidoc-full, gettext
-, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg
-, pythonPackages, udisks2, wrapGAppsHook }:
+, gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg
+, udisks2, wrapGAppsHook
+, buildPythonApplication
+, docopt
+, pygobject3
+, pyyaml
+, ...
+}:
-pythonPackages.buildPythonApplication rec {
+buildPythonApplication rec {
name = "udiskie-${version}";
- version = "1.7.2";
+ version = "1.7.3";
src = fetchFromGitHub {
owner = "coldfix";
repo = "udiskie";
rev = version;
- sha256 = "1p732gi6lhwcqxvsa0pknb6jmhy3kgv3yzz7xzmdzhy47m312965";
+ sha256 = "1yv1faq81n3vspf3jprcs5v21l2fchy3m3pc7lk8jb0xqlnh60x4";
};
buildInputs = [
asciidoc-full # For building man page.
- hicolor_icon_theme
+ hicolor-icon-theme
wrapGAppsHook
librsvg # required for loading svg icons (udiskie uses svg icons)
];
propagatedBuildInputs = [
- gettext gobjectIntrospection gtk3 libnotify pythonPackages.docopt
- pythonPackages.pygobject3 pythonPackages.pyyaml udisks2
+ gettext gobjectIntrospection gtk3 libnotify docopt
+ pygobject3 pyyaml udisks2
];
postBuild = "make -C doc";
diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index faf373092d57..6aba4e751503 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "urh-${version}";
- version = "1.7.1";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "jopohl";
repo = "urh";
rev = "v${version}";
- sha256 = "00l1zs3qw89z1hlylprzrpf6nf7h22h0nw43h97gv775vaqqgczv";
+ sha256 = "02jq2jas6gm08z4l09azi6dcsydaaaqbxfv4mb7pnrc1w8m593zr";
};
buildInputs = [ hackrf rtl-sdr ];
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
inherit (src.meta) homepage;
description = "Universal Radio Hacker: investigate wireless protocols like a boss";
license = licenses.asl20;
- platforms = platforms.all;
+ platforms = platforms.linux;
maintainers = with maintainers; [ fpletz ];
};
}
diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index 7c4def952104..c3071647c40a 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -1,20 +1,23 @@
{ stdenv, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec {
- name = "urlscan-${version}";
- version = "0.8.6";
+ pname = "urlscan";
+ version = "0.8.7";
src = fetchFromGitHub {
owner = "firecat53";
- repo = "urlscan";
+ repo = pname;
rev = version;
- sha256 = "1v26fni64n0lbv37m35plh2bsrvhpb4ibgmg2mv05qfc3df721s5";
+ sha256 = "1jxjcq869jimsq1ihk2fbjhp5lj7yga0hbp0msskxyz92afl1kz8";
};
propagatedBuildInputs = [ python3Packages.urwid ];
+ doCheck = false; # No tests available
+
meta = with stdenv.lib; {
description = "Mutt and terminal url selector (similar to urlview)";
+ homepage = https://github.com/firecat53/urlscan;
license = licenses.gpl2;
maintainers = with maintainers; [ dpaetzel jfrankenau ];
};
diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix
index 0a651906cd8f..8764c41c8a4c 100644
--- a/pkgs/applications/misc/urlview/default.nix
+++ b/pkgs/applications/misc/urlview/default.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Extract URLs from text";
- homepage = http://packages.qa.debian.org/u/urlview.html;
- licencse = stdenv.lib.licenses.gpl2;
+ homepage = https://packages.qa.debian.org/u/urlview.html;
+ license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/misc/valauncher/default.nix b/pkgs/applications/misc/valauncher/default.nix
index f780e5469d02..38c4055a10bb 100644
--- a/pkgs/applications/misc/valauncher/default.nix
+++ b/pkgs/applications/misc/valauncher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3 }:
+{ stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3, gobjectIntrospection }:
stdenv.mkDerivation rec {
version = "1.3.1";
@@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "18969v870737jg1q0l3d05pb9mxsrcpdi0mnyz94rwkspszvxxqi";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake gtk3 vala gnome3.libgee ];
+ nativeBuildInputs = [
+ cmake vala pkgconfig
+ # For setup hook
+ gobjectIntrospection
+ ];
+ buildInputs = [ gtk3 gnome3.libgee ];
meta = with stdenv.lib; {
description = "A fast dmenu-like gtk3 application launcher";
diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix
new file mode 100644
index 000000000000..f5c0e1fe1a3c
--- /dev/null
+++ b/pkgs/applications/misc/valentina/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchhg
+, qmake, qttools
+, qtbase, qtsvg, qtxmlpatterns
+, poppler_utils
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "valentina-${version}";
+ version = "0.6.0.0a";
+
+ src = fetchhg {
+ url = "https://bitbucket.org/dismine/valentina";
+ rev = "ccd68eba533a82aeb2dd3702124899a37c23ded5";
+ sha256 = "1qmxm6pwwass2kpyg41nhkmyq0g74pyk517sq68dcgs6340ii7fs";
+ };
+
+ postPatch = ''
+ substituteInPlace common.pri \
+ --replace '$$[QT_INSTALL_HEADERS]/QtXmlPatterns' '${getDev qtxmlpatterns}/include/QtXmlPatterns' \
+ --replace '$$[QT_INSTALL_HEADERS]/QtSvg' '${getDev qtsvg}/include/QtSvg' \
+ --replace '$$[QT_INSTALL_HEADERS]/' '${getDev qtbase}/include/' \
+ --replace '$$[QT_INSTALL_HEADERS]' '${getDev qtbase}'
+ substituteInPlace src/app/tape/tape.pro \
+ --replace '$$[QT_INSTALL_BINS]/rcc' '${getDev qtbase}/bin/rcc'
+ substituteInPlace src/app/translations.pri \
+ --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${getDev qttools}/bin/lrelease'
+ substituteInPlace src/app/valentina/mainwindowsnogui.cpp \
+ --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${getBin poppler_utils}/bin/pdftops"'
+ substituteInPlace src/app/valentina/dialogs/dialogsavelayout.h \
+ --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${getBin poppler_utils}/bin/pdftops"'
+ '';
+
+ nativeBuildInputs = [ qmake qttools ];
+
+ buildInputs = [ qtbase qtsvg qtxmlpatterns poppler_utils ];
+
+ configurePhase = ''
+ qmake PREFIX=/ Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols"
+ '';
+
+ installFlags = [ "INSTALL_ROOT=$(out)" ];
+
+ postInstall = ''
+ mv $out/usr/share $out/
+ rmdir $out/usr
+
+ mkdir -p $out/share/man/man1
+ gzip -9c dist/debian/valentina.1 > $out/share/man/man1/valentina.1.gz
+ gzip -9c dist/debian/tape.1 > $out/share/man/man1/tape.1.gz
+
+ mkdir -p $out/share/mime/packages
+ cp dist/debian/valentina.sharedmimeinfo $out/share/mime/packages/valentina.xml
+ cp dist/debian/valentina.mime $out/share/mime/packages/valentina
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "An open source sewing pattern drafting software";
+ homepage = https://valentinaproject.bitbucket.io/;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ jfrankenau ];
+ };
+}
diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index 86924d9b3ca9..201e2bcc6ac0 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Free Open-Source filesystem on-the-fly encryption";
- homepage = https://veracrypt.codeplex.com/;
+ homepage = https://www.veracrypt.fr/;
license = "VeraCrypt License";
maintainers = with maintainers; [ dsferruzza ];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index ffeca99cf9cb..ebc951c5bb93 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "vifm-${version}";
- version = "0.9";
+ version = "0.9.1";
src = fetchurl {
url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2";
- sha256 = "1zd72vcgir3g9rhs2iyca13qf5fc0b1f22y20f5gy92c3sfwj45b";
+ sha256 = "1cz7vjjmghgdxd1lvsdwv85gvx4kz8idq14qijpwkpfrf2va9f98";
};
nativeBuildInputs = [ pkgconfig ];
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ raskin garbas ];
platforms = platforms.linux;
license = licenses.gpl2;
- downloadPage = "http://vifm.info/downloads.shtml";
- homepage = http://vifm.info/;
+ downloadPage = "https://vifm.info/downloads.shtml";
+ homepage = https://vifm.info/;
inherit version;
updateWalker = true;
};
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 5af675a82acf..d090878f9768 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
-, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
+, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper
, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils
+ buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
];
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix
index 27b2a8f7134f..166811fb4ae3 100644
--- a/pkgs/applications/misc/volnoti/default.nix
+++ b/pkgs/applications/misc/volnoti/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch
, pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg
-, dbus_glib, autoreconfHook, wrapGAppsHook }:
+, dbus-glib, autoreconfHook, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "volnoti-unstable-${version}";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
buildInputs = [
- dbus gdk_pixbuf glib libX11 gtk2 dbus_glib librsvg
+ dbus gdk_pixbuf glib libX11 gtk2 dbus-glib librsvg
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix
new file mode 100644
index 000000000000..d705de1a8cd6
--- /dev/null
+++ b/pkgs/applications/misc/welle-io/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig
+, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2
+, faad2, rtl-sdr, libusb, fftwSinglePrec }:
+let
+
+ version = "1.0-rc2";
+
+in stdenv.mkDerivation {
+
+ name = "welle-io-${version}";
+
+ src = fetchFromGitHub {
+ owner = "AlbrechtL";
+ repo = "welle.io";
+ rev = "V${version}";
+ sha256 = "01x4ldq6lvmdrmxi857594nj9xpn2h7848vvf3f54sh1zrawn4k4";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [
+ faad2
+ fftwSinglePrec
+ libusb
+ qtbase
+ qtcharts
+ qtmultimedia
+ qtquickcontrols
+ qtquickcontrols2
+ rtl-sdr
+ ];
+
+ cmakeFlags = [
+ "-DRTLSDR=true"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "A DAB/DAB+ Software Radio";
+ homepage = http://www.welle.io/;
+ maintainers = with maintainers; [ ck3d ];
+ license = licenses.gpl2;
+ platforms = with platforms; linux ++ darwin;
+ };
+
+}
diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix
index dfd3c487713b..fe0348cad211 100644
--- a/pkgs/applications/misc/wmname/default.nix
+++ b/pkgs/applications/misc/wmname/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Prints or set the window manager name property of the root window";
- homepage = http://tools.suckless.org/wmname;
+ homepage = https://tools.suckless.org/wmname;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 0d38f1b93e73..968539336a9c 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "worker-${version}";
- version = "3.8.5";
+ version = "3.15.0";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
- sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw";
+ sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8";
};
buildInputs = [ libX11 ];
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 8c554da03621..6e92e98481ea 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -1,39 +1,30 @@
-{ stdenv, fetchFromGitHub, fetchpatch
-, autoconf, automake, gettext, intltool, libtool, pkgconfig
+{ stdenv, fetchFromGitHub, wrapGAppsHook
+, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig
, libICE, libSM, libXScrnSaver, libXtst, cheetah
-, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm
-, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
+, gobjectIntrospection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo
+, cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base
+, gst-plugins-good, libsigcxx }:
stdenv.mkDerivation rec {
name = "workrave-${version}";
- version = "1.10.7";
+ version = "1.10.20";
src = let
in fetchFromGitHub {
- sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb";
+ sha256 = "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941";
rev = with stdenv.lib;
"v" + concatStringsSep "_" (splitString "." version);
repo = "workrave";
owner = "rcaelers";
};
- patches = [
- # Building with gtk{,mm}3 works just fine, but let's be conservative for once:
- (fetchpatch {
- name = "workrave-fix-compilation-with-gtk2.patch";
- url = "https://github.com/rcaelers/workrave/commit/"
- + "271efdcd795b3592bfede8b1af2162af4b1f0f26.patch";
- sha256 = "1a3d4jj8516m3m24bl6y8alanl1qnyzv5dv1hz5v3hjgk89fj6rk";
- })
- ];
-
nativeBuildInputs = [
- autoconf automake gettext intltool libtool pkgconfig
+ autoconf autoconf-archive automake gettext intltool libtool pkgconfig wrapGAppsHook
];
buildInputs = [
libICE libSM libXScrnSaver libXtst cheetah
- glib glibmm gtkmm2 atk pango pangomm cairo cairomm
- dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx
+ gobjectIntrospection glib glibmm gtkmm3 atk pango pangomm cairo cairomm
+ dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx
];
preConfigure = "./autogen.sh";
@@ -50,7 +41,7 @@ stdenv.mkDerivation rec {
homepage = http://www.workrave.org/;
downloadPage = https://github.com/rcaelers/workrave/releases;
license = licenses.gpl3;
- maintainers = with maintainers; [ nckx prikhi ];
+ maintainers = with maintainers; [ prikhi ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix
new file mode 100644
index 000000000000..8a23134e3ed0
--- /dev/null
+++ b/pkgs/applications/misc/wsjtx/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,
+ docbook_xsl, fftw, fftwFloat, gfortran, libtool, libpulseaudio, qtbase,
+ qtmultimedia, qtserialport, texinfo, libusb1 }:
+
+stdenv.mkDerivation rec {
+ name = "wsjtx-${version}";
+ version = "1.8.0";
+
+ # This is a composite source tarball containing both wsjtx and a hamlib fork
+ src = fetchurl {
+ url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz";
+ sha256 = "21603ad4d5f43cd9c79a6e8cf468bde88c554654012b2c6c1ef9144cfbf668ce";
+ };
+
+ # Hamlib builds with autotools, wsjtx builds with cmake
+ # Omitting pkgconfig because it causes issues locating the built hamlib
+ nativeBuildInputs = [
+ asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool
+ texinfo
+ ];
+ buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ];
+
+ # Composite build has its own patch step after it extracts the inner archives
+ postPatch = "cp ${./wsjtx.patch} wsjtx.patch";
+
+ meta = with stdenv.lib; {
+ description = "Weak-signal digital communication modes for amateur radio";
+ longDescription = ''
+ WSJT-X implements communication protocols or "modes" called FT8, JT4, JT9,
+ JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for
+ detecting and measuring your own radio signals reflected from the Moon.
+ These modes were all designed for making reliable, confirmed ham radio
+ contacts under extreme weak-signal conditions.
+ '';
+ homepage = http://physics.princeton.edu/pulsar/k1jt/wsjtx.html;
+ # Older licenses are for the statically-linked hamlib
+ license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ];
+ platforms = platforms.linux;
+ maintainers = [ maintainers.lasandell ];
+ };
+}
diff --git a/pkgs/applications/misc/wsjtx/wsjtx.patch b/pkgs/applications/misc/wsjtx/wsjtx.patch
new file mode 100644
index 000000000000..a5bd7ec3e196
--- /dev/null
+++ b/pkgs/applications/misc/wsjtx/wsjtx.patch
@@ -0,0 +1,12 @@
+Index: wsjtx/CMakeLists.txt
+===================================================================
+--- wsjtx/CMakeLists.txt (revision 8382)
++++ wsjtx/CMakeLists.txt (working copy)
+@@ -866,6 +866,7 @@
+ find_package (Qt5Widgets 5 REQUIRED)
+ find_package (Qt5Multimedia 5 REQUIRED)
+ find_package (Qt5PrintSupport 5 REQUIRED)
++find_package (Qt5SerialPort 5 REQUIRED)
+
+ if (WIN32)
+ add_definitions (-DQT_NEEDS_QTMAIN)
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 2d2c2e2bff25..270380a8c3fb 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,15 +1,13 @@
{ mkDerivation, lib, fetchurl, pkgconfig, which
, libtool, openssl, qtbase, qttools }:
-with lib;
-
mkDerivation rec {
name = "xca-${version}";
- version = "1.3.2";
+ version = "1.4.1";
src = fetchurl {
url = "mirror://sourceforge/xca/${name}.tar.gz";
- sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84";
+ sha256 = "11niik2m4yswkp71hrdh54z5kgkvdg8y0b6wdqbrn6vy1n8gz63q";
};
enableParallelBuilding = true;
@@ -22,10 +20,9 @@ mkDerivation rec {
meta = with lib; {
description = "Interface for managing asymetric keys like RSA or DSA";
- homepage = http://xca.sourceforge.net/;
- platforms = platforms.all;
- license = licenses.bsd3;
+ homepage = http://xca.sourceforge.net/;
+ license = licenses.bsd3;
maintainers = with maintainers; [ offline peterhoeg ];
- broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index 78e1d15481ba..444ab802673e 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }:
stdenv.mkDerivation rec {
- name = "xfe-1.37";
+ name = "xfe-1.42";
src = fetchurl {
url = "mirror://sourceforge/xfe/${name}.tar.gz";
- sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd";
+ sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix
index 7d22a1605740..5d2b70a80ee4 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@@ -1,14 +1,14 @@
# This program used to come with xorg releases, but now I could only find it
-# at http://www.x.org/releases/individual/.
+# at https://www.x.org/releases/individual/.
# That is why this expression is not inside pkgs.xorg
{stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}:
stdenv.mkDerivation rec {
- name = "xfontsel-1.0.5";
+ name = "xfontsel-1.0.6";
src = fetchurl {
url = "mirror://xorg/individual/app/${name}.tar.bz2";
- sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p";
+ sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5";
};
nativeBuildInputs = [ pkgconfig ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = http://www.x.org/;
+ homepage = https://www.x.org/;
description = "Allows testing the fonts available in an X server";
license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index 54d61a047a78..bb7b22c40a26 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -3,28 +3,29 @@
, intltool
, docbook2x, docbook_xml_dtd_412, libxslt
, sword, clucene_core, biblesync
-, gnome_doc_utils
+, gnome-doc-utils
, libgsf, gconf
, gtkhtml, libglade, scrollkeeper
, webkitgtk
-, dbus_glib, enchant, isocodes, libuuid, icu
+, dbus-glib, enchant, isocodes, libuuid, icu
+, wrapGAppsHook
}:
stdenv.mkDerivation rec {
- name = "xiphos-${version}";
- version = "4.0.6";
+ name = "xiphos-${version}";
+ version = "4.0.7";
src = fetchFromGitHub {
owner = "crosswire";
repo = "xiphos";
rev = "${version}";
- sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f";
+ sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt
- sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml
- libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ];
+ sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml
+ libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ];
prePatch = ''
patchShebangs .;
@@ -34,11 +35,11 @@ stdenv.mkDerivation rec {
export CLUCENE_HOME=${clucene_core};
export SWORD_HOME=${sword};
'';
-
+
configurePhase = ''
python waf configure --prefix=$out --enable-webkit2
'';
-
+
buildPhase = ''
python waf build
'';
@@ -50,10 +51,10 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A GTK Bible study tool";
longDescription = ''
- Xiphos (formerly known as GnomeSword) is a Bible study tool
- written for Linux, UNIX, and Windows using GTK, offering a rich
- and featureful environment for reading, study, and research using
- modules from The SWORD Project and elsewhere.
+ Xiphos (formerly known as GnomeSword) is a Bible study tool
+ written for Linux, UNIX, and Windows using GTK, offering a rich
+ and featureful environment for reading, study, and research using
+ modules from The SWORD Project and elsewhere.
'';
homepage = http://www.xiphos.org/;
license = licenses.gpl2Plus;
diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix
new file mode 100644
index 000000000000..38bda9a8f560
--- /dev/null
+++ b/pkgs/applications/misc/xkbmon/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, libX11 }:
+
+stdenv.mkDerivation rec {
+ name = "xkbmon-${version}";
+ version = "0.1";
+
+ src = fetchFromGitHub {
+ owner = "xkbmon";
+ repo = "xkbmon";
+ rev = version;
+ sha256 = "1smyqsd9cpbzqaplm221a8mq0nham6rg6hjsm9g5gph94xmk6d67";
+ };
+
+ buildInputs = [ libX11 ];
+
+ installPhase = "install -D -t $out/bin xkbmon";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/xkbmon/xkbmon;
+ description = "Command-line keyboard layout monitor for X11";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
new file mode 100644
index 000000000000..c985f601447e
--- /dev/null
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl
+, opencl-headers, ocl-icd, hwloc, cudatoolkit
+, devDonationLevel ? "0.0"
+, cudaSupport ? false
+, openclSupport ? false
+}:
+
+stdenv.mkDerivation rec {
+ name = "xmr-stak-${version}";
+ version = "2.2.0";
+
+ src = fetchFromGitHub {
+ owner = "fireice-uk";
+ repo = "xmr-stak";
+ rev = "v${version}";
+ sha256 = "0n21y37d8khgfk9965mrhnh6y5ag7w0s6as1fmf76yx6vajvajsn";
+ };
+
+ NIX_CFLAGS_COMPILE = "-O3";
+
+ cmakeFlags = lib.optional (!cudaSupport) "-DCUDA_ENABLE=OFF"
+ ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ libmicrohttpd openssl hwloc ]
+ ++ lib.optional cudaSupport cudatoolkit
+ ++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
+
+ postPatch = ''
+ substituteInPlace xmrstak/donate-level.hpp \
+ --replace 'fDevDonationLevel = 2.0' 'fDevDonationLevel = ${devDonationLevel}'
+ '';
+
+ meta = with lib; {
+ description = "Unified All-in-one Monero miner";
+ homepage = "https://github.com/fireice-uk/xmr-stak";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ fpletz ];
+ };
+}
diff --git a/pkgs/applications/misc/xpdf/cmake_version.patch b/pkgs/applications/misc/xpdf/cmake_version.patch
new file mode 100644
index 000000000000..59a51f7506d5
--- /dev/null
+++ b/pkgs/applications/misc/xpdf/cmake_version.patch
@@ -0,0 +1,15 @@
+
+Fix "No known features for CXX compiler", see
+https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at
+https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ #
+ #========================================================================
+
+-cmake_minimum_required(VERSION 2.8.8)
++cmake_minimum_required(VERSION 3.1.0)
+
+ project(xpdf)
+
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index ef031c4b9f4d..3b05c9be451f 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -1,9 +1,9 @@
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
, stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null
-, cmake, qtbase ? null
+, cmake, qtbase ? null, qtsvg ? null, makeWrapper
}:
-assert enableGUI -> qtbase != null && freetype != null;
+assert enableGUI -> qtbase != null && qtsvg != null && freetype != null;
assert enablePDFtoPPM -> freetype != null;
assert useT1Lib -> t1lib != null;
@@ -17,7 +17,12 @@ stdenv.mkDerivation {
sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz";
};
- nativeBuildInputs = [ cmake ];
+ # Fix "No known features for CXX compiler", see
+ # https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at
+ # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html
+ patches = stdenv.lib.optional stdenv.isDarwin ./cmake_version.patch;
+
+ nativeBuildInputs = [ cmake makeWrapper ];
cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"];
@@ -31,6 +36,11 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ wrapProgram $out/bin/xpdf \
+ --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}
+ '';
+
meta = {
homepage = http://www.foolabs.com/xpdf/;
description = "Viewer for Portable Document Format (PDF) files";
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 9e64557838eb..d807e8eb9ed5 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -1,13 +1,16 @@
-{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper
+{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper
, enableDecLocator ? true
}:
stdenv.mkDerivation rec {
- name = "xterm-330";
+ name = "xterm-331";
src = fetchurl {
- url = "http://invisible-mirror.net/archives/xterm/${name}.tgz";
- sha256 = "1psnfmqd23v9gxj8a98nzrgvymrk0p1whwqi92gy15bbkzrgkvks";
+ urls = [
+ "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
+ "https://invisible-mirror.net/archives/xterm/${name}.tgz"
+ ];
+ sha256 = "047gk58hvj64974sg259ss5gixj7pac6halmjfz4cc6r1yimds4s";
};
buildInputs =
@@ -17,7 +20,12 @@ stdenv.mkDerivation rec {
patches = [
./sixel-256.support.patch
- ];
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl
+ (fetchpatch {
+ name = "posix-ptys.patch";
+ url = "https://git.alpinelinux.org/cgit/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";
+ sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr";
+ });
configureFlags = [
"--enable-wide-chars"
@@ -56,7 +64,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://invisible-island.net/xterm;
- license = "BSD";
+ license = with stdenv.lib.licenses; [ mit ];
maintainers = with stdenv.lib.maintainers; [viric vrthra];
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index bd891ff8493f..61c7b11f2084 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
preConfigure =
''
sed -i 's@,/dev/null@@' configure
+ patchShebangs configure
'';
# --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
# OpenH323 and PWlib (licensed under MPL).
license = ["GPL" "MPL"];
maintainers = [ lib.maintainers.marcweber ];
- platforms = lib.platforms.linux;
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix
new file mode 100644
index 000000000000..dec861009eb4
--- /dev/null
+++ b/pkgs/applications/misc/yokadi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, buildPythonApplication, dateutil,
+ sqlalchemy, setproctitle, icalendar, pycrypto }:
+
+buildPythonApplication rec {
+ pname = "yokadi";
+ version = "1.1.1";
+
+ src = fetchurl {
+ url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2";
+ sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17";
+ };
+
+ propagatedBuildInputs = [
+ dateutil
+ sqlalchemy
+ setproctitle
+ icalendar
+ pycrypto
+ ];
+
+ # Yokadi doesn't have any tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A command line oriented, sqlite powered, todo-list";
+ homepage = https://yokadi.github.io/index.html;
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.nipav ];
+ };
+}
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 8a460f890167..afb38ace1d93 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig
, gtk, girara, ncurses, gettext, docutils
-, file, sqlite, glib, texlive
-, synctexSupport ? true
+, file, sqlite, glib, texlive, libintlOrEmpty
+, gtk-mac-integration, synctexSupport ? true
}:
assert synctexSupport -> texlive != null;
@@ -10,21 +10,26 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "zathura-core-${version}";
- version = "0.3.7";
+ version = "0.3.8";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
- sha256 = "1w0g74dq4z2vl3f99s2gkaqrb5pskgzig10qhbxj4gq9yj4zzbr2";
+ sha256 = "0dz5pky3vmf3s2cp2rv1c099gb1s49p9xlgm3ghyy4pzyxc8bgs6";
};
icon = ./icon.xpm;
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [
+ pkgconfig
+ ] ++ optional stdenv.isDarwin [ libintlOrEmpty ];
+
buildInputs = [
file gtk girara
gettext makeWrapper sqlite glib
- ] ++ optional synctexSupport texlive.bin.core;
+ ] ++ optional synctexSupport texlive.bin.core
+ ++ optional stdenv.isDarwin [ gtk-mac-integration ];
+ NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
makeFlags = [
@@ -50,7 +55,7 @@ stdenv.mkDerivation rec {
homepage = http://pwmt.org/projects/zathura/;
description = "A core component for zathura PDF viewer";
license = licenses.zlib;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ garbas ];
};
}
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 34508da0e371..d280a10f6180 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
stdenv.mkDerivation rec {
- name = "zathura-djvu-0.2.5";
+ name = "zathura-djvu-0.2.7";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
- sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8";
+ sha256 = "1sbfdsyp50qc85xc4458sn4w1rv1qbygdwmcr5kjlfpsmdq98vhd";
};
nativeBuildInputs = [ pkgconfig ];
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
patches = [ ./gtkflags.patch ];
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
+ string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
+ makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
+ echo "''${makefileC1/$string1/$string2}" > Makefile
+ '';
+
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
meta = with stdenv.lib; {
@@ -23,7 +30,7 @@ stdenv.mkDerivation rec {
djvulibre library.
'';
license = licenses.zlib;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ garbas ];
};
}
diff --git a/pkgs/applications/misc/zathura/djvu/gtkflags.patch b/pkgs/applications/misc/zathura/djvu/gtkflags.patch
index 2a2fe298a7b9..6e8819e60823 100644
--- a/pkgs/applications/misc/zathura/djvu/gtkflags.patch
+++ b/pkgs/applications/misc/zathura/djvu/gtkflags.patch
@@ -1,7 +1,7 @@
---- a/config.mk 2012-05-14 01:13:09.009740082 +0400
-+++ b/config.mk 2012-05-14 01:13:50.400525700 +0400
-@@ -11,6 +11,9 @@
- LIBDIR ?= ${PREFIX}/lib
+--- zathura-djvu-0.2.7.orig/config.mk 2017-12-21 14:20:24.000000000 +0100
++++ zathura-djvu-0.2.7/config.mk 2017-12-31 00:41:02.580154770 +0100
+@@ -16,6 +16,9 @@
+ DESKTOPPREFIX ?= ${PREFIX}/share/applications
# libs
+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
@@ -10,14 +10,14 @@
CAIRO_INC ?= $(shell pkg-config --cflags cairo)
CAIRO_LIB ?= $(shell pkg-config --libs cairo)
-@@ -29,8 +32,8 @@
+@@ -34,8 +37,8 @@
PLUGINDIR = ${LIBDIR}/zathura
endif
--INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC}
--LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB}
-+INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC} ${GTK_INC}
-+LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${GTK_LIB}
+-INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC}
+-LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB}
++INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC}
++LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} ${GTK_LIB}
- # flags
- CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
+ # pre-processor flags
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index c9472f356672..1ca7644f60f8 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,17 +1,30 @@
-{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl
-, libjpeg, jbig2dec, openjpeg, fetchpatch }:
+{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk,
+gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec,
+openjpeg, fetchpatch }:
stdenv.mkDerivation rec {
- version = "0.3.1";
+ version = "0.3.2";
name = "zathura-pdf-mupdf-${version}";
src = fetchurl {
url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz";
- sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr";
+ sha256 = "0xkajc3is7ncmb2fmymbzfgrran2bz12i7zsm1vvxhxds728h7ck";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ];
+
+ buildInputs = [
+ zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg
+ ] ++ stdenv.lib.optional stdenv.isDarwin [
+ gtk-mac-integration
+ ];
+
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
+ string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
+ makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
+ echo "''${makefileC1/$string1/$string2}" > Makefile
+ '';
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
@@ -23,7 +36,7 @@ stdenv.mkDerivation rec {
using the mupdf rendering library.
'';
license = licenses.zlib;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan ];
};
}
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 2dda88f409b5..215ebdd75640 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,28 +1,35 @@
{ stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }:
stdenv.mkDerivation rec {
- version = "0.2.6";
+ version = "0.2.8";
name = "zathura-pdf-poppler-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
- sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi";
+ sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ poppler zathura_core girara ];
+ nativeBuildInputs = [ pkgconfig zathura_core ];
+ buildInputs = [ poppler girara ];
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
+ string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
+ makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
+ echo "''${makefileC1/$string1/$string2}" > Makefile
+ '';
+
meta = with lib; {
homepage = http://pwmt.org/projects/zathura/;
description = "A zathura PDF plugin (poppler)";
longDescription = ''
- The zathura-pdf-poppler plugin adds PDF support to zathura by
+ The zathura-pdf-poppler plugin adds PDF support to zathura by
using the poppler rendering library.
'';
license = licenses.zlib;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan garbas ];
};
}
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index a415cde3c7ee..c324deb28e0a 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
+{ stdenv, lib, fetchurl, pkgconfig, gtk2, zathura_core, girara, libspectre, gettext }:
stdenv.mkDerivation rec {
- name = "zathura-ps-0.2.3";
+ name = "zathura-ps-0.2.5";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
- sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9";
+ sha256 = "1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libspectre gettext zathura_core gtk girara ];
+ buildInputs = [ libspectre gettext zathura_core gtk2 girara ];
patches = [ ./gtkflags.patch ];
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
+ makefileC2=$(echo "$makefileC1" | sed 's|-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}|-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}|g' )
+ echo "$makefileC2" > Makefile
+ echo "$makefileC2"
+ '';
+
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
meta = with lib; {
@@ -23,7 +30,7 @@ stdenv.mkDerivation rec {
libspectre library.
'';
license = licenses.zlib;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan garbas ];
};
}
diff --git a/pkgs/applications/misc/zathura/ps/gtkflags.patch b/pkgs/applications/misc/zathura/ps/gtkflags.patch
index 7c944a12f0ef..1464d2c8373b 100644
--- a/pkgs/applications/misc/zathura/ps/gtkflags.patch
+++ b/pkgs/applications/misc/zathura/ps/gtkflags.patch
@@ -1,9 +1,7 @@
-diff --git a/config.mk b/config.mk.new
-index c3a7b37..0cbce67 100644
---- a/config.mk
-+++ b/config.mk
-@@ -10,6 +10,9 @@ ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERS
- PREFIX ?= /usr
+--- zathura-ps-0.2.5.orig/config.mk 2017-12-21 14:21:17.000000000 +0100
++++ zathura-ps-0.2.5/config.mk 2017-12-31 01:05:17.507268817 +0100
+@@ -16,6 +16,9 @@
+ DESKTOPPREFIX ?= ${PREFIX}/share/applications
# libs
+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
@@ -12,14 +10,14 @@ index c3a7b37..0cbce67 100644
CAIRO_INC ?= $(shell pkg-config --cflags cairo)
CAIRO_LIB ?= $(shell pkg-config --libs cairo)
-@@ -26,8 +29,8 @@ ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
- PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)
- PLUGINDIR ?= ${PREFIX}/lib/zathura
+@@ -34,8 +37,8 @@
+ PLUGINDIR = ${LIBDIR}/zathura
+ endif
--INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC}
--LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB}
-+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC} ${GTK_INC}
-+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${GTK_LIB}
+-INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC}
+-LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB}
++INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC}
++LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB } ${GTK_LIB}
- # flags
- CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
+ # compiler flags
+ CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index 55ac9bd187a7..2fd7d58e63ed 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -11,12 +11,11 @@ in symlinkJoin {
buildInputs = [ makeWrapper ];
postBuild = ''
- wrapProgram $out/bin/zathura \
- --add-flags --plugins-dir=${pluginsPath}
+ wrapProgram $out/bin/zathura --add-flags --plugins-dir=${pluginsPath}
'';
meta = with lib; {
- homepage = http://pwmt.org/projects/zathura/;
+ homepage = https://pwmt.org/projects/zathura/;
description = "A highly customizable and functional PDF viewer";
longDescription = ''
Zathura is a highly customizable and functional PDF viewer based on the
@@ -25,7 +24,7 @@ in symlinkJoin {
as well as an easy usage that mainly focuses on keyboard interaction.
'';
license = licenses.zlib;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers;[ garbas smironov ];
};
}
diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix
new file mode 100644
index 000000000000..d593947f3e62
--- /dev/null
+++ b/pkgs/applications/networking/apache-directory-studio/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, xorg, jre, makeWrapper, makeDesktopItem }:
+
+let
+ rpath = stdenv.lib.makeLibraryPath (with xorg; [
+ libXtst
+ ]);
+
+ desktopItem = makeDesktopItem {
+ name = "apache-directory-studio";
+ exec = "ApacheDirectoryStudio";
+ icon = "apache-directory-studio";
+ comment = "Eclipse-based LDAP browser and directory client";
+ desktopName = "Apache Directory Studio";
+ genericName = "Apache Directory Studio";
+ categories = "Java;Network";
+ };
+
+in
+stdenv.mkDerivation rec {
+ name = "apache-directory-studio-${version}";
+ version = "2.0.0.v20170904-M13";
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "mirror://apache/directory/studio/${version}/ApacheDirectoryStudio-${version}-linux.gtk.x86_64.tar.gz";
+ sha256 = "1jfnm6m0ijk31r30hhrxxnizk742dm317iny041p29v897rma7aq";
+ }
+ else if stdenv.system == "i686-linux" then
+ fetchurl {
+ url = "mirror://apache/directory/studio/${version}/ApacheDirectoryStudio-${version}-linux.gtk.x86.tar.gz";
+ sha256 = "1bxmgram42qyhrqkgp5k8770f5mjjdd4c6xl4gj09smiycm1qa4n";
+ }
+ else throw "Unsupported system: ${stdenv.system}";
+
+ buildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ dest="$out/libexec/ApacheDirectoryStudio"
+ mkdir -p "$dest"
+ cp -r . "$dest"
+
+ mkdir -p "$out/bin"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ "$dest/ApacheDirectoryStudio"
+ makeWrapper "$dest/ApacheDirectoryStudio" \
+ "$out/bin/ApacheDirectoryStudio" \
+ --prefix PATH : "${jre}/bin" \
+ --prefix LD_LIBRARY_PATH : "${rpath}"
+ install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm"
+ install -D -t "$out/share/applications" ${desktopItem}/share/applications/*
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Eclipse-based LDAP browser and directory client";
+ homepage = "https://directory.apache.org/studio/";
+ license = licenses.asl20;
+ # Upstream supports macOS and Windows too.
+ platforms = platforms.linux;
+ maintainers = [ maintainers.bjornfor ];
+ };
+}
diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix
index 3fa7fe180402..eb988471c8c7 100644
--- a/pkgs/applications/networking/bittorrentsync/generic.nix
+++ b/pkgs/applications/networking/bittorrentsync/generic.nix
@@ -4,8 +4,9 @@ let
arch = {
"x86_64-linux" = "x64";
"i686-linux" = "i386";
- }.${stdenv.system};
+ }.${stdenv.system} or throwSystem;
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
+ throwSystem = throw "Unsupported system: ${stdenv.system}";
in
stdenv.mkDerivation rec {
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
"https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz"
"http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"
];
- sha256 = sha256s.${stdenv.system};
+ sha256 = sha256s.${stdenv.system} or throwSystem;
};
dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 54fee5847e18..e35d894e0e7e 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -50,6 +50,6 @@ mkChromiumDerivation (base: rec {
maintainers = with maintainers; [ chaoflow bendlas ];
license = licenses.bsd3;
platforms = platforms.linux;
- hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
+ 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 82c2c6aa53fc..44310b054628 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, ninja, which, nodejs, fetchurl, gnutar
+{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
# default dependencies
, bzip2, flac, speex, libopus
@@ -11,8 +11,8 @@
, nspr, systemd, kerberos
, utillinux, alsaLib
, bison, gperf
-, glib, gtk2, gtk3, dbus_glib
-, libXScrnSaver, libXcursor, libXtst, mesa
+, glib, gtk2, gtk3, dbus-glib
+, libXScrnSaver, libXcursor, libXtst, libGLU_combined
, protobuf, speechd, libXdamage, cups
, ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2
@@ -25,7 +25,7 @@
, enableHotwording ? false
, enableWideVine ? false
, gnomeSupport ? false, gnome ? null
-, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
+, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
, proprietaryCodecs ? true
, cupsSupport ? true
, pulseSupport ? false, libpulseaudio ? null
@@ -44,6 +44,15 @@ let
# source tree.
extraAttrs = buildFun base;
+ gentooPatch = name: sha256: fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}";
+ inherit sha256;
+ };
+ githubPatch = commit: sha256: fetchpatch {
+ url = "https://github.com/chromium/chromium/commit/${commit}.patch";
+ inherit sha256;
+ };
+
mkGnFlags =
let
# Serialize Nix types into GN types according to this document:
@@ -64,9 +73,8 @@ let
# "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
# "re2" # fails with linker errors
# "ffmpeg" # https://crbug.com/731766
- ] ++ optionals (versionRange "62" "63") [
- "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
- # so we can't build with one from system and other from source
+ # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
+ # so we can't build with one from system and other from source
];
opusWithCustomModes = libopus.override {
@@ -80,9 +88,8 @@ let
xdg_utils yasm minizip libwebp
libusb1 re2 zlib
ffmpeg libxslt libxml2
- ] ++ optionals (versionRange "62" "63") [
- harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together
- # so we can't build with one from system and other from source
+ # harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together
+ # so we can't build with one from system and other from source
];
# build paths and release info
@@ -122,36 +129,57 @@ let
nspr nss systemd
utillinux alsaLib
bison gperf kerberos
- glib gtk2 gtk3 dbus_glib
- libXScrnSaver libXcursor libXtst mesa
+ glib gtk2 gtk3 dbus-glib
+ libXScrnSaver libXcursor libXtst libGLU_combined
pciutils protobuf speechd libXdamage
- ] ++ optional gnomeKeyringSupport libgnome_keyring3
+ ] ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport libpulseaudio;
patches = [
./patches/nix_plugin_paths_52.patch
- # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
- # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
- ./patches/fix_network_api_crash.patch
- ] # As major versions are added, you can trawl the gentoo and arch repos at
+ # As major versions are added, you can trawl the gentoo and arch repos at
# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
# https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
# for updated patches and hints about build flags
- ++ optionals (versionRange "62" "63") [
- ./patches/chromium-gn-bootstrap-r17.patch
- ./patches/chromium-gcc5-r3.patch
- ./patches/chromium-glibc2.26-r1.patch
- ]
- ++ optionals (versionRange "63" "64") [
- ./patches/chromium-gcc5-r4.patch
- ./patches/include-math-for-round.patch
- ]
- ++ optionals (versionAtLeast version "64") [
- ./patches/gn_bootstrap_observer.patch
- ]
- ++ optional enableWideVine ./patches/widevine.patch;
+ # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000")
+ ] ++ optionals (versionRange "65" "66") [
+ (gentooPatch "chromium-stdint.patch" "037gjnc8h087g6dpxz53nqvzbpa9mq0z47h25vix9p62s9nhz2a8")
+ (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd")
+ (gentooPatch "chromium-math.h-r0.patch" "0dlzbdj0lvp9qklgifsvgbn6p1ppxbl3hkwqqqfsw1d9jka9wy8x")
+ # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
+ # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
+ (githubPatch "1517db71cccaec48a05cdf30208e0cba7ab9b9a8" "08ac502cwwb05ml3w4wzn66i5c2d1h22xs5rzszwlnhxckxfc0fk")
+ # GCC 7 fixes
+ (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv")
+ (githubPatch "4d8468a07f374c11425494271256151fb6fe0c34" "0kqqq8kj0zv5bi1n9mm0vnn8wsgi98mjmj7snpav21fh3pgiqjrm")
+ (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj")
+ (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj")
+ # Following commit doesn't apply cleanly to stable branch, replace with handcrafted one
+ #(githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z")
+ ./patches/PlaybackImageProvider-copy-constructor.patch
+ # * base/optional.h
+ (githubPatch "f1c8789c71dbdaeeef98ecd52c9715495824e6b0" "0w3d82s10cl10r6zq9vpsscmdhbdkcy0vbdiqy5pvbr031nfxw5w")
+ (githubPatch "5cae9645215d02cb1f986a181a208f8a4817fc86" "052y0f9nwq6y6jh2gvr1pm8qdcqghyi3jj5svvrp5aqirlkwb7ri")
+ # * ConfigurationPolicyProviders
+ (githubPatch "1ee888aed9f9a6291570ce360bcdd2d06bcc68cb" "1bm34p3bsny44sk60j842ghhhx8qaibwpqnfnyndfj96f7nb2az0")
+ (githubPatch "76da73abaeede740fc97479c09c92a52972bc477" "03rkf514ddj9d32d3zfcnf96kzzdk6cwxvrqj8acyv93vp1hvckr")
+ #(gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000")
+ ] ++ optionals (versionRange "66" "67") [
+ (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd")
+ (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4")
+ # GCC 7 fixes
+ (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv")
+ (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj")
+ (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj")
+ (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj")
+ (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw")
+ (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z")
+ ] ++ optional enableWideVine ./patches/widevine.patch
+ ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [
+ ./patches/skia_buildfix.patch
+ ];
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
@@ -200,6 +228,9 @@ let
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-delete
done
+ '' + optionalString stdenv.isAarch64 ''
+ substituteInPlace build/toolchain/linux/BUILD.gn \
+ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
'';
gnFlags = mkGnFlags ({
@@ -211,6 +242,7 @@ let
proprietary_codecs = false;
use_sysroot = false;
use_gnome_keyring = gnomeKeyringSupport;
+ ## FIXME remove use_gconf after chromium 65 has become stable
use_gconf = gnomeSupport;
use_gio = gnomeSupport;
enable_nacl = enableNaCl;
@@ -269,15 +301,14 @@ let
ninja -C "${buildPath}" \
-j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \
"${target}"
- '' + optionalString (target == "mksnapshot" || target == "chrome") ''
- paxmark m "${buildPath}/${target}"
- '' + optionalString (versionAtLeast version "63") ''
(
source chrome/installer/linux/common/installer.include
PACKAGE=$packageName
MENUNAME="Chromium"
process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"
)
+ '' + optionalString (target == "mksnapshot" || target == "chrome") ''
+ paxmark m "${buildPath}/${target}"
'';
targets = extraAttrs.buildTargets or [];
commands = map buildCommand targets;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 911b55b115f9..1458a1816569 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,5 +1,5 @@
{ newScope, stdenv, makeWrapper, makeDesktopItem, ed
-, glib, gtk3, gnome3, gsettings_desktop_schemas
+, glib, gtk3, gnome3, gsettings-desktop-schemas
# package customization
, channel ? "stable"
@@ -75,7 +75,7 @@ in stdenv.mkDerivation {
makeWrapper ed
# needed for GSETTINGS_SCHEMAS_PATH
- gsettings_desktop_schemas glib gtk3
+ gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
gnome3.defaultIconTheme
@@ -90,7 +90,7 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin"
eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
- ${commandLineArgs} \
+ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
ed -v -s "$out/bin/chromium" << EOF
@@ -117,13 +117,19 @@ in stdenv.mkDerivation {
ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
mkdir -p "$out/share/applications"
- for f in '${chromium.browser}'/share/*; do
+ for f in '${chromium.browser}'/share/*; do # hello emacs */
ln -s -t "$out/share/" "$f"
done
cp -v "${desktopItem}/share/applications/"* "$out/share/applications"
'';
- inherit (chromium.browser) meta packageName;
+ inherit (chromium.browser) packageName;
+ meta = chromium.browser.meta // {
+ broken = if enableWideVine then
+ builtins.trace "WARNING: WideVine is not functional, please only use for testing"
+ true
+ else false;
+ };
passthru = {
inherit (chromium) upstream-info browser;
diff --git a/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch b/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch
new file mode 100644
index 000000000000..a9b70ac50863
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch
@@ -0,0 +1,89 @@
+--- a/cc/raster/playback_image_provider.cc
++++ b/cc/raster/playback_image_provider.cc
+@@ -20,7 +20,7 @@
+ PlaybackImageProvider::PlaybackImageProvider(
+ ImageDecodeCache* cache,
+ const gfx::ColorSpace& target_color_space,
+- base::Optional settings)
++ base::Optional&& settings)
+ : cache_(cache),
+ target_color_space_(target_color_space),
+ settings_(std::move(settings)) {
+@@ -70,7 +70,10 @@
+ }
+
+ PlaybackImageProvider::Settings::Settings() = default;
+-PlaybackImageProvider::Settings::Settings(const Settings& other) = default;
++PlaybackImageProvider::Settings::Settings(PlaybackImageProvider::Settings&&) =
++ default;
+ PlaybackImageProvider::Settings::~Settings() = default;
++PlaybackImageProvider::Settings& PlaybackImageProvider::Settings::operator=(
++ PlaybackImageProvider::Settings&&) = default;
+
+ } // namespace cc
+--- a/cc/raster/playback_image_provider.h
++++ b/cc/raster/playback_image_provider.h
+@@ -20,8 +20,10 @@
+ public:
+ struct CC_EXPORT Settings {
+ Settings();
+- Settings(const Settings& other);
++ Settings(const Settings&) = delete;
++ Settings(Settings&&);
+ ~Settings();
++ Settings& operator=(Settings&&);
+
+ // The set of image ids to skip during raster.
+ PaintImageIdFlatSet images_to_skip;
+@@ -34,7 +36,7 @@
+ // If no settings are provided, all images are skipped during rasterization.
+ PlaybackImageProvider(ImageDecodeCache* cache,
+ const gfx::ColorSpace& target_color_space,
+- base::Optional settings);
++ base::Optional&& settings);
+ ~PlaybackImageProvider() override;
+
+ PlaybackImageProvider(PlaybackImageProvider&& other);
+--- a/cc/raster/playback_image_provider_unittest.cc
++++ b/cc/raster/playback_image_provider_unittest.cc
+@@ -84,7 +84,8 @@ TEST(PlaybackImageProviderTest, SkipsSomeImages) {
+ settings.emplace();
+ settings->images_to_skip = {skip_image.stable_id()};
+
+- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
++ PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
++ std::move(settings));
+ provider.BeginRaster();
+
+ SkIRect rect = SkIRect::MakeWH(10, 10);
+@@ -100,7 +101,8 @@ TEST(PlaybackImageProviderTest, RefAndUnrefDecode) {
+
+ base::Optional settings;
+ settings.emplace();
+- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
++ PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
++ std::move(settings));
+ provider.BeginRaster();
+
+ {
+@@ -133,7 +135,8 @@ TEST(PlaybackImageProviderTest, AtRasterImages) {
+ settings.emplace();
+ settings->at_raster_images = {draw_image1, draw_image2};
+
+- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
++ PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
++ std::move(settings));
+
+ EXPECT_EQ(cache.refed_image_count(), 0);
+ provider.BeginRaster();
+@@ -158,7 +161,8 @@ TEST(PlaybackImageProviderTest, SwapsGivenFrames) {
+ settings.emplace();
+ settings->image_to_current_frame_index = image_to_frame;
+
+- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
++ PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
++ std::move(settings));
+ provider.BeginRaster();
+
+ SkIRect rect = SkIRect::MakeWH(10, 10);
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch
deleted file mode 100644
index 7605df6b145a..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
- allocation_length_(0),
- data_(data),
- data_length_(0),
-- kind_(AllocationKind::kNormal),
-+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
- deleter_(deleter) {}
- DataHandle(void* allocation_base,
- size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
- reinterpret_cast(allocation_base_) +
- allocation_length_);
- switch (kind_) {
-- case AllocationKind::kNormal:
-+ case WTF::ArrayBufferContents::AllocationKind::kNormal:
- DCHECK(deleter_);
- deleter_(data_);
- return;
-- case AllocationKind::kReservation:
-+ case WTF::ArrayBufferContents::AllocationKind::kReservation:
- ReleaseReservedMemory(allocation_base_, allocation_length_);
- return;
- }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
-
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
-
--#include
-+#include
- #include
- #include
-
---- a/gpu/ipc/common/mailbox_struct_traits.h
-+++ b/gpu/ipc/common/mailbox_struct_traits.h
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits {
- static base::span name(const gpu::Mailbox& mailbox) {
-- return mailbox.name;
-+ return base::make_span(mailbox.name);
- }
- static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-@@ -134,7 +134,7 @@ struct StructTraits {
- static base::span matrix(const cc::FilterOperation& operation) {
- if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
- return base::span();
-- return operation.matrix();
-+ return base::make_span(operation.matrix());
- }
-
- static base::span shape(
---- a/services/viz/public/cpp/compositing/quads_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
-@@ -284,7 +284,7 @@
-
- static base::span vertex_opacity(const cc::DrawQuad& input) {
- const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input);
-- return quad->vertex_opacity;
-+ return base::make_span(quad->vertex_opacity);
- }
-
- static bool y_flipped(const cc::DrawQuad& input) {
---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
-@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
-@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch
deleted file mode 100644
index cb978d58a060..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
- allocation_length_(0),
- data_(data),
- data_length_(0),
-- kind_(AllocationKind::kNormal),
-+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
- deleter_(deleter) {}
- DataHandle(void* allocation_base,
- size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
- reinterpret_cast(allocation_base_) +
- allocation_length_);
- switch (kind_) {
-- case AllocationKind::kNormal:
-+ case WTF::ArrayBufferContents::AllocationKind::kNormal:
- DCHECK(deleter_);
- deleter_(data_);
- return;
-- case AllocationKind::kReservation:
-+ case WTF::ArrayBufferContents::AllocationKind::kReservation:
- ReleaseReservedMemory(allocation_base_, allocation_length_);
- return;
- }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
-
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
-
--#include
-+#include
- #include
- #include
-
---- a/gpu/ipc/common/mailbox_struct_traits.h
-+++ b/gpu/ipc/common/mailbox_struct_traits.h
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits {
- static base::span name(const gpu::Mailbox& mailbox) {
-- return mailbox.name;
-+ return base::make_span(mailbox.name);
- }
- static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-@@ -134,7 +134,7 @@ struct StructTraits {
- static base::span matrix(const cc::FilterOperation& operation) {
- if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
- return base::span();
-- return operation.matrix();
-+ return base::make_span(operation.matrix());
- }
-
- static base::span shape(
---- a/services/viz/public/cpp/compositing/quads_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
-@@ -303,7 +303,7 @@ struct StructTraits {
- static base::span vertex_opacity(const viz::DrawQuad& input) {
- const viz::TextureDrawQuad* quad =
- viz::TextureDrawQuad::MaterialCast(&input);
-- return quad->vertex_opacity;
-+ return base::make_span(quad->vertex_opacity);
- }
-
- static bool y_flipped(const viz::DrawQuad& input) {
---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
-@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
-@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch
deleted file mode 100644
index ec37a2816d51..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index c80724d..052ce37 100644
---- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -36,19 +36,19 @@ namespace google_breakpad {
-
- // Minidump defines register structures which are different from the raw
- // structures which we get from the kernel. These are platform specific
--// functions to juggle the ucontext and user structures into minidump format.
-+// functions to juggle the ucontext_t and user structures into minidump format.
-
- #if defined(__i386__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_ESP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_EIP];
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fp) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
-@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-
- #elif defined(__x86_64)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_RSP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_RIP];
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fpregs) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
-@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-
- #elif defined(__ARM_EABI__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.arm_sp;
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.arm_pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- out->context_flags = MD_CONTEXT_ARM_FULL;
-
- out->iregs[0] = uc->uc_mcontext.arm_r0;
-@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-
- #elif defined(__aarch64__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.sp;
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs) {
- out->context_flags = MD_CONTEXT_ARM64_FULL;
-
-@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-
- #elif defined(__mips__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- #if _MIPS_SIM == _ABI64
- out->context_flags = MD_CONTEXT_MIPS64_FULL;
- #elif _MIPS_SIM == _ABIO32
-diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-index b6e77b4..2de80b7 100644
---- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -39,23 +39,23 @@
-
- namespace google_breakpad {
-
--// Wraps platform-dependent implementations of accessors to ucontext structs.
-+// Wraps platform-dependent implementations of accessors to ucontext_t structs.
- struct UContextReader {
-- static uintptr_t GetStackPointer(const struct ucontext* uc);
-+ static uintptr_t GetStackPointer(const ucontext_t* uc);
-
-- static uintptr_t GetInstructionPointer(const struct ucontext* uc);
-+ static uintptr_t GetInstructionPointer(const ucontext_t* uc);
-
-- // Juggle a arch-specific ucontext into a minidump format
-+ // Juggle a arch-specific ucontext_t into a minidump format
- // out: the minidump structure
- // info: the collection of register structures.
- #if defined(__i386__) || defined(__x86_64)
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fp);
- #elif defined(__aarch64__)
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs);
- #else
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
- #endif
- };
-
-diff --git a/breakpad/src/client/linux/handler/exception_handler.cc b/breakpad/src/client/linux/handler/exception_handler.cc
-index 586d84e..05936d2 100644
---- a/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
- // Fill in all the holes in the struct to make Valgrind happy.
- memset(&g_crash_context_, 0, sizeof(g_crash_context_));
- memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
-- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
-+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
- #if defined(__aarch64__)
-- struct ucontext* uc_ptr = (struct ucontext*)uc;
-+ ucontext_t* uc_ptr = (ucontext_t*)uc;
- struct fpsimd_context* fp_ptr =
- (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
- if (fp_ptr->head.magic == FPSIMD_MAGIC) {
-@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
- }
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
- // FP state is not part of user ABI on ARM Linux.
-- // In case of MIPS Linux FP state is already part of struct ucontext
-+ // In case of MIPS Linux FP state is already part of ucontext_t
- // and 'float_state' is not a member of CrashContext.
-- struct ucontext* uc_ptr = (struct ucontext*)uc;
-+ ucontext_t* uc_ptr = (ucontext_t*)uc;
- if (uc_ptr->uc_mcontext.fpregs) {
- memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
- sizeof(g_crash_context_.float_state));
-@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
- // ExceptionHandler::HandleSignal().
- siginfo.si_code = SI_USER;
- siginfo.si_pid = getpid();
-- struct ucontext context;
-+ ucontext_t context;
- getcontext(&context);
- return HandleSignal(sig, &siginfo, &context);
- }
-diff --git a/breakpad/src/client/linux/handler/exception_handler.h b/breakpad/src/client/linux/handler/exception_handler.h
-index daba57e..25598a2 100644
---- a/breakpad/src/client/linux/handler/exception_handler.h
-+++ b/breakpad/src/client/linux/handler/exception_handler.h
-@@ -191,11 +191,11 @@ class ExceptionHandler {
- struct CrashContext {
- siginfo_t siginfo;
- pid_t tid; // the crashing thread.
-- struct ucontext context;
-+ ucontext_t context;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- // #ifdef this out because FP state is not part of user ABI for Linux ARM.
- // In case of MIPS Linux FP state is already part of struct
-- // ucontext so 'float_state' is not required.
-+ // ucontext_t so 'float_state' is not required.
- fpstate_t float_state;
- #endif
- };
-diff --git a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-index 3764eec..80ad5c4 100644
---- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-+++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-@@ -593,7 +593,7 @@ class MicrodumpWriter {
-
- void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
-
-- const struct ucontext* const ucontext_;
-+ const ucontext_t* const ucontext_;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_;
- #endif
-diff --git a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-index d11ba6e..c716143 100644
---- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-+++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-@@ -1323,7 +1323,7 @@ class MinidumpWriter {
- const int fd_; // File descriptor where the minidum should be written.
- const char* path_; // Path to the file where the minidum should be written.
-
-- const struct ucontext* const ucontext_; // also from the signal handler
-+ const ucontext_t* const ucontext_; // also from the signal handler
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_; // ditto
- #endif
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch
deleted file mode 100644
index 6cfd08d58c23..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options):
-
- write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
- {
-+ 'ENABLE_LOCATION_SOURCE': 'false',
- 'ENABLE_PROFILING': 'false',
- 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false'
- })
-@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options):
-
- write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
- root_gen_dir, options)
-- cmd = ['ninja', '-C', tempdir]
-+ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
- if options.verbose:
- cmd.append('-v')
-
-@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/metrics/bucket_ranges.cc',
- 'base/metrics/field_trial.cc',
- 'base/metrics/field_trial_param_associator.cc',
-+ 'base/metrics/field_trial_params.cc',
- 'base/metrics/histogram.cc',
- 'base/metrics/histogram_base.cc',
- 'base/metrics/histogram_functions.cc',
-@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/task_scheduler/scheduler_lock_impl.cc',
- 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
- 'base/task_scheduler/scheduler_worker.cc',
-+ 'base/task_scheduler/scheduler_worker_pool.cc',
- 'base/task_scheduler/scheduler_worker_pool_impl.cc',
- 'base/task_scheduler/scheduler_worker_pool_params.cc',
- 'base/task_scheduler/scheduler_worker_stack.cc',
-@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/third_party/icu/icu_utf.cc',
- 'base/third_party/nspr/prtime.cc',
- 'base/threading/post_task_and_reply_impl.cc',
-+ 'base/threading/scoped_blocking_call.cc',
- 'base/threading/sequence_local_storage_map.cc',
- 'base/threading/sequenced_task_runner_handle.cc',
- 'base/threading/sequenced_worker_pool.cc',
-@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/unguessable_token.cc',
- 'base/value_iterators.cc',
- 'base/values.cc',
-- 'base/value_iterators.cc',
- 'base/vlog.cc',
- ])
-
-@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- static_libraries['base']['sources'].extend([
- 'base/memory/shared_memory_handle_posix.cc',
- 'base/memory/shared_memory_posix.cc',
-- 'base/memory/shared_memory_tracker.cc',
- 'base/nix/xdg_util.cc',
- 'base/process/internal_linux.cc',
- 'base/process/memory_linux.cc',
-@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options):
- cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args]
- check_call(cmd)
-
-- cmd = ['ninja', '-C', build_dir]
-+ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err']
- if options.verbose:
- cmd.append('-v')
- cmd.append('gn')
diff --git a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch
deleted file mode 100644
index 9f187752ea67..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From aab2cc3a20af9ebe9ddb8dfd15089f131f95817f Mon Sep 17 00:00:00 2001
-From: Tomas Popela
-Date: Fri, 20 Oct 2017 14:06:42 +0200
-Subject: [PATCH] Fix the build of base/numerics with GCC
-
-Initialize the uninitialized variables where the build is failing.
-
-BUG=776705
-
-Change-Id: I5782e18086a752b3676f8738930bf0553f3f97ad
----
- base/numerics/checked_math_impl.h | 6 +++---
- base/numerics/clamped_math_impl.h | 10 +++++-----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h
-index 2926b37b5e..e083389ebf 100644
---- a/base/numerics/checked_math_impl.h
-+++ b/base/numerics/checked_math_impl.h
-@@ -67,7 +67,7 @@ struct CheckedAddOp::value) {
- presult = static_cast(x) + static_cast(y);
-@@ -127,7 +127,7 @@ struct CheckedSubOp::value) {
- presult = static_cast(x) - static_cast(y);
-@@ -183,7 +183,7 @@ struct CheckedMulOp::is_supported) {
- // The fast op may be available with the promoted type.
-diff --git a/base/numerics/clamped_math_impl.h b/base/numerics/clamped_math_impl.h
-index 7b5e4346f2..303a7e945a 100644
---- a/base/numerics/clamped_math_impl.h
-+++ b/base/numerics/clamped_math_impl.h
-@@ -87,7 +87,7 @@ struct ClampedAddOp(IsValueNegative(y));
-- V result;
-+ V result = {};
- return BASE_NUMERICS_LIKELY((CheckedAddOp::Do(x, y, &result)))
- ? result
- : saturated;
-@@ -114,7 +114,7 @@ struct ClampedSubOp(!IsValueNegative(y));
-- V result;
-+ V result = {};
- return BASE_NUMERICS_LIKELY((CheckedSubOp::Do(x, y, &result)))
- ? result
- : saturated;
-@@ -136,7 +136,7 @@ struct ClampedMulOp::is_supported)
- return ClampedMulFastOp::template Do(x, y);
-
-- V result;
-+ V result = {};
- const V saturated =
- CommonMaxOrMin(IsValueNegative(x) ^ IsValueNegative(y));
- return BASE_NUMERICS_LIKELY((CheckedMulOp::Do(x, y, &result)))
-@@ -156,7 +156,7 @@ struct ClampedDivOp::type;
- template
- static constexpr V Do(T x, U y) {
-- V result;
-+ V result = {};
- if (BASE_NUMERICS_LIKELY((CheckedDivOp::Do(x, y, &result))))
- return result;
- // Saturation goes to max, min, or NaN (if x is zero).
-@@ -176,7 +176,7 @@ struct ClampedModOp::type;
- template
- static constexpr V Do(T x, U y) {
-- V result;
-+ V result = {};
- return BASE_NUMERICS_LIKELY((CheckedModOp::Do(x, y, &result)))
- ? result
- : x;
---
-2.14.2
-
diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch b/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch
deleted file mode 100644
index 093598465c47..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: extensions/browser/api/networking_private/networking_private_linux.cc
-===================================================================
---- a/extensions/browser/api/networking_private/networking_private_linux.cc.orig 2016-05-05 03:01:50.000000000 +0200
-+++ b/extensions/browser/api/networking_private/networking_private_linux.cc 2016-05-10 16:16:42.431052917 +0200
-@@ -215,12 +215,14 @@ void NetworkingPrivateLinux::GetState(
- std::unique_ptr network_properties(
- new base::DictionaryValue);
-
-+ std::string* erp = error.get();
-+ base::DictionaryValue* npp = network_properties.get();
- // Runs GetCachedNetworkProperties on |dbus_thread|.
- dbus_thread_.task_runner()->PostTaskAndReply(
- FROM_HERE, base::Bind(&NetworkingPrivateLinux::GetCachedNetworkProperties,
- base::Unretained(this), guid,
-- base::Unretained(network_properties.get()),
-- base::Unretained(error.get())),
-+ base::Unretained(npp),
-+ base::Unretained(erp)),
- base::Bind(&GetCachedNetworkPropertiesCallback, base::Passed(&error),
- base::Passed(&network_properties), success_callback,
- failure_callback));
-@@ -301,11 +303,12 @@ void NetworkingPrivateLinux::GetNetworks
-
- // Runs GetAllWiFiAccessPoints on the dbus_thread and returns the
- // results back to OnAccessPointsFound where the callback is fired.
-+ NetworkMap* nmp = network_map.get();
- dbus_thread_.task_runner()->PostTaskAndReply(
- FROM_HERE,
- base::Bind(&NetworkingPrivateLinux::GetAllWiFiAccessPoints,
- base::Unretained(this), configured_only, visible_only, limit,
-- base::Unretained(network_map.get())),
-+ base::Unretained(nmp)),
- base::Bind(&NetworkingPrivateLinux::OnAccessPointsFound,
- base::Unretained(this), base::Passed(&network_map),
- success_callback, failure_callback));
-@@ -321,11 +324,12 @@ bool NetworkingPrivateLinux::GetNetworks
- // Runs GetAllWiFiAccessPoints on the dbus_thread and returns the
- // results back to SendNetworkListChangedEvent to fire the event. No
- // callbacks are used in this case.
-+ NetworkMap* nmp = network_map.get();
- dbus_thread_.task_runner()->PostTaskAndReply(
- FROM_HERE, base::Bind(&NetworkingPrivateLinux::GetAllWiFiAccessPoints,
- base::Unretained(this), false /* configured_only */,
- false /* visible_only */, 0 /* limit */,
-- base::Unretained(network_map.get())),
-+ base::Unretained(nmp)),
- base::Bind(&NetworkingPrivateLinux::OnAccessPointsFoundViaScan,
- base::Unretained(this), base::Passed(&network_map)));
-
-@@ -506,11 +510,12 @@ void NetworkingPrivateLinux::StartConnec
-
- std::unique_ptr error(new std::string);
-
-+ std::string* erp = error.get();
- // Runs ConnectToNetwork on |dbus_thread|.
- dbus_thread_.task_runner()->PostTaskAndReply(
- FROM_HERE,
- base::Bind(&NetworkingPrivateLinux::ConnectToNetwork,
-- base::Unretained(this), guid, base::Unretained(error.get())),
-+ base::Unretained(this), guid, base::Unretained(erp)),
- base::Bind(&OnNetworkConnectOperationCompleted, base::Passed(&error),
- success_callback, failure_callback));
- }
-@@ -524,11 +529,12 @@ void NetworkingPrivateLinux::StartDiscon
-
- std::unique_ptr error(new std::string);
-
-+ std::string* erp = error.get();
- // Runs DisconnectFromNetwork on |dbus_thread|.
- dbus_thread_.task_runner()->PostTaskAndReply(
- FROM_HERE,
- base::Bind(&NetworkingPrivateLinux::DisconnectFromNetwork,
-- base::Unretained(this), guid, base::Unretained(error.get())),
-+ base::Unretained(this), guid, base::Unretained(erp)),
- base::Bind(&OnNetworkConnectOperationCompleted, base::Passed(&error),
- success_callback, failure_callback));
- }
diff --git a/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
deleted file mode 100644
index f1207439bb4d..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py 2017-11-07 23:06:09.000000000 +0000
-+++ b/tools/gn/bootstrap/bootstrap.py 2017-11-08 12:17:16.569216182 +0000
-@@ -481,6 +481,7 @@
- 'base/metrics/sample_vector.cc',
- 'base/metrics/sparse_histogram.cc',
- 'base/metrics/statistics_recorder.cc',
-+ 'base/observer_list_threadsafe.cc',
- 'base/path_service.cc',
- 'base/pending_task.cc',
- 'base/pickle.cc',
-
diff --git a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
deleted file mode 100644
index 530493dcd0f6..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa
-Date: Fri, 13 Oct 2017 15:49:32 +0200
-Subject: [PATCH] IWYU: Include math.h for round(3).
-
-math.h was being implicitly included, which can break the build with
-alternative libc implementations.
-
-Bug: None
-Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
-Reviewed-on: https://webrtc-review.googlesource.com/9384
-Reviewed-by: Tommi
-Commit-Queue: Raphael Kubo da Costa (rakuco)
-Cr-Commit-Position: refs/heads/master@{#20292}
----
- p2p/base/port.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/webrtc/p2p/base/port.cc b/third_party/webrtc/p2p/base/port.cc
-index a1b478d11..81aa0aadb 100644
---- a/third_party/webrtc/p2p/base/port.cc
-+++ b/third_party/webrtc/p2p/base/port.cc
-@@ -10,6 +10,8 @@
-
- #include "p2p/base/port.h"
-
-+#include
-+
- #include
- #include
-
---
-2.15.0
-
diff --git a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch
new file mode 100644
index 000000000000..5348b9ac905b
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch
@@ -0,0 +1,22 @@
+Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
+===================================================================
+--- chromium-browser-65.0.3325.73.orig/third_party/skia/src/jumper/SkJumper_stages.cpp
++++ chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
+@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
+ }
+
+ SI F from_half(U16 h) {
+-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f32_f16(h);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
+ }
+
+ SI U16 to_half(F f) {
+-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f16_f32(f);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index d9adad1189f8..07bc2bbc5f0f 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -1,6 +1,10 @@
{ stdenv
, jshon
+, glib
+, nspr
+, nss
, fetchzip
+, patchelfUnstable
, enablePepperFlash ? false
, enableWideVine ? false
@@ -45,6 +49,8 @@ let
src = upstream-info.binary;
+ nativeBuildInputs = [ patchelfUnstable ];
+
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
unpackCmd = let
@@ -63,14 +69,12 @@ let
! find -iname '*.so' -exec ldd {} + | grep 'not found'
'';
- patchPhase = ''
- for sofile in libwidevinecdm.so libwidevinecdmadapter.so; do
- chmod +x "$sofile"
- patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" "$sofile"
- done
+ PATCH_RPATH = mkrpath [ stdenv.cc.cc glib nspr nss ];
- patchelf --set-rpath "$out/lib:${mkrpath [ stdenv.cc.cc ]}" \
- libwidevinecdmadapter.so
+ patchPhase = ''
+ chmod +x libwidevinecdm.so libwidevinecdmadapter.so
+ patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so
+ patchelf --set-rpath "$out/lib:$PATCH_RPATH" libwidevinecdmadapter.so
'';
installPhase = let
@@ -94,12 +98,12 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
- version = "27.0.0.187";
+ version = "29.0.0.113";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "102z9aflm0a29klc26jch3wl4y8hdrxzqdqvf5yj0bnibx3hwpsy";
+ sha256 = "1ix86jv4ckn5pcj37fgx4mncqjyvabdvwxp9zs9frdfbyx740izr";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix
index 3b9ea3966473..277ad29abe29 100644
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/update.nix
@@ -145,7 +145,7 @@ in rec {
outputHashMode = "flat";
outputHashAlgo = "md5";
- buildInputs = [ curl ];
+ nativeBuildInputs = [ curl ];
preferLocalBuild = true;
buildCommand = ''
@@ -178,7 +178,7 @@ in rec {
getHash = path: import (runCommand "gethash.nix" {
inherit path;
- buildInputs = [ nix ];
+ nativeBuildInputs = [ nix ];
} ''
sha256="$(nix-hash --flat --base32 --type sha256 "$path")"
echo "\"$sha256\"" > "$out"
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 6e3ba922d25f..66d41a9c1658 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "1pk6ssvriqmckf61lafkbwyy98ylpaz0mq3g0zrifbhxzwkk01ni";
- sha256bin64 = "0svdxgszy377hm3lzys90xj8qna93r4xz3d89sy086c9sq1ncsr0";
- version = "63.0.3239.40";
+ sha256 = "13n84ky5fr5by71jd9ivj3q7czd2gxrnvbj8msskb62zamjb8z80";
+ sha256bin64 = "16f2b9sxyljrmj2rcfzamf9ji01pkamnb6qv363lf67fshm37ky0";
+ version = "65.0.3325.124";
};
dev = {
- sha256 = "0kpn5w1qvjlkxqhsc7lz269mxp7i0z9k92ay178kgsph3ygncm0x";
- sha256bin64 = "1pvnkhvks3yvpdh2qg9iqg6xmi5bxrl1n6mp9akywv1d5wsba7kg";
- version = "64.0.3260.2";
+ sha256 = "1qy8gv859qhg5s6gi3mvdgg1s5wi69r6qkhd851nwlmmjhvarfg8";
+ sha256bin64 = "1z1s6i4yx20ayr6a2ycbgd0ipy1ncw4i19k0g8jbn639kynmfxjw";
+ version = "66.0.3359.26";
};
stable = {
- sha256 = "1m2qjm4x789s3hx255gmmihqrqfx8f608fap3khsp2phgck4vg6a";
- sha256bin64 = "1wxszymlv2y1dk4f0hpgq9b86fzqb7x8q87rfbq7dvfj8g4vipz1";
- version = "62.0.3202.94";
+ sha256 = "1kkc276jfhw2kp9pfg1drxm1h98d2cwm4c5c7xay2pbrhkypnzk2";
+ sha256bin64 = "1vv34g05x2jyg8hgk1r760g38rb3r17p5iwf1f1wqkjp3z6c952v";
+ version = "65.0.3325.162";
};
}
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index 4da4c74d1c37..ded2b688815c 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchgit, unzip, firefox, makeWrapper }:
+{ stdenv, fetchgit, unzip, firefox-esr, makeWrapper }:
stdenv.mkDerivation rec {
pkgname = "conkeror";
- version = "1.0.3";
+ version = "1.0.4";
name = "${pkgname}-${version}";
src = fetchgit {
url = git://repo.or.cz/conkeror.git;
rev = "refs/tags/${version}";
- sha256 = "06fhfk8km3gd1lc19543zn0c71zfbn8wsalinvm1dbgi724f52pd";
+ sha256 = "10c57wqybp9kcjpkb01wxq0h3vafcdb1g5kb4k8sb2zajg59afv8";
};
buildInputs = [ unzip makeWrapper ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/libexec/conkeror
cp -r * $out/libexec/conkeror
- makeWrapper ${firefox}/bin/firefox $out/bin/conkeror \
+ makeWrapper ${firefox-esr}/bin/firefox $out/bin/conkeror \
--add-flags "-app $out/libexec/conkeror/application.ini"
'';
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index 137b463a1e1d..ec585e53fd23 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls
-, json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }:
+, json_c, m4, glib-networking, gsettings-desktop-schemas, dconf }:
stdenv.mkDerivation {
name = "dwb-2016-03-21";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ makeWrapper gsettings_desktop_schemas libsoup
+ buildInputs = [ makeWrapper gsettings-desktop-schemas libsoup
webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ];
# There are Xlib and gtk warnings therefore I have set Wno-error
@@ -19,10 +19,10 @@ stdenv.mkDerivation {
preFixup=''
wrapProgram "$out/bin/dwb" \
- --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
wrapProgram "$out/bin/dwbem" \
- --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules"
+ --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch
new file mode 100644
index 000000000000..347fb8e12877
--- /dev/null
+++ b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch
@@ -0,0 +1,35 @@
+From b51b63b78c9ff1639f5f65ccfdd54681f1cadc1d Mon Sep 17 00:00:00 2001
+From: Sam Parkinson
+Date: Tue, 26 Dec 2017 14:46:27 +1100
+Subject: [PATCH] Extend the python path; rather than replacing it
+
+Some distros (i.e. NixOS) require the special PYTHONPATH, so that
+the web extension has access to the python packages it wants (i.e. gi).
+
+Previously, the PYTHONPATH was replaced with the web extension path;
+meaning it would crash on NixOS. This instead prepends the web
+extension path to the PYTHONPATH.
+---
+ eolie/application.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/eolie/application.py b/eolie/application.py
+index 3c21542..bed4e55 100644
+--- a/eolie/application.py
++++ b/eolie/application.py
+@@ -340,7 +340,11 @@ class Application(Gtk.Application):
+ self.settings = Settings.new()
+
+ # Init extensions
+- GLib.setenv("PYTHONPATH", self.__extension_dir, True)
++ current_path = GLib.getenv("PYTHONPATH")
++ new_path = self.__extension_dir
++ if current_path:
++ new_path = new_path + ':' + current_path
++ GLib.setenv("PYTHONPATH", new_path, True)
+
+ # Create favicon path
+ if not GLib.file_test(self.__FAVICONS_PATH, GLib.FileTest.IS_DIR):
+--
+2.15.0
+
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
new file mode 100644
index 000000000000..9d4c858298d6
--- /dev/null
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook
+, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3, gobjectIntrospection
+, gtkspell3, libsecret, python36, python36Packages, webkitgtk }:
+
+stdenv.mkDerivation rec {
+ name = "eolie-${version}";
+ version = "0.9.16";
+
+ src = fetchgit {
+ url = https://gitlab.gnome.org/gnumdk/eolie;
+ rev = version;
+ sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b";
+ };
+
+ nativeBuildInputs = [
+ intltool
+ itstool
+ meson
+ ninja
+ pkgconfig
+ wrapGAppsHook
+ gobjectIntrospection
+ ];
+
+ buildInputs = [
+ glib
+ glib-networking
+ gsettings-desktop-schemas
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-bad
+ gst_all_1.gst-plugins-ugly
+ gst_all_1.gst-libav
+ gtk3
+ gtkspell3
+ libsecret
+ python36
+ python36Packages.pygobject3
+ python36Packages.pycairo
+ python36Packages.dateutil
+ python36Packages.dbus-python
+ python36Packages.beautifulsoup4
+ python36Packages.pycrypto
+ python36Packages.requests
+ webkitgtk
+ ];
+
+ wrapPrefixVariables = [ "PYTHONPATH" ];
+
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
+ '';
+
+ patches = [
+ ./0001-Extend-the-python-path-rather-than-replacing-it.patch
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A new GNOME web browser";
+ homepage = https://wiki.gnome.org/Apps/Eolie;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.samdroid-apps ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index 9356794bb5d6..de56a0605b86 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -2,16 +2,14 @@
, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }:
stdenv.mkDerivation rec {
- # Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a
- # release but it is basically 2.1.2 with the falkon name
- name = "falkon-${version}.1";
- version = "2.1.2";
+ name = "falkon-${version}";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "falkon";
- rev = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db";
- sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy";
+ rev = "v${version}";
+ sha256 = "148idxvx32iwg18m3b7s22awcijnbrywz9r8gnfrq6gpwr0m2jna";
};
preConfigure = ''
@@ -21,8 +19,6 @@ stdenv.mkDerivation rec {
export FALKON_PREFIX=$out
'';
- dontUseCmakeConfigure = true;
-
buildInputs = [
libpthreadstubs libxcb libXdmcp
kwallet
@@ -31,8 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ];
- # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm'
- enableParallelBuilding = false;
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "QtWebEngine based cross-platform web browser";
@@ -40,6 +35,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
- broken = true;
};
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 16b59debdd42..463b476f8c3c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,955 +1,985 @@
{
- version = "57.0b14";
+ version = "60.0b3";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ach/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "07c3398805092ba5d252adcdb690a144f8143a8827e70e3be3cb71175735c9c37c9d0edb93936f8cd1af16ad7a6f988b8e8fe9eaed7e36bbb85abab0137893b6";
+ sha512 = "803c819fa3085bc868ab3295ee1a6c7a6f7dba69fd5aaeb54244a561c252ae7fa7b710aaa13b7f8b7810145a737dc6d20e76fa35e85f3dad2535614681980245";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/af/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "fd954a1ddae090d6bd2c76922d4ec53ef249749c27996fbeb1276d2d82284540a000ad4fe6efbd690bb5e73b6923016d5c9c98d34ac5748c29791187417dd8c6";
+ sha512 = "7cb3ce289e989ab70a472c6cedf97f925034d5762e2256d6a01c992c3913836c8f8f7e202a013ff128b8a1db97d8e683bdefab19e618c0c819e7a31643eb75bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/an/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "c57c10028a99df1694897966f54aa6f8b85a6b2d0ed23699542a7a2bbe458e26d622e2de398bf7559bc33e7e4172d23d5aff8402048174a39804247dd8516e0d";
+ sha512 = "f454d77c05721082b759cb550ab2c0f32d7e788ed5eeae2e3706ffea040d5f181245a2c7e9018a2050139606b460dcdcfca92dc73af99e92deb9021ee6be2839";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ar/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "a4417b95c1bec25f148c57c42895e84024153065536a303f8eef7a0d9a7d39d4de8bf287f3af815e8ccb7ec7ec797f098416f78775acc8d778c91975d6268014";
+ sha512 = "d876e0a98aa1a702850b9ab7a3c3b3954e6f376fe7ffa32e6b4e22f5a8d8cc3568b3c70aa636c2af8ef7abf0d05c5d7895b8320ff41fed2c251e0eea06492480";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/as/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "5b624b9d0a4ee345d5c7b79913a8cdb48acebae32f088479c0745acee925d58c826b5125186ffa7c017ff3524983bfa06fe5061ee9423c37fb6f0e7323cac85c";
+ sha512 = "e2cc66552357ccae9136b42f93db1c6b521e514ccfebaf65d5b635b6f3a1a62e66113c3b56c50806d77aa8c8cae53240b83f5437b3a28b2bdf735713ead45e1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ast/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "efb5ac3daa79a88425401f2bf5df6c0fba90fefd21840723cedc8ebae149816198b727dae67c3f74406c47e01dd2365d1eeb92c39a549f1acba4ba65dab704b4";
+ sha512 = "9334167e1b9f236feb5784bf0be7dda40bf7be9162e57691e605cfd9a9e3e499ce6e5ddd1268574a0e637b5e62a5a74078a8bddd27951ac340c8e38ffbc43f81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/az/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "703332727a0db4a51a39859209ce76120cbdde5a00d32a931e118e478dbb5f4a4e8f3d06abfa9bc97bf66a411f533c23b7375599fc0a7f0c13c9d7f518cb8990";
+ sha512 = "e46010f4d7f76f88569728563000a35ec35fbcf48dd26663f93c774b1c321b5e7f8e0c4bb7c9a75919b01ebe70ca4eb211536714fecadbecc8fa2241c2e6f2ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/be/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "d8ad4ba538e2e3f86ad8564e2418cbd34f33d4e89233fa6638acf10a3e10eafc0b81d6c20b585b872c5c00bb6fa2af1ea4097c19de01446a6811e4843c99fbf2";
+ sha512 = "fea813a468c20b99d1b817d57161e699f4860ab1e114204398483b609872972dff379d7abdf20d383ac8432e2f0cd703de71bf44607f3baec6ce206f070f6527";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bg/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "cb6af38306ab8bcd9229cf1dbcfaaf310108c31e28dbae6b9fc21a4cbdd82baf9fa785a9a94bdacb779c8679721903bc721a0e7ca2a1a09995fa97f1486a8232";
+ sha512 = "38658a9c361b2ebd57bb6da00a30bf7ff1a071e75b481007ae1b9b30b51d78b60b9d459a4b935c964f2625dd83d90e2e392a2fe1b6ed03e3e7139f669b2d07e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-BD/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "1739ab1c4c1a7387dab56fb89762b26d8cf279c14a7bbfb1f7f888e9c2c714eaec84aba12f1384defc7974e207b506e206f980a8a68be7f274cccf7232f30e32";
+ sha512 = "b17cb97ef70a7667a114c2eb8fa4ab88aa2fdaf09055c1e30e6afc245a4d50eb6f2c3f817d176eabb06d297257f468f1326cc4e17c6a1652f501070780c19e2c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-IN/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "358f8e3c1e9774fabd6bd8faff4cd2903c0e0cae6e5e6ee6f2ceb228ce7d489ed9112eb729a4f7d0ea25c377a2a54772279ea1343cec449b949688dfe19a69a0";
+ sha512 = "924bc64e77ff15665cada5f9431d5a34fa71ea0fc57e9d7a57879f52b549bcfdf336af0f11b00861d8b4e8d60aa4c8f7cf0b01d05a5c1bbb0ca4a89a6dfc6caa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/br/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "df0c34c951d81d500a0720c2a9cfda76831564dc45d2e34d37b677702414b2f53710fe4eb7f63257658fd058ffa648a904aaad4d864a325a1b1e1ddfee2faf32";
+ sha512 = "5c85992f95f5b975e63eff88b3595effc4ff74d04610a86c5b27184c24435cc2f3f22df06d1a7e84893ea2a823bfaf7da9f534fbd61d2e54e193764e0c24a19f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bs/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "091cffc15f609bfab74061f13c526d4c13946e7b79d3a190ced0ffe2fb9aed457e1e1780d9c152699f4b42aa920d9bc77701eb944d9f9671b70da3278fabde8d";
+ sha512 = "66cb534a5d5a770b58da042a92b6536fed714cfde257816e0a4dc611b6ac450ec364df8265e907b7b5482faffc8d5e200a86f40013a7e74f22762170d4c95d35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ca/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "cd485d1202daeee2e24ca812350ce348ba93a0bf389741b13ad6aa6a81ae4c57007ea0b312e401fed8c268c8a86b5ccbf62ee25d2c1d8d787f16e92467f3c136";
+ sha512 = "8486b3d9202fbc4d800cfa33510b645af94b6fb1c6715ec8e18f0cc4d414f87e4902d615b6b46ff0eba5bfb2c2228c05bbf53a927fd9c52ec7f0b1ac4889026f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cak/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "c5573576cc70d776f3d40a2451295ad8a6230b0de280b0a2a3dae7ecc2c1fcc2eee5fd5e4df91a2b1c9a63411263a4a55f0bfa605a0688cbfb10c341dfe4eaa0";
+ sha512 = "2c46b7aa34ad5eadc9fbb291fb4ca320676e37991863f72bf4cfe2266a6298ba3157d1a0d2fa6a056661ff8474d988e103e8f5b215cdfc4c457c6b7d279461c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cs/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "771141fa3d846651448b158d8ad583a45dd2fc05ca5e3ff2ca19687431a140744707260b3ad9e304bb2062757ef333815f69e10a48e72308a802f9088e24b22b";
+ sha512 = "f9be3db1e0436c3dd4fe30fc3e93e05fbb129fb5f666d912115cea17c208ecdaa0427f4446f38f190165b10c3288573574a6abaf20288ff9d68d6fae200af7dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cy/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "7fd6f5eb9473b3ee68a7a2a98128c205df6654bab21e4c19f6ecc1e427dcdca3b93e9ff22239ebb652a545a3cb8892782e34cb876ada78d604bc48816960f897";
+ sha512 = "4091caa77bcb1d4602eb0f191949a88cef0e0fac5ab5b601fb987c1e8dd47442e9b2ca30077308fbf57f71fa6cbdb85f67df3187b71b4680ec2a51d558211e17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/da/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "30df907a7e99f41f9291d2e677e124363a8c2f702e90db870e2ccc1bbabec2266f0c64fa3daac66c5da1543056d1e3e1e8458dd4627cecfc0a9090ab0aee13ae";
+ sha512 = "7880561a54333992252b26124a857eebe745bb683ad9a9f2d34e7dca8c480f0fbebcb27562dd62ee0ab525b27e31013a7dbf0cde389cf8834353b6c3c2e96914";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/de/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "bce375636ad043e2a9e331ecf84154f5e329217b6c1697ddcf17301115f39c6f35b88083cbec132f92fc30d93b414a8a913ddf02ff0c406295047d5d11a7a3e1";
+ sha512 = "440ec2334dc616da063af952c6a0a4e8966fcaed669d22b75be708800c033287bdfd66759d479bd2085bd601aea7a1bda27067341703da3d6a1c1b305d767384";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/dsb/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "0b75a555b9b02759b4315d3f77d78e71f2106db1b2901457b54e7a487b9f35a0aed3b6f47e7363257b2bbcd42104783fe14bc4171d658515b72fb61bdf9b0fd4";
+ sha512 = "7b9242da1d9b16c66073bf4cc85d438f2f849b3a0641eebc485b55f4ea3ab750c0bc74952ffbaf80b23840ac375e45984e6cecf7fbd6de5f2405f81b22e23f68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/el/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "f4592a580dd7fa207943d071c92816c1f6583f579e8a8fb6564da6e95c0edff1c7dac24c581e25f874b354b55aabdb8fba17a2f4d9677b653e957a66360fabc0";
+ sha512 = "9b88838076dfaf6b1f243940e97d02885b17d5ff82466ebc8fbc9664c95a62e59e305cdff3bacb99739d6077fb6d3742ef2a4106dbf423003c0d75bacc296a14";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-GB/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "56731ee2e83a591201471bd6236a247a3a5713607344ae8a5c03efcad4f69eeec010dd89c1fdd6329325768a4b9a83ecbc278fc503a8d61244523748d0a8fd06";
+ sha512 = "f685409b69b27efaf703d248ecec25dd89e52f462bda69d509240a9d1f1480abf2a8849efb9e73bc8056378a0c1e4646f2341f7e84112582e3169eaf7300e3c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-US/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "cbe3a6ae2dc8d89ebd935d2c58d3f735ce08f45418c31f1faa9f75d75255a07fa87d9b7d53f571bfd876701b566e27cb8bd761cd167749e2019b1f3bc1fb569f";
+ sha512 = "e44ecaded4ada349beac0205e659cce7ac962d7d6cd97040af43c7f904909177bdb4ec38ba7ff57f9aadcefa55b3dd09296af49ae97357d96382f45a3872a963";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-ZA/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "f5c32cbea6753f4325c7cfdc99bacc4565b58b0ffb7cdc8db6d559922b8402493b502e7a05fda4e08746d48dfa50ca7b70ac27e152ceed3fadb9d2af2ac0f639";
+ sha512 = "99d79640df9b80f380438d18ddf668b22df7ce85f99bbb94234ee3f2d7944c590b22b73430d2c73f3c09c05655356c6549ad1cd33bf5bd6dd619ee427c183715";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eo/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "89d278965fb4c7899abdf17f2fd1dbde201c959b623c46ba4db51628a3a09c5e054a614b8657f7f190ca5e9cdecced24f126978425bb38d14c84770958466bb0";
+ sha512 = "5597c5d5f1959f7a473094b415b3971d4343b9317fb27e6646be99e6ee8e07e9d97e1cc8e51a77fc63c03760713e9644c6d292e33324d6e599270f424262f6a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-AR/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "d21ed37e2d6461f31519d08040b271e9a6d476e7132f5db406fa3eb3fdce67384af376a89d740426fba12a5602c20a4d315c0e337f0707ed7b91d739b648ad63";
+ sha512 = "331097eeeb0356e3c281ad1bf870252f6a3312a0aea9a52158ee45993b7348fb15896f73b174bcaeac4c1b71631952291683ee6bc8a35b7156cfda280cc951be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-CL/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "bd0dd077e732c996de27e5fabd22933aa1c1ff448425bc757be909ccfdf7a8a2f32944721a248e4998bf9d455fcce13c22a89dbb780c3a61d8fb06745075b122";
+ sha512 = "5e78bca3a931bf8bcb94d33340dccef6289d32c5ccedc75cd347944e56f5c39f0780b1647924bac8faee94be51de39d93f477a959de4304bcac9f41ae51e52a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-ES/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "7abe774d7c2baa9e055c382fbe4612244e9ce5c778185e86c1b4e8422ab8af4f99a949bc8560109e6995d8101f8563e6251643a5c6e4ff1ca9675b064e1da580";
+ sha512 = "5d8aa24b3c859136b833cd0686cffb73541126d4de14e5be5bc5a70eb6e109fc36e6415af0d2a5c680350d34d0ba13afc21b49e65f9e8a210efe82ff0b8e20b5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-MX/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "4f4c6a5cb3fb25a030a44f3b7c60d6a1af77b083ca4cd04711ed4663e276f03ac92f4b8be697554af7a4721641fc7588b005e27f2ed2c5c1efb947a64cfae8a1";
+ sha512 = "8bd6b551833aceb552c52efc4898546b639349c398abe1c62b6476f18e64de7efa63edd844c3902300014415d78466f461d5f37c5d8335d81c86000127f6901c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/et/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "f23d6cdaac6a412c28c633fcd304833bb341c159090575b8f8cd7bed6068a3ca3497cae072d831b1ac40ebc98853fec978a09009d3eaa5c1f6aa6bd4f8c3b956";
+ sha512 = "bfb399e2e9086550498f0f954cab9bb061694a190375c4f26bb6d414ad6047bdccf21c83e509da10e2f4b18d20a169cf2d3e2d33d76f20ec0278c4f70c5ded19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eu/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "1f7f209e1faafd254e607c7bfceb5b1913c59361d55bfde394d2af4f745e0be54b7d119cf71a88c577dc76f0ca9a96fa52cdb38b27ed5dd6d270eef5efca2501";
+ sha512 = "e6611dfd935f95604f694aed4d17844d11a8713045ad529e64a62fd77a06b516994fe4eaf487eb629bacb597cdfb13bf9387ff023dac6cd78c1edc9a8e008975";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fa/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "e175dfa91bda0daac8854d999cf3770332d61dc11ba338ba8a9c42718e7d470e07dab656a3a13ff25f4295df648196549b4a3f4b273061c278f03e0a76815213";
+ sha512 = "a2d1206cf6ebfe5bf07e4525ca21079024eb3f4aed9c7a7b1a3f9eff416b821def976533698bd2f59c53179ec0c2613be7e80701a1c4216eeceadb8c13b30f47";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ff/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "243c09586248988625ae347ad10b691cb5f93ad78562c3223a244403a5ad41b138289a992edfce91a8744f45ff8a2feb008ef3dfeca608fa2cf44e39746bf794";
+ sha512 = "bd3ca95d7e7b66a70f961eff93fcae884edb8a463fd2f98cdfb11e3925eebf7bb6da66cde6ae4a26d23d31c10396d47331895b8200cc5e854a89704cffbed437";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fi/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "66ac96ceef9d36ab4c16a288da714c9bb9dd72b12cd814dcdb3740135ce6d19f18ee564c31050b619a1af207d086674ea4f60ee01de3a18eb854f35af5d3fb8c";
+ sha512 = "d47b65f5a863d790b5d6249d2b0201ae625303b48cd6327789ed36ba4f36ad12cc7146ebb03e68185928eda63dac3fc4b29131bc224009d571b0efbf9ca145e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fr/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "7a9398f8753c0b3d6777a5dab4c28fbacc493883e5326fcac0cb0a0f62509169768355a5c5db377afa6a1ec79676b8de53ccabc49666ac9830d588ad2c8bd8eb";
+ sha512 = "28a574d023f84bb5b5224d9c9d9e62292fc86e6a12fe34045397f16917d19d8f4319d1a08742880367b6fc85a62ae7a09ef29b111709ab4a256740adea2f3bff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fy-NL/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "b309d91af97a94246c9450eea61f81cd8f6e8564bd089caab7e1238df4855aea54568ae8d40c3c59e09729779623f1f488e2b18f05094ad79d7d773a82196eee";
+ sha512 = "b01b97325b0265d060fad86f7cc77bcc14975c51da51639991190cba2f6c6935c48cbde0fd78850d579ea320dd2e9c87edaa0750663e5f0ac234932968fb8847";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ga-IE/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "f3b699c8cddca58a8610aade833b470e006a804606ecf13f166239f32ec7fdf0ae57e6f91d3a104efd08fa9cb34c7d78026753d0cc235cabad8aed8ae85ccb22";
+ sha512 = "c0791c6f41097142035cc0a32f8d7c3a14c1975c4f4984db778240169aa48c3e4e89ea46d21c5a206278b34477499806346a47151472ee9b47d596da5eeb4664";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gd/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "261b14e52513485a14d4c92f580a9deb228dd730f77911dde25785b8eb7974a1fc6d39b6d377a3dabf3f488f9d29892aed86c38a115aa4c9660b27a229a512f7";
+ sha512 = "091e89df6c761fb0d3629a430d91fe9dde17cb74aead6395d39377ef7b1038ab75a46e2ecc2517605dde3e512d6cc1fd4fea706ca177b03b6fcc1854ebb99c2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gl/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "6028afc50364a4bc0e21fcf82181b3d6ab44a985d7ed55fc090544d25c0bd65ba8737e1b653e9cf860f201c6c3aded33693c2ee7cb7229b899007e9a607a39fd";
+ sha512 = "e84f09eaaca7f3eb2c4c8ab10f5fa48853b32a9b7eaec022a4f7cad7ed816d795886954aacca935ac4f44410c63c90e0c9c98f162a7afb517fa8063a1a26bf9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gn/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "a189db0e527b1a69d1f42b23b5898224313f73b269ece12bcafdaa9204cecc2424660ff3543098cd6036ca17c724436fc6cce9fa7f38376dbd35c943f56cb559";
+ sha512 = "82ee016a8ec7c91708bca2ac498378d240ad45e273d6ac5c4bdecdc2a2f3c042ec5f2f77935ffcb9e391f35c8ffe3876b16ad2200db855818fc889568f0929bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gu-IN/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "59c9e99ce0da07aefa433b76a961cf8b9294b30c4c3198ac7c8cee5d430c89a10058f614f0955ef768d1e0c12e583fb98612caad4cd48389454b9878bbb08667";
+ sha512 = "ecbe89381834657d3fb8d395cb58cb5bd28d9e30e160b50c6052ae49a60f1a58d8d79218f0f76814106575e01b063d9560dfd2a4278bac7db60427310414c6aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/he/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "101f7135364f544517674f8c0bae2d16aa600798ec7755f4e02d0827df6920a60c19fb0d2ab3dc20febe1e9dfecd192a64fddfb2697b825ac940de530383ad7c";
+ sha512 = "9cbe123386fe1c15ddb0613f2c2cfc6b0990fa824ffba0bc0c25069c02de1915e82531f5d22253297e97c8362e0fe1e66eaab84387f741b10528838ee2446c29";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hi-IN/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "dfabec31fc6170e3390a313a6f201ee51930c1e1c884a5e1b0b2107a2a3c1d19753c91404146dbbad9dc572f9828e3196e6fc1002a9b318b3648b1dffe2a9cf8";
+ sha512 = "c53e2b950b427a6d2c3ec7ca2c657581f1d4f4bd44b90771475e48f269fc2376ea4cef357e8c4d7d27869766e863b1302a860d4ef104bb664b119971823625aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hr/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "2dec6c07adeda8008e3d85b6552f29f882b1bb9b89a5e03422126067ebf9eda03e0272f31464c42f8b9deaea174c26b1571c1c416f1fab63a7e67cc0bfc2c136";
+ sha512 = "4d43bbd65a4c76445a6dd5c35e6cf0013c24dee64289f4074a482d6ede232a86e04f751781dbbd65b18a08a96b4d6f45b5aa72dcf8062a23054755c4c58ce779";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hsb/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "b5dce6117e1c964a612708263adc5533d8a063ad6586030fda1a214c6df887995f7ae7782039f063786bb332732857781392c16c646c29d9ffc53fc3c8cac8fe";
+ sha512 = "d35456acb515a56fb411e3df647fba2d1e2f312a0fccb53dcda3ddf68e839fa8f38f78bd73afd63c1cfb8954f65986fb3a7623217ec8d631e36466b531358866";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hu/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "fe5654e089d50c099aa3cc9279c0a4a3e975a3e10d15b9b832249d082f95d461cbaa51f5851c3f4a680419e293fc9137b1ddf275ad376e073090db37ed92d888";
+ sha512 = "1197948644964f77108c95b9eb1b4c8132ac1b7503a9423f2d2cac8b52e7f6c2b30c451fa62573437ef74deb47017797e47f1441d60d40a17898717b95eddfe7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hy-AM/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "9678679c8bdd32131fb7397a88098028a955624a68d59746d073671298a3ecbd8d2933675ba564fed0650f44add7fc1135f441a3edf2ea932cfe6fe5b2ef5d13";
+ sha512 = "309b0d6d3f2da1b6539e6243ef9b44dc27f4205a273f7ad82659c9691d0e86cd99ec388b9469f9d97e11f45f534b06a702656f735cce0fd1c95e09a9c7cb38e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/id/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2";
+ locale = "ia";
+ arch = "linux-x86_64";
+ sha512 = "ee705fe4393f1f07317dfff0732a671007971eb3f0e5d2348532c3b681455ef7d680c5dd20fc8fa41601cb0164b66371ce685b39812684fa89523a97a6361614";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "c863c503ecbd71f17c311f99d94a86af12a57bc1ce0beed6fd0d0ccc5c814c25e5636de9127610b768fb947a0ee48ea585e1a205e1646ab20d2f6c2044b67618";
+ sha512 = "ecf7977f395056f0e346bfbfb81a2d74c5ed544c9bd3989e16b2f0dd6d5e3fc3b6fb48977d0b468f2a869efd6929279982a9eec33318c65a61c282996366735a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/is/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "7fe2398dfc0da2bd215867414d765729e2b30620930ee1f50b98a348f6e6fc098c952d0c5ee200dbb51a84ec82f4ee2fe8b01c4a6fc879d2ebebd95f39f825ba";
+ sha512 = "e51e235f2733c54f0af0ac912250b8eeb4277d29151da7a39c342c33cdbe381ee485aff5c2431cfbb088de8fb94c91b510efa8db614607819832ee8b13d86584";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/it/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "043b409173d097ce49eda0e16144b3f50ba7f7a83ed679f8fd09c26d18914681e15b68308ec6c65aa09f26afd195b6f8e5afb4e2276a5717b716280450dc403b";
+ sha512 = "45cb25937c1c791e3e55e9e70c469e28417048842e2993f917a7e7b340a0aa1afb985a8f1e6719ac26c1329299e2d55fa2cfde49c007b8444a97d16423c3920c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ja/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "9c4391e27831ae034624f22e8643922324b7940f2b6c739d1c6b5c47449b83f2c8756b11efca47a42820a867248efc023876e1218327f1c8e80cda0c960734a5";
+ sha512 = "f3dd9601b114a0ec45951d187b1fa1e559e778c3033a5b9bc75b02cf49f6856fe77046f4f1a75149a58920414dd5ee0c98801d9dee7992aaa7ea6204deaf7c4a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ka/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "490c43518d3cf1320d9a3e8f28c70908b31a5f9ed01b211f4e53aef67baa279eaf129f06ec6c21efe2fd4a89364f55ccda95847f058cb2f83fd1f92c466263dd";
+ sha512 = "b937202e944242c4a35da64add8e4dcd9fb4354d1ecee9144d1cd1dea5f5ac1989ad8e3376099fe60705cf1486b2ef350aebe5d55e440ffaf6d9aa619ccc4def";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kab/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "bffa144bd5c6c0d3fcf9c8d44c679f22af1127734ac8934a5cad4d5e6726978133cc99c61dde870143fcfa0b07c146c4d7a84117178e01083a0c37d9b4810184";
+ sha512 = "881062e5e027824b5768db1df6aedef73f93721d5f4e4d1de5a31d02b3ac8a6a87ea5ae7889a6ade614180e15189304d529ba03440fc0b030061e1306ca1a02c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kk/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "5b49760338013954ffcc3ae2c9c79b0d9ebd92f1a148188249559723bf23338a7b606b26f5326b48e2acb15e7ce023f4dd2a536c0cbf5b7af8eacfc33f3be670";
+ sha512 = "b3939136fb7efd9712acedc71a0d45cc0129367f5a11a2798c788b693e85cecfdfce2b83a1fad2f8bebdaf7e973d963975bbd67c0ce342ba0a4d0d46ff2d01d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/km/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "7ea92ede74eda15d9a77b6b22a02a634364b60bff135da5356991644f474a47c16283670d24f2cc28d112c97f3b49fcfacb1c618f9caa16fb013c3c650b50feb";
+ sha512 = "fdb3026d28c507c947f236ec9b44ee2c74f2e4b2df38d0bd23143d9c56c855a19cb99deb087f2253c1692436c1ac25590b78cc3ea713e890ee5d6b3ce70d2cf0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kn/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "e3d3ad10a374421603068c420e2c5c28ee8a9f9b822df556a1237eccc54a778ca572e09795aa9022cfa373652cf2913c621c2fab82484f7eba77f56305ed6aab";
+ sha512 = "9ee305e8b77eb8caed2e0ec5251f651d16eb7ddd748a23b4c3f17853dfc6018efb8262958f9843fca62799b8ae952b208dc97a4d51977b0e4a81ceefb2575179";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ko/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "a681d5e49952f1e671e0c86854102979e052b84140002b968f791f4a325858985751a3872446ae2495802ea0c1df884291c8559a573cdb236cadb7cd706ce718";
+ sha512 = "17533028af974f7b785ee57fbd04e9ff0cb4f952269ebb9fba89a68a8e4af7790628afc74d87c1a338670bf05781cae5ba7cb8422d64055c54b39030a87a6741";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lij/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "b33522bc78b07958a3b5b80bc0833673b1516652de2a165f5bc7ef54575a21af20a922e207be02c4531f64503e97279dca4ad4833d2eb86a6c04f3fd1fdae7f7";
+ sha512 = "e7691565e57153059b7b635bca91e83ce777083920e18d3ad26af960919a7505fad2e6da3bed3c179df0835225a331ad0e855256e87078cd2d023fbf837969e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lt/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "ec27a8aabc0736b410509a9fb9706627e06316b34a241639ae27108ba3c4945b4ae675fd85da390ae053603a0a13a124c0638c11c0750c665c8226446435bfec";
+ sha512 = "001ffeb0a229e1deb751f7a7ae1b70e42b28cb47e321fbd4f89f948302ee31a5cf0ca513d51f978f6482f175dd2099dca46987ff22f72bbf60dc094146aac1aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lv/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "bc4b125320ba7033946a290e0d974cd4a4f517ae9c9e2a24d86d28307476fbcb4372ec0cfc567d984e90d105cf692a08100bcec81e4ab615fff19ec0ced0096f";
+ sha512 = "a96853819e1bd1fa9eae60e18ab1dc6ed304aefe6d13f8cc21ff500cf2415c7f60a623347d3b3632868446e1769aa0b8b0acfaf036281b3d8e838f849535579e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mai/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "2aca4d6ce673fcb71a8c6228e243157e597573d152d05bebdf8b9df3bdb479dcce1708cdaf2462902c5ed0b7eac83a9dca523bc55a6bf6b2a9fd1d4582a3d68b";
+ sha512 = "abf878e46f44d1516e3d1a0ad873065ceb6025a93b968b71e532ad98d7c977252b703362778b34743dae0b50d3a88238f09876dffe46ce09ca5f2785d48f7cfb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mk/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "22fd8e59aad75508702ea3fd37af4261f864a76e943cf6d07789d4f1d094d7e0d5e76e5d4c92b6dc642e0f30047d4515d8520bab667c05c16aa4ffb60f0fa168";
+ sha512 = "4f201854676008b06b4e790fb7f0ff39648bb14f7813e733038ca9a8acfd5dc2bcf527eb3bb45fdb58def786b0896adf9660c5adeecc1697bf459bb13b63eaa3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ml/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "f96568186cf49bde7ceaf36805277c0cf4d75da2d5930227e625e2abddd5b740df4207ce53abac24c77dc755f52132204b945fcd7706de4e3075505635eae9fe";
+ sha512 = "6d5ecffeab534b86728a023c6507929e8dcf124e4f02431bcd40dcb5322ecb5ba38e39a1fbbba096fefbb9b0860c571408d8c7f0f90452baf3df9c4ced4e9efc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mr/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "82fbe7593e52299dbebe38fb97126b91f57e48968c7235d8adba93776ea6c6883dd8eb5df3345cae55d156a7bde2004f1f446339e46de90c85f1525eb1334147";
+ sha512 = "64ecd4446edf856c8249b18246ec2520b999118d4c0c815da472f50c4dc2434cf504059a2d11c8a72fb1ffeb76e7ff6fa62a55e52d478884f516773511465a06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ms/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "3ece240f01f8322a86d1b8861be25e895fdbfc9a024406727400e0d6cee8efe88a11cbd6799e4b7d0d8396cad80a6a7438d4f0e3b641f94396a7d2e80be06e02";
+ sha512 = "0834f04f6c76ec8780d862e550c5e2bcd65acd7dc9b8629d194bb3407178fa3ae6c47d7f1421136f2966c9826b942c74335452a647e86c7b58b6708cc26c445c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/my/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "9e670ecd9628c8822f634031dc7b6ea2610687df8967591ff44a3fc2922fc11bf84575811e9e0f51997764d67c357de5020619e3f637e31c3421e64b533930dc";
+ sha512 = "c238708effad87e764a8ad86e08a41574d06a5f7985f8370a7067deb0e6d10c97c395186387f18167a70d28521a811617adfb7aa411084a3a1397465f2de8a3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nb-NO/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "298d7d24c92a5f56f00d7d615ffcaa1b483882f5845f3de4bc8be2811ec6b5808a2bb813ee9d9b8aaac84a6c6f7bc600b45b7c22480e6c4c111fbe815d46e70f";
+ sha512 = "7a1fb23ac7ca6c25e385cb27026064d5d17a613da19cd1b21c0710002a5d5473323d05eef05fb21e3fb1aa89630e38c4838cd211297569885c3aee251f7dd0a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nl/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2";
+ locale = "ne-NP";
+ arch = "linux-x86_64";
+ sha512 = "306bade19239b1120e1fd8a879dcd98b695d966b94c061c10684e3ce3b9a2a6122d63b86f16cce9611306ef297dfd39003b5ba47ef29fbab33b1dbabc2097e7d";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "c59787d50bb14ecee498e9c454e3ab79571656160761e95a53b41ae8196093f6dec3f435d9a69f064b9c4aff0bef332e2d5334153d98c8984041e26c82ef04a6";
+ sha512 = "30fc79a7bbba6cd5c75d55c3169e91ac41d2259d77ccfeb4569cd5bfa3c0e7164b0e03e5722949e339197a0b82d9eea1f3de622b958ad75e6dc94ce0d10b7c00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nn-NO/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "c7c9965a5810bcaac0f1b0d08ab6a9d660a00e40368369998101c2cf043837459e6e65078906c0278564412655a76987f30b671bd90edb25820362c3a846b1eb";
+ sha512 = "b31169a87228bfd44f144c2c36de4c24165bbbea48d5ab93039108d00a34a68dd31bb61371c472e866639b7e6b448b6c95ea2d9fb40b0c333057390269b9af2e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/or/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2";
+ locale = "oc";
+ arch = "linux-x86_64";
+ sha512 = "115c549157e802ed556dd8eeeff282dc045888a7da767136ab3568ebbe611924a500dec85cb7c5e5ed3b712f1478e9ea825c658cd8565718db7af04f4eea1e17";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "bbdad4aa7743a1af3c31eb81003612d0729ceeea5a0303f129f24e352219007b55f40a931a0140fe1b1b4cff694572d1141779238881376e77f30a3f3675512f";
+ sha512 = "61bf3b3e09f21d9f8cbebe0cd0ea428a04dd8877be004f32c610b8938f17ddc24d49279f98d9701069855d15ce0c0f8359e6448eeb1681d89ed1e1b69f9196d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pa-IN/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "99f5ba6937e08c2cb0f05be9b8f2e87e1f27d5ad610540b3011cc2fcd11c2a7a84a1cdaea9b6133d1c9a38311eaa13221ba57bdb444c9aa343c446abc41c986b";
+ sha512 = "31f481aaa9db45b26b6d7236eb501e041cbaabbf47b922563f828f2415451ca5dab896027c4963bb22fa3c6dcdb26f0821e78f337c50cf6e8bb94246de86cb68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pl/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "956648b1f331356f8ee31158758fa0ca7cc7685aa7b20c1833d87828f5f4d695fb3fdbebc55f4862c0f76afe72ea6035261c9ebaaec2561d728d61a4bf53ca9c";
+ sha512 = "d877f2b0f4f082651092cddde4d1eb27ef261774b8e72de6e87a937a13f55676c8a7c1b978d75412235d89af7bb7773ef1f2f6260f3a7e8f63e3a2f8f769c12e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-BR/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "528a30c7ec5c7485d0a64b6787e0c14c66f832b2289884ff234799631f4e9c6d620c3312ca3d1872e28c80c7a192b8e0e4d0b9d88dbad610268e9d3fb37b3a05";
+ sha512 = "f63bae9f41368903b9f87f0afcea69e74df57c355803cdabea540d22c001a42c4147a9d9823b8f0e2f9fd89cda4da831f2777a917a031c94203abbd4b2d6b117";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-PT/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "c70eb4dd653d035fbcb7de8bcc78cc1855f7d6dde8296a825d733a26e9c44e38c8e77ad54c63f806f12b90c601508bd6376aa620a1e0948c0b265dde3c2443ce";
+ sha512 = "a2692f38c092805471d7892657917be266d1b6e319809e1d506deb136bf14f0c3685a9237c07dd5896a1102c809340370cf95741fb8235e0d9a6a791d167a74b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/rm/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "c9b9f0e3ea90fe7e2d5c2907d82e7ea5abd5f30212f1fc5e726dfe72adbe3835107cc836e310ee4bcbbcb6ed6a08bc8bea06d3bda08d1fe7a08ae20b6a22bbdf";
+ sha512 = "4b9099f2159cdbf4868d427ed1baeace54666d9459c6c68e362fd83f1f68fdfe053f5eef387bbb5a721019a13cd66d9fb9ca08899eced3c8b48f1b368b407d93";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ro/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "6246be75562143b57f27de69e39f9c82c7aea3e60d515cbab0ed5e32228f5b33abd61cb2fa7f3c4e73c65a6dab5ed446a0eaaa94767e0196d5b337e6b5a410a6";
+ sha512 = "cd38d40e209c18b545a8b9cdf66ae09f87e09f319a7ec5586d45fd20dbae004a031168c10c3ef851f19976b240491cd230e54a1ab16e6c0d7061eb8762c5758e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ru/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "467a4adb72e27ea95d324f52007e18c3ea307b7ff158a4e58bba69859f5369fca8e7243329e2bacf590f35315402af10d8071c34886a7fdc3cfd6e0548653aba";
+ sha512 = "9e108970f376dce2f32ac4d337200b0ea0dd784a4543f54cb864682f988f72e1b8e0c99dff170a3684be65ac5736a2606fa9281e622d1c6068054989dd9e3b94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/si/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "47b11ccc3bdc373f3591ee73b84edcb9afe915f1bdf5b7abe65eb2ea675da44316a4ee5087c0c4e69a90dc337d43e201ac15b98d04a0ad970f8017d737e4f738";
+ sha512 = "f3ed96c5c411b5cc1a1cf3ac94d5518e741f3ddfbb7ca3c437aa7746b03b7bcac28c7a4252b74ee3205bc0ace7606b1dc50652e216ccac2ae6c398ef397658a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sk/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "c7696394b76668733814f1b2cc1c41cbfd962d4d58e424c041fd419b3da2559b1f4057a8aee328e0698ec8b350e7909ce5da3770f287ba485dfbcbeb3d1de9ea";
+ sha512 = "36003ba95a33c7296e21f2e254c71f328c0f994d6f384a174789624fc527e9a5c94ee80f8784602fecbd6c8d50531032442c080fd657a6493418714daffdda11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sl/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "aea6c90fe73f9aa1340de0ba8207089deebdfea21d5fbd5d5c0ada6df26a4acb4349eee4a7ce09f9088439cf059fb7fcd6169cb1c34c83a33c909bdb3ed7af43";
+ sha512 = "eeae7d7bea78aae2530322060524087886bfed6e0eb90ed9c7be77996e17c658aeb758c7af9577f863016b3dee8d83b7dd5e61f3d283d932aa300ae8de2e3c53";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/son/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "6d3a9b05ea14ad1281c51d99757475b6642a5411b7b409f2acba695c3c0a5719f4feaecd0c56713899475501fad3413fe46f4a3efd482111aae2395df22b1e25";
+ sha512 = "9405a8746752fa132cb137f7c6d59a9649f31130ad3ae888cdde419c2f016bf45dbb97ebf13392678453d1506f98d451e9fc7ae92eda4d5d64c0ba443a528568";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sq/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "9e7639f9fce27b4c3b3fa265e0662b31360313569f1fad798c89ad1eca1944827c3aae23c283f4e153d3f81a73d235b5fac56598cc02dfe2dcb38aca806203a7";
+ sha512 = "3e9491a63956451dc0cc7e2fc1e833f8ab2d49b8c5095300db545391a86aa73ea4ee8b9d7419906a19fcfa7927e27ee89b934aa79f90631b0c5dd1a9ebb0a764";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sr/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "d84980d2b454f33a33fdd9b44ea7e2c41a73a351492fa7bd951a8e4ec288a7aa4d12ae362443a664abfb554693e8a8f5428843b28ed48429de3d32575f94ea74";
+ sha512 = "a660a0ccf2a47c08834a183c54cd53f134b2421a4a9cef17e59b635c9a8364c007cd5a814c040ff9dbecd2373a31ce551c0df48ef7d8b194b53d5083535161d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sv-SE/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "b26deb242735a3fa662687efbb8a293e76561821540ad701091a8b7033c9c1047459fac955815790ed026e4f69a51d2b0396a21102a79623b72f5ef8cbbd06e4";
+ sha512 = "cdae561346298b4bb8f85d0dbc6bec471cf755c6c5f89c5a58ef5e15bfd2143729f903b488366f9d9b35c5e3df6f201680e8941db5c0b8d4632efaeb34e93711";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ta/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "1e98d86b9df418542dd15a204ed70732dc8111d8fdf34edbfee8217460e04467a822b66804e9876e28f15e9167ec5a6dc1551c4159c136006392feb7ca218009";
+ sha512 = "6ba067baed3af7a543188f491864c052fc1434d888245f8ad5378eff52afa9313a7a5add5416c14794b5a27a5bac353a3e798a8176eba62f6289d89bee2f3133";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/te/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "d22b7c8b45d37631434007b196c63044a860912826cb301a218b0aebab5ae8283370924a703cebb16a98a589336e024b31ad580b6fb57ccf3ed53f238e361704";
+ sha512 = "829f8e22039e732fba4d480212d3f7bf3dd39cbb0996475c17e29e442d2a5263f33f4c36a4775ad21f984393f8738dbdeb7e33fdebe97eae0dff01a5be7ff22f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/th/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "8a806b68e3e5d4ba884bb9f72bf07c2bcdcf33a8111236fe837a41738e997116d092ffe73e4028dd7429c4bb0f097270fec7a20ff3b5bb316fde0a90af92d22e";
+ sha512 = "62b6b7d49511b28e67b41a192de49b7dd9d4f806f1df488c850a5da14f8ae0c87bfded01852962f9affb112536a9fdce5ab338b8875ca49798f7c78331dadee9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/tr/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "9b1e73d28f5f1fc352f830aa59612170b72dffd7ae060a8f2422ce14ec46f9e646fe625ce36dc4d380fb58ba0300c68a83f2d8aa8282100f6ff33a43ca79d807";
+ sha512 = "b00eb5696fbc132cffb2053c67ab1456ca394dd2540ed08e4aadb718152ea727f156647e0977ed30ac17701202c184f99e03fab58d7bce03c5030429a733a7fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uk/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "96d471b413e980ced87be210faccd8cb6b796c17b871cf785c34f10ebc04c4c76ce4756bec0dbe121b689bab2f777e54eef6ea43750e31c1c83524d0825d0fc7";
+ sha512 = "e81bac0aeb2a5087e252d92fad3aa15d17aed5b818c14c4d32114cb1e2002ef52108aca1e72618ce8b52fd6fcc75bb6a590c78b36a9571caa64956c7d33f7313";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ur/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "0724b881cd4aa040b249882d41cf55260d6aca1f4876c89a42f717f00cecf40b32fa60451685b7a182d2ebb11dd08af7e0327bb5c9fe94b2a6f03ba8c9b4d02c";
+ sha512 = "a3b8dbd4e3fb0813d719416a297ba6416fb6a58ded329ab1ae8ed32c29bd7f0721ce35d550db2e02674449da62dfeddfdddc51b822475cef5d4f1c215b7adfef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uz/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "bedf1751786c828779fb719edfaec466a299ec706e40dda5f886bffe911d425b82e9f9a3cbf5a0deadff7ee77fd63c73f38ce3462aa7203316fc0569a4423927";
+ sha512 = "e5a243e9a32b8dbf48178e20e6f6df2fa779d2fe7c761c3e8b85641a655e41868b86c794d12fe987be4dbafae4577dbb3e45038bfcd6e22ab0a477e8718170c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/vi/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "3ed1b4f71d75d0e863da048edf60ee3cbcc5239d4a8ebaf69fa6d3a8e8be20e556dc838155d7b99ab2776ffed60e578ce253c8e6f57491dc84ef3b68049cf929";
+ sha512 = "3ad5d0adcae8346b771056d92255b57f46badb0023597fc16cfbecf6cb8e9a7246ba3b2c7729bba9e43869f3a882b0daa214d2ba5d0c4f913350ff5c5994ce7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/xh/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "23db4e5df5432094b7f31a688b84d23304c7890d0ef99cd9c992d7a108a08199b6f6f94bf3574668b9b0a915ac49d2c0e8c6b0c37ecb145da3f5e2a5660d6d9f";
+ sha512 = "e380c47484bd56a7edc648b36008f8fdd95729c341e26543239aa3acb7cb56b41108f1685f4b2840b181c612c0235b3c38d815bd5426b6dffbfbec6eb3b94776";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-CN/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "bf08e65cf257f789dee34891818f94368fe89bb500138ffc72855da7acc62cc08a4eec3f4d32a637f59fd0eaf072994ba4d5691da300d75738e3274e4db3ff45";
+ sha512 = "ce9f7c0e9fd901be27572448ebefbab19749f11c49721dba53adccfc390240e4e1420b75c0cabd2e2e73edc34e6104898ec3372fd7f7072623769bf72db53c33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-TW/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "6b924c8ad6b86cf07b6b2f01a6138636391acc519c469b7c1dd96ee5c707e1b81c656fe87df31519413ad60e56e06da46c0f762b26249426428dafa0420a5b97";
+ sha512 = "4cb533495ab0fbff75a53b56411ce1c59cc2420dd9c463547f46067577f8b953cc59c3d2f203850f75708f38388591a086335416edbd8787070345bba4af28d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ach/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "56d847a9417a134af10f53ac5630f7b4a7108b177444327df97511494e2a28a279990ad37d48fe1fc482f34b45db66f1c8d458162f253faef3ea2e66e42e7166";
+ sha512 = "aaa9b8dc909d7e50a65d904d9fd7384a94aa365df8d6c8e3852926533c9407f6a08604205ae94914daa74d251b212a9f3707404f945072198141267540314edf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/af/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "98d55bc29423eaa62b1c5f179887ac95e8aa228ded6e077cc645660a048ee3e42da7966adb9dad5f168477262638456bd9509aeaabfb2a754f0435b60e9b3a46";
+ sha512 = "2db35215ea1bdc70fdc2c2e8eb576945bb0951b001784ef29fdaf7864c2d00d43122e58b45878e107afa7f0a85bbf332094a8c3cd08c04a5b9ea713fe6e25935";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/an/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "0478d738826d3d9b0898ab93e25527b4dae789652a65a7b16ec5796b8e48e575387fa3b7474d7092ad851e107c03f9c58d8dbe738277371f2e881c56c9f727f3";
+ sha512 = "7020efe3d039e4861355cf56feec7dabf183432f49ec8f10792575a8cf33af0d7cbabad627ecaaee3d47988c2a1261ee62d509d664b4a8ba69d1e6d2b68f292e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ar/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "4c884b86e8ef6b554d85151f1eb780edbee0bee6b60f2ae3b30ff9be74591c4f4df07e5834d0ca5cad456c574abac712a8e856e07892df652f7db510618d231a";
+ sha512 = "99939f05878be5a5758f9c45410682761b77fdde6559c31e511139955cfa18811fc0d9e19c2d7da254267b4c3bb6c34378bb26c8ed25f8b957a7e73af10f65fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/as/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "a58c8f47fea197a5b9a397f8e58f73e381ffae3426c83872407481f079b62a585230d2f389245d5eca6308e8832fc95d8dbb7da97d25551faa44c20f6e032bfc";
+ sha512 = "74c2f0e8a9e5f9a1052e011a4af950ebc2bc5298661e7094d3776dfbe9b8ce4efdc6c7e0f6371277e530501a6bdc7fc4b5c36983679567d73db1d0434daaaf87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ast/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "fa4f10093602f03b759502d76ed1d7636ca2fb0f83174869e3cdaec3503fae625e6d49a07c011dfdf6964aca7e8ba81861677cb387ab8c638a5a671864451dd9";
+ sha512 = "ddedd7552c4d85a7f3c3eedc80cb4213a67024351a34df41b0a8a6735cccf3c79f350f2a5621f8324dcbdd9fcc93d979829663d7fadca2367414013efc5d5cd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/az/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "8560bb32c0c3aec695d86d1c0ab6491ba0c2dfd0a936e7cddfb8d3cd35890db31ea233afc74d19974fa693614bfe7728e69b8d1ee47a34331b07674b0b57f118";
+ sha512 = "935c0697a13e020589cfb542ff61e5c67a0ca56f5a040d553b0d92f45efc79d7e5a1686e8981a88a01a307ccfe53284e4362850d95a8ad50aa5eae39e351e808";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/be/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "026e1ecbddc4972cbf1a2a930fa1488b4e649ca7c811ad243a3c068f8cd6b57e5a73d193a3feb4cb49f012dfe3b5af9002f30609cd1551abc1ccc5e89476440f";
+ sha512 = "d8d43189178768267a5d4d66a8ae06918d4ab77cb400e1a40863a42f81ca9e75f9cef82a68f99c8e29edf8e9b3fca5af917ddce2c0f5a9ac257d9be02b3a143a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bg/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "9d145f71f46e12f071e8e181f6511d20a6ca5f1f1950cb076ca25b929893da7546b950450f7fcb41021c4591238738f9b8797395a86c599a907f0df687cf0282";
+ sha512 = "31835edca2286977c76544c6885f8b716c67c871276fc9856077d00292eb6130a4d4345ca56e7ae75c392863a598711f69882039145668a95194a65fc33d934c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-BD/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "846001c844e9ee3d9305eb5be18438af65d5920363f19935a60b503d4a31c0fecf1d7e6fd286cb7ee4b7e26455496b1d27fbf6ccdf2d2a432ec2e2472ebc9c75";
+ sha512 = "0ba71a5ce4a1966845e1ffbc9e7253980d18ff429e7be9a600c9d3ce1f28eac8350b1401f6a43413e86c8d4a552a2ec3f490dddeca9e34569ffb5cd56cb3c5a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-IN/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "712ae023c09681b1ee9f41240d12a1641df5c4fd7eeff15d157c379e5b5779c65b93719b238fb121fdb9e5ce10809b21125a6eae23a77e1806daa0b2b13e4372";
+ sha512 = "1e42024d4f5dab9a8cf37c6c9070617a5f4c631bff3c5cbf66a4a1d5d9e893fc320888bbefa6747a665b6941ecdc266537b539bdb6e165b30da4f832e38bb09d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/br/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "b99c48b8971dfdd0e642cf76cf890706402079122311b1b6af77d658b03acf87feb67918cb83e5435cbf0746e2c2a7c49bf7283969685d0b4bd616d4ec3066b4";
+ sha512 = "0189234479d4b7da251571860f71c88d7358609208bce5bc698a969f054226a07442864557ae51c4a25955cca4bcef409f6a8aa347b00a1fe438d53325925ce9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bs/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "2203e66bcf453f22848df010cade83d6982178c8ccc023e05ff8fa60aa3f7e583f9d8e33a313fb70a696e149773d567be8228084708ca8d01b3cabc431a7576d";
+ sha512 = "03d15323c53d30c52b71a9046370011f39a8a8f2386be45d1bdc014fff1d4ea6efe979a199d3ee63f1fa18b0c7f5ee552e9048863b6454418d89075a70ff9dde";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ca/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "75ce6cb2bd7c1d79b4260dfc19237a1344fbefdff9775a7e557f9a31dd9fc6235f58ca8bb8430b80bf0f25c14be5dc2509e86b41b7ff7814e2fc1baa63f187a9";
+ sha512 = "ecb246da96e682d5bd0706adbfb2b6448c16c1bef9643db453d3ca17484b1a929c0eeb8f0a1416cf18fd7eba489d897f29a148a41050cb0603121b2c819e0a70";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cak/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "b4f0a11030bad0cd177db357bc49b6f745cd429d3a8dd9bb09e99db1dffd32ce8c21a94c0b98b6db703fdbe16750b4574b3378dfd40a358bc0c7957fd2cbbe2a";
+ sha512 = "1ffe32f481faf8c94450bf873b3391db3546f0692b5697ccfd76ac0fdc493a8fd9278c8c196df1b36468b62ea517fa120acee9bb610a66eb27c69641b4f22167";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cs/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "5ee1dbd826801dc5b029c8eadcfe8d040f000527a6ff7f2a40713a137c59a144456adbb35cb202d7883d831486a0ad56079d07f681ce294a5e97825b7effd69c";
+ sha512 = "9f5754d2cb8ee16cbc901202bb59696bba08848c2ad739fd689b295fc2603ed72803acf344a7756b19fcb046490ad2acb878ad065cfb177e1c5c0df1ddb9d0c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cy/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "7116bf1dbec5603d22546b1927a6038812c2abe1e9e7e1ae556919e62f04af422950efd808e28eb7f8b349a9d79bf01b9280d6a6aab94bda8c0f6e2a8968b841";
+ sha512 = "d813571e696ce1d4b404c6167016d591148de7d6e02b8fa1df2da5dcefb55ae71649f3a53485024ad90fd33be94c020433efd7911b6c1f6c25c8380f5819e6e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/da/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "538ddf539a6d9dd22bc2dbf9f712773c1d7896ce2a49632d4acc2e5716dda95dc9d10393bacdf2fb7d24342c8a93c39eee139f32edfb429b0bbf7053b7bb3240";
+ sha512 = "1ccc37564d296c42f4b35a2214cc21d1a750e09e0c99555284f769ee7e3da9674377230e9c2467795bcaeccc2745d4ff969c4f5d4dab1bbcb216f7817bd7f100";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/de/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "ff33af1ffb0549951baa32e423eac3828b15bbce18ee03cfcdffb57504fb0e592db2721f7008e84562e5c1ad297311a1b3d4fd5ab41e3d8346a2d1ca50e54c35";
+ sha512 = "be419aedecd14cd7458eb984ffc040f2f9d0316ca1b078adcf4ab0a1ae6f2acb7c04fbf0b43520aa5492ab3c9551aacc59e9c986434d466eb30b48cbcd4e70d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/dsb/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "6dce022b035bf9c5d76c45492e29617668e0000f5f3981e3f132ca1595bb54b504cffa92d220e118fbefe8088f3749f4d077c591a12657ce9266b88aab8019c1";
+ sha512 = "41bb68dcc0cee8bbb4050b463648f8f59ed0f1bf4caf701f9c3ab9ba7830caf6655b368798cda6fde6949b4b04ecb1c73637d1db1aff5cfef3bbca7108d9a8c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/el/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "b917927c48189bd26289fabe3a51f59965c8a421aa941732a50aa9aa3769ce085ee69bb04202c21699f5ebd6ec2cff75ea2446246d89916127be9418bb00f47b";
+ sha512 = "42126ac31e47ff7045f43277b80bfb49cd241fc1a00f652eef3f0c2bc2a5de05c4bea6906287bb72dde52f5ecf58726cb3ce8a42081916d3af06b3b621c88647";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-GB/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "17257657f8366c5efab1a0c47aeb6129e624c883222a6bc3bbb097bb49b531894cdbfd39898d0d83981a1609fd3ea5dd101419819a1f156668fd3cdb3758b8d9";
+ sha512 = "3f475233602a09976644ba68472538f85885c54979914dac838be7df912de4818a9afe170e82c8f980555f5da6889db6fc2efacd932eb850bbc4ed6b28a41e2f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-US/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "c86cce7893fbaaf4d3b00b961b07a2f2d680ec07451b735449a501b2d9fcfb2fcbc0cb29150866805ad38f6a4aa1b6c4cd87f5872b8c735791953f3646600703";
+ sha512 = "e500aee682c57ebe120a312a127801511adcc54c7e19de33e8f80bea457175f6139a7e306cb1bc43d63f6d150fc4c98ed0709a62ffef885b3ff87a768e09cfdb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-ZA/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "0b278c62b2185a4a6cafb7015062693a0dad610ada1123d07e162456e4d942f02a0566ce525e68b639fd152c420b925ee3e934fd3c42ba25524b18cdeeb9af5b";
+ sha512 = "850d44141894ca1a5d98fe9e3391a4ce4f8fc3c0db3dff5c1b7eb7b75085add18c03da6984f433597102c77374133b2b4b48262d4ffa3abac8de6424feb6c3dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eo/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "a681db144a631e6584340febc3de05803921b757f7c1d39ad5b8ff3d119ed8b71a4d70a43ac1e3a121e04102770d2796103aa127886753b2bbea723e22df7000";
+ sha512 = "ee8bd8595897d43db06e8c3e3247c33910c4665111f1e2a0101af5eaebda726a44167fae82bae309d391de1901057b97901d1ee6162163bcb565c630b1d72974";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-AR/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "40f5a7d9ba055f7eef155601f8a57e566c0829f32c92df48ea2ecebf6e10dd80885881a98d18a693643e2c00f8734218a7ef8908652eba1c4d4288f95a34cde3";
+ sha512 = "be5d83bf8f06e55bd0a23a9e3338368cd4cb7f2126d88782d4916da3b866a72a6c0da213f3151ea09df4902000db55883aa12aee5e3f5e512507217cc01c5678";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-CL/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "be1e5b8c6e184519d0b10fe67736d7635b6fe8ad71ab78014e53ce9a1f1342a83aa1b18f535ecde2406e8be7a8633ea58af9adb355ad2b19ce0879c62f70bd40";
+ sha512 = "0291d7a79dd44ef0491043da2af90c8caf576ba8cae370d3c69f6c7fe866748ebcb68888da9cb5e144745a97e0b519d46fd2f57cbbcf19d3157ef5c3e2d4b3e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-ES/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "be0d2b2cb5f82fbaf10be63aa76a5ff9b9111b4caf0ef5222b3ad7d67d39f25dafc125352c00bd91bb1eef50a6f57e996f6a10618d50c5d1340604883bffecd0";
+ sha512 = "490ce118948632d6b64d8c4157da8ac3665239ae7db5ed4cf6e176b35812d8a73ae535b93bbc6f4243c4f8ad8f0108162b8bfc0ed89d8f74c85b51aab977897c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-MX/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "439f679ddd8169d51e1c1f9ad32185fc9b33df0a1301af7bdf8982dbfc5410cf82edb4dfce3dedc214ab258d714da91661882e45b8220895aafcca171fa9bb02";
+ sha512 = "ee6b365694b32964e17c15d37a621732185af437750bf6b78297c298931f1fa7e3477fe944dc52da6a8d8f6c2a4ee13340a37a5efd43d6c7d1a7ac4ff7be9502";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/et/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "2b80629eba503ca034fc4e9d873707aaa7668b2d4563792e3500acf89b35153fbd7f6406d12497b1ff1423e7ddc3bb4e0f3f63cc759758e544145f31aaea5a03";
+ sha512 = "f82a8e742f0605326cf4edacf5f3875d9de5aa8b77c67567b42898fd5b86575ca4e34fe11ad3274b53ee951a4fee4ba3a1050b075e105d675175b58169b1a02e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eu/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "03047624365bb4fc5bae68a5bec91a396da7d404731cbe09d89baf3079be0c4a9a2c7ff73d231f39e98689d5c4dc7290d2401fe14cb564ea53d063f79d7c151c";
+ sha512 = "16e9db59eb9ac08f14c5cf36496ed6425c210e5ab71bc290e72239b7ef6b38070e000d889e5747763e78bc6bcaeed4bce0c45bc0a3f60d5b27a87038ba311035";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fa/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "8758735d6bce447b8492f9a395da6f58c63537fcc946b17b8173554b6eaf32a41137011bbd44842b16e8053d55642feb880e9cd52dbe75fbd55dc592724a98a0";
+ sha512 = "a6ddad3597feae0418e0bae57ecc507372da5a97b71048c2381272dc30e85109880cd56639f2089996cc5f652ca3b97f51c0d3022c1e16ecb3b143865db1d326";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ff/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "5d6a1b45f69135dce282fc411237db713538830b00f6361f86a95da199d56f2bb351de9e59fb1d61a4b617c79e8a80adce3c3e57ba837187d4c368b79e414dad";
+ sha512 = "9701cc05e02c4cd1f28f056c5b19ba19bf4ff459df7a8fd185864a4b0d5686280669d4eeba38b20570d01459e5e0080b2faa7118a18bc2da36f99a452f7f12f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fi/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "f35de96ff1b8542206fb8e9942333397050a6e88bd0e6bca3c1e56fc4dc754dfac0b554b74188d316e6c820881ded2812efd9221b2c3d6497826ff29b89382ec";
+ sha512 = "9d00704ac0b02ea27a06c0339b4937aaeb40cf50e3ec6390c3c56270cee589e480a7b7f014fd03d86db970cb70e67b762ad4b728ecfbdaebea1ea2fcb6a25bb9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fr/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "118d6ae69eb686ed1d791463bb2ba025749068017de94a9d002d22b195ccb9e0cf0d042e613ca88c310e685070612a070308971e12eeb318b26b2335b13a6a33";
+ sha512 = "33b0201e80bcca259edf60618e582b1c0ae0be1527ec105a81d972201a6439c9b8eb39fbcf9498adccfe79193dbcf98b7863c62bb0f230c0fe9912062522cf49";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fy-NL/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "79a22424fddf0add63c3a3528a63ea4c0c9d39f3bf9e35e18fc9ad4a57be7e7f675087f1a491698868d5ce57cdd149aabddc224b7b3078ad3a81e6ee6dc35b2b";
+ sha512 = "b8de8b7f0aa9a399e8df81169567df5c3d4d20d40cb913749fe848bdd81e61eb5f0120b9836526c65ef58700120cac28fd43d2d8ea65d6ba28658bfc4b08a954";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ga-IE/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "04b87f564be35d19135973a0e17c2db1670aa804ad8c76b40c8f3ccd670e0c64456d84cfec276dfc55dfa29db5fc0bc70826752bba756cdb597c7fc12da1d30e";
+ sha512 = "e10cbd32691c5797ecd2894b12d71568108c5ef48792ba8dc620b09b7f4819f6f5ab7ff41928861d7297bf2c72e1269b001afb8bf550ebef3f66a1c9caf7ef0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gd/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "f2a66ee64ef80dfaf2c16af952be22ba9c11b3a2859b6a861e04ccc2e7863ed5bb1421338c1ce30ad9ca4506d6223190ab5feb194ee445e9fb09a11aa99a465f";
+ sha512 = "45a04cf4dd3007cf8976d27be5b318a978e04100b4121a63e9d5feb11d3208fef85cfbff27d71e0f46b7f70bdaad26a9a588aa7c89adac61e8ff87e3db46df64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gl/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "f59b462819ee53e8727863b3e4cc240b83ec5828860e3a0428b012eb4047ac837760157a7db60bd85486cfb9945185a2b8f637581e489d90bf140bef873dd9f4";
+ sha512 = "77406b8edd59e48099675d3f2c9abe6f53259645f718d465aaa6f11ee12afc88a0577baa5f9e3f0efff54c025510d4ec4b4277f35401d8cd8fad212c1aa7c215";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gn/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "17499a923e6f7d0e63e4ff0ebee17f02c99f614da02d0ff8a737a37ecdcf69ba1798139c1b824d187b67b443e54701b1046b59fc6bac3757f86fd6303a778c57";
+ sha512 = "0978497ed23eacc9e18bd348e115266d4cc2d16ec51255cce2d93f7faa4d335067961e59ff44a7dc3adbf36dc96aa1b8383127d617a82dfb22b374a92e2cadf7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gu-IN/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "605ef03bab50ab1438be938bd8aadd917c742a5ac0bebd14dc8388a6e5cd844b52e0ef23670537dc50c2f3b4ca20814a9e559e667f3baaf292ce3fa16ded26a4";
+ sha512 = "6458a6352c72db89496426dfcd9fad79cffa357d129fd3fba80a13ca2c903d9846820f453e0f480758bacc1fe0d3254a2e8f29c94db00a139402c83869974602";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/he/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "51bb0b64426ed0d46bb2265b18138dd0d5fdc58c2782d3bff4dd8ae13bbfb354648b346e07bfe2795a4fc31cff2df54d94ceb42ba0342a59218eb5444e9fc12f";
+ sha512 = "f60cd6e3fa1d51e4f02044bea5af0a48f6c5a37865fa96238712eca362ab3ee9d5900b421ff2c0b1da30ac221455196940f62a3393a28fcf2f756a6830562797";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hi-IN/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "74c921e0bcefd0c81616b8685ac3a0fc85129a950a917ec37c724fbd92df8099e79726639cf18235379ebd345f78de754e4b4e87d859e696aec6e780c607839d";
+ sha512 = "4ac19276ff52f8ec8bb939ee87cec2b462e8c9e056bf6b00b2099fba0fdeb23602ba3dba0a4b93e03acfed82e3d6e6e9846d8881efaea61361badd88ad119738";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hr/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "8c4b634cbacfe34a2031c1edf196201fbbf13f7bf22be2910f27788e56b0647598d805953b888869644f4ec3547a0813377d517676e732770684b057e5f76028";
+ sha512 = "a463e9edf4ebeedc1be086d43ce798e0556f852c3e8f10f8b935424fce6e9af3dc7912d4e4a5bf1f3e6d9855588cad9454035cd3b67f303713bdb203379d64ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hsb/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "59ed77d9722413d8d75c8474de28660fe59d8990deb3c1743fca4fb1c18529173e0e7bb171cdd98df961792ca6368b91db26d6ebeb461543473ee5ce8eb7da82";
+ sha512 = "7f55648abf6547e236551d7409e598702c00bd17a844c46ac53fca70c433983bdcca8728902f8f040e5a8ee456bd339c15daf99eb06e93fa6145e983205e8b77";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hu/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "de8d917b533941220763d011fc9b38f0c0f8f32f09d999fdbe985017a002c3375b592865420e58fdc4a3d56f73206ddbbac568fb506ccd2e3cf4d2507e8ed315";
+ sha512 = "41c3e4981e582c3c2ed24b3e463fad58d6e57d60d5336dad79c568f821d03f5f1183cd16e6886f136ee19d27cf0a2c3e066385f1f653a4de37c82ec9dabb77e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hy-AM/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "ea76bd2eff30277dd06d606b0568dedb0f01c6330118da99fd6952f9bd5c8060a621687c66853b46554560b56f1ad2401e87e66bd44d1a85831805caf7ccebe2";
+ sha512 = "1bbbcfce541ebabebbde96b76b9ad20caf5d88f018b8d81be0eb6887d1ac45f278f71032c8e48901ea527bcbb5b97da2e0c30c4ee644cbce3e4f2b913ad623ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/id/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2";
+ locale = "ia";
+ arch = "linux-i686";
+ sha512 = "6006e946d16d59e584f5bba96c0016ff0f82205b8581d5d43f8e1789a3b3f14a8104019c85847b4c9b13673b47b48dfe7ac572c12e08f7a7593b2ce404bdf75e";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "024ba211754ca36470ff316d626f46cfc2763b94dbfe027fec9dd628a0c617fbc9050ce7af336d22c962bcbb9190f1980b1381c5d3509485b4f7bb5780c6d15b";
+ sha512 = "3391a9dcd336b26d069c609f1806d0ea98bd9bd85688c006a5ff271a494d33d3d5f969122c12f845348bbe6065ceef5a67516816f307ab7409ee68a282d4fded";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/is/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "d53d4d7545bca63ce99dc691481b890846c33f5efb802734514ba493e1b31e3b4ee9632a4389dc388c77692ceefa9eab4e9f85de1298d0337a6756ceb27d55a7";
+ sha512 = "5026484442691f9d5b2c7c22759b8ce43cbcf19b5ce91644341fa18039f851d812fdeae64eb71fa27e016237aab33e3fd0ca6621c723e0c56b9156165d5d88dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/it/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "960bdeabd29fd9bfe72f9e2b5dcefc1c9577490636e9cacee964b8646ee29ce2cc4c9cb87a93f057e2a6371cb734920928bbab90e6c6738a19098e9e5a4dab75";
+ sha512 = "64726b0dfd6ef6f2823249d794a1f7fa8bb31dbf54e120f13aeaa7aaf9ac56860b388e2cb6c1f51f33d4dade9d703ca323493570a98cde38adb4ff7d5ce76f8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ja/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "f9d889ff8a25259bcc28b1178ca511ad7cb0ad9d0882c8b3f6a04e98d5f4b63ad9b190cc66c184f93fc96e0f869bdb10cdabaeb7b9807d49c3f72b7c62efe3c0";
+ sha512 = "08b0c2fa6fcf3caf7174bad1268e1ae8c3ab3273f4d6780c6aafba7ef68b7cf0535010aaa2af2af17b91ab48f979af2d37a57e980c4c6fd0b3bab04b020d8cf1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ka/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "1ece76f8237065e712b9835d0ea15f2b7318f420f8e4d6f73496bd1dd9cc5fbbb4125a04b4b4cc5c36bedaac39fb844a101653efbb5d0555bd13c3a4ea3e9d28";
+ sha512 = "f7fa6326c1c10de051727d4c83eac04c633f730a08dbdbad3de228d30b0f57a0b158891c910348083279807bc9ae7eeb43ce0a317fce338c1c84553a3498002f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kab/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "67d22ff37a79716869d7b59e95806c4a9b89bb2e256e0f1549fe5d3bc9fb3909f7d1c23111e8bb84a9cdfb4e029414908a79a8512c49847fb1d4b20263ccb43c";
+ sha512 = "1f020762f8b8cdbf35b316ab041f16243d6df19ea84457b68b6a969e5ae504dc58886adb2d28267cbb6b09cf3664db4a8b0d475ab6b0cd382deff5f15e627f96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kk/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "b9cc2b1c31ea4bfbf17c2c7b0452bebb830cd3b8cedfcf2739360dba562119e0eede3b660a403420f367287e94e0bb34f072ea13b1cd1b58681302267f299464";
+ sha512 = "3859b99a6ad2a14c176d19db4ccd3ca2ec36e57a92661af12636b111f6cb39c64c871066bf5334df90884ef103ff6be5d982e1603dca8feb98bc0ba53b02f9b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/km/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "afb6985ad592ad2d634c3f84b1d573bb87c59bad892f066ddc1bafb5cce7109c59403f3c1394b2f65da0fcd29ec897a3144ce1ed410f623354410c27e386ce06";
+ sha512 = "c168e337f050b09fb8006b550781a6da6cce79a3fdcb21a51c6d584b45569e872480d6a950e56442e755c9fb5fa7b8a8760525977ad13fe4372f67738e48484f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kn/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "cc85e9d276e4833fc962554e44a54ba8f5d56c387c37ea78f2f8deb1b845eae8ecaba1761726e209275d24c4192bd61e409c9d87320c1315665c095fb5231a9f";
+ sha512 = "b59318bb6ed70da73f6803319bc606ada26a371c22e561f6460d2968da013bcd976602dc5b30e6b44af8225a44cfb62a121d5c215cf693196e7ccc5b23548b84";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ko/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "3934a012853c70b77fb02689141efcba7679e87d115d80d1c7f5945027f082986e679f146a6acbc97ff5b5be6b0d057e3b3f8dc292c4e66a37d5c3972fe865c9";
+ sha512 = "35191d28de35f4e37ae8184ecb3c16f2ecf10cd8dc451f8f79471d480c3cc885c48abfe5723cc367625ab9fce570b79ef5898457c98198b1ca34905cf195c7a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lij/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "571334620261a36127ae1e7a03c6142ed22fe49a95e28534030882c47a7325ba8200b8350904fa0e501cbe0801c2bb1968b456e9982bef165d3db0e82ad34b89";
+ sha512 = "4db053b433dd7adbcfa5794b276c7c107d0601bccc8c85cebca4796b18d0c8001ad1ba413c4c1f755e281c1ea16eacbf722f04e4d600ec77bb9ee13bc5fa12d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lt/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "3a7a0f09b52991a4d8cc6009c2fb91f3f908989d8178b4b9909bfd90f29db6ba11f29ffb35f3f1e578f96d6be10eb0fb337d28188dc792e6d024e42a5a16af8a";
+ sha512 = "0c32453132f2a220d47337c55ab41211f6b3af64f9c365f7cabb4386399fc877f670193f72157cfb7b9d6cc8410346d33af3546609c00530fafba0c7fc07e480";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lv/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "7e5153caca960317e039f8ad44f6eee4ac8f582ff2b957f70c9eb3d6967d62fb94e4b13611006d746bcb4611ec1b0a003bbf610d412f9e41f86a8ea19096b70c";
+ sha512 = "796d5f0459f2cb67e5fd7e763a0b30009097aaf6bc6767c21fd32bb18ec45fbdbe600384dfcf296a6c29bf8347d2e922165a1e3e9853ef59ecfcbf56715d122e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mai/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "07cbb84ad4537482ae8b1ddb00a86197552d3a80f6432779952bc9b1577c920de07e60f78272b1ee3889b031fff1c5a34e1c1a69d3fa0621fc53413242f80242";
+ sha512 = "189620d864ffd79b78942ddc177d9749285cfb9f3c289a1b3c8fdf7cceeef9d3695ef586bc07845476304bebfa8af285bdcb0d150e7d1e5661d2fd4bde46db5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mk/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "230ba5c56d60d1ec08092e9f6ae396fa836df56dff1aaed933a706014318fb13328db5d6b0bc3dcc030daab5f906d7760bb3a6af3c03422f724d627ab8b9d48d";
+ sha512 = "d17696909f8d3c3016c270d1dbd2c537acbba8846105ec88c46f337cb97ac05372a1acb4ec0120bf9fee35b5e3f72b65235b6f062120d63e61ff20c37e09dde1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ml/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "e4aff215ab6b3bbdbe08f7cc698f11b12bfdab232ddcf995681ef62dd9808789541e8ac7b9b71c003775b78451c06f79ebc45d5a85562385a2e449679db346f4";
+ sha512 = "dd0f67d9b205490f1205a6d33eea76c18bea40372f08ad84bf6e8ab4ab9e1abd71ef2ff729d692bed8204ed374c13f191e04f8140acacdc373eb897122ac93e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mr/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "b2b44d4a205e39d82b453a35569da1a3f428610551d322a1c57e64da42d96ca2f199e8e01769a24628506cbf3b621cd734923f9760305de8e480d51f360f79e0";
+ sha512 = "9da4f47e384a45b976de48967bafdad35b2ba418e2d6e260ba3c6859be2d0b67251099093071f4c0c93b61d877ac1316cbf6a217926c77cc35841ec7a4b9a160";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ms/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "3646303c3858e4c2a7dbb555495f5f06b1867a04a37cb8ce95bdfd998e7bc96d8afb8c83b1df7d945bdc8327cc8d7be3f3bd7199efbe23e58cc3e38608ff8313";
+ sha512 = "5698c5c4f0db7d7b9725bada6951519a87a960aec8424e4c725826fdb7316a0b69c891ca32ce7d53d43a2839f7e523a573bed85892428047c41c4e122e168dda";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/my/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "afbcd9f8dce81267614855d4d59da02f87d369c2c0af78e28ebf25de18ea4eaa1412999fcf3d414ebd030f9448d71e48500a4e90aae03b3905ba69f2670b17d6";
+ sha512 = "beb075342de69736b207ac5a7e804575843f700b5bd4166885391cc667616ebc11aac255b1a1d897d607f673d0dd4cc0c7cde0b5c3dfb5a3e492373c63a06d70";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nb-NO/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "747dbaa1919c1cec14d4e085f8c8f284fc49508ce82cdf9a97538a85aeb9b901eb9e160e03346a769ef760bdb2108b33a25a967a527dfd3758f25cf11bad2e31";
+ sha512 = "ca5632727eb2f99fe4cb08e151ce270330652ee7ba267c3fddc7ab4213b2b210f3cd4077e528026dde4bcc7e40cfdbcae16bbeb9448942736691c16f37ad302f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nl/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2";
+ locale = "ne-NP";
+ arch = "linux-i686";
+ sha512 = "548f91230ab8d36e60289b6b22a985f1a9d5af286330734add837a1d75e021713316975cb09afd2157133cf702dd32e9e8b4f1fc07e2d92fb64961ea8583b453";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "d882e7c1a49ba670535f17fc9ea99e7be4505d6dbd5d90855e4614cef319c38718da445afc411f1951ec3fc5d9a3b8799c64459a7adb588a29a126d1cd16d8fa";
+ sha512 = "063c0746ba10471a6014413a374768ccad89eddee8d2abf5cf3680fcecaf396676fc9629095d6629fede3e13bf72b7e7a096814771986b2c73ca0084cb767970";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nn-NO/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "8bc137f953b13a447dfd419b9ee0e4005134437892f214e49e18f98e080d5413d1dc655bf0bf417cd7c8a09811d3e7850967662b9d0be0d3b72cbc92db7e2307";
+ sha512 = "6a8e52f2f318ee0d4518dbddc7ef8c80bb4fd2e0f7b5a962571f5f7bda24bd81c04c712b4a0e121ba3084ded4d5320f0258618e5bae333869b8a1e13f6aa6fdc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/or/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2";
+ locale = "oc";
+ arch = "linux-i686";
+ sha512 = "ffe5948bdad294311b5e57a417fd47e8c719cb1c918ffc3113a90c922610cad6d1c0ab26fb4c369a89f4968e4781a425fa2de895b39395f84cdc91727cb76ae3";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "34bbba4bf288f62654f88afc461155a27cc0316a920d7b8e42198054d5800360401c933624140cd569bb9864f9eeaa5616fe2530888e4717c964506ce66cce0d";
+ sha512 = "c57ea4d7168069797601ecc5f809dfb1af98a197f3a277caedcdcaab93f7e245e7020d8317a60ccd3e5696fa72f13b1a62c51f6eb78e608e943f05614f47d9f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pa-IN/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "1403e23fb95cf8449a149ecd698e768897a3733718dc1f6eb4590685263e2a1b54aaa3e557a968cfe71c5172bbdf7d24f3eb9fcdbeb431e31a1a26c0b9738e9e";
+ sha512 = "858b988345519cd645d8b812ab2dc13ad886aa6cd8cfec594369d890d162664871a4728119f257179aeb1b16eaf317db71863fb59120ca51c31d74dd535aaee4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pl/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "a2d99c00bdb839e4ce89d1bd6a0334bee4b6c6d426c3054257824c46abb1eb3c1f283aa0a4a030f1865fea350a7032cfcba86e231d11ce06ec3066f5ac4d47fa";
+ sha512 = "8154d4883a05426d6ea6956d280d73f5bb9f4be10a95ae0909e74bfc0a82af418fd01d847be2afcf91866b2f26e616d40d5a90f7a483510b16ac611926ea1f24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-BR/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "5768a805aa0b7780b55fecbd9bd349c6cd78efcbb3595acc7cab18d3356835e53e63e58e352c30c79b349e0b0c80be59509fa684be21f541cc67aa320e654f44";
+ sha512 = "10dcda386ec18b02d365ef3c0f6659dc18002d1620e7b1e8426d2f128aef983389fda0779b6bc46b47bbe500069ad7331d0180ad2d0d0e539da317a4581f397c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-PT/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "ca4dc2c76af2db4d9a44f8ce9f29adf7188a799d00d2e8cb1bac807dc90930b06cc5329097ef771e4f070969cf42c3cfd65b32dfd3112f59efdb0071bc6292e2";
+ sha512 = "13ee97b06dac091a7c162353117cb9c4e6761229b015b61c61ea253f6ebf39049cfcabaf297519da4819de478707d79d679578965e4d8c123bfa3d9ac4cac7a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/rm/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "86af2317c04244c63f8182f46eb95abb1a113223c6d503c6b85c2fa9b596f44959e86323da0ad3a708f6c94aea4180246bb562f26c64a8c9b27d9a490d65a291";
+ sha512 = "ff97a465cd036b16960997e367ef1d6705599888e89988007afb17628ff8efd8c312e3cf10570e5796cfbef0576cdb3984ed0228f3601be40cf40433d7fb344c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ro/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "2120d05bdf2dd8a702726e232fb3f94838befaedeedcb7c651d8d07047759b885904220173bfaaaa6d55b71e52085ce23156ad030992e8ae3981d47b41de046e";
+ sha512 = "d6c4e54b0f65b26651cdf1cffdce5945d2b9ab47e1344f18a57ddeadd472287f8bfe3db150ba17ae342fc6ff2cfe70d6f067b9ce69875f20adc86bfae1c82e39";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ru/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "221b4170254ed9acd7edb256ae560060f640c7e6c02236e1925e38489e387f839c14b5cdfa2a0e4a0173e8b98a2ab57b7733a6fa361172166097fc84b260bba3";
+ sha512 = "8f0c4ee9a619114cc244872940a6224c29bf1121369ca448ef828e5295def03d483a0e36264cd4c174148a182e60ea561e73761f07172d5c99952f39392988ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/si/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "ea216290852677ae93bdbfee42b65473f9e00797175b7e36f4766a251fb302fd69009888f36efca7d04ef29fb0d66e75bbfddbf25f7f59dbe1d6767ffeb0c543";
+ sha512 = "a963c1f43ee578f078ada5d7a4bbdf104f3de01d910171e44be284ba7c2acb88e101a3f154e344800d38feb2571ec8694dc1c19427e167ffa0fa71656579bb72";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sk/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "92071604add2392aa144caf61ad747d98be52c3fbb82c86f903772d470928f71748d8def2f367a8b6bfe04ac6769fc57f8de29210ae50bc45b75b94f5005b564";
+ sha512 = "8621b33463145af2390fc4dd08443576070a008ec3119e9a28761ab46cbcdec537ea773f6d0004c5ec6ebd9a823d4ad3f358bddcabbf153b62a0e2c5046495f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sl/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "94341abe0210c9632ebabc47325c55577e9e6a5f54b4cfb0ba9d19298dea1b3d6f70a68c3f82f6a4c371f8ddd6e088b18ea56282faeda0c824040e6c4cee0db1";
+ sha512 = "b1e6b26af9101b3f6b6de836fbb618b75f58dd18137c1899847e0b0e59795c94f24f35515e24ef77be25825a3ed1921fe78d230989c71f59a21eaaffaad7d23b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/son/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "537a57fb00d61b0566d9fd344919b65486f7c767c93d0aec9595467cf9a081d63c8ee7d3c7c3a3409ddb08d57f36ae078e3defc79826779954641c895079c1da";
+ sha512 = "e56acfc28ea49ec19e93aa36cc470baf7188e9ee2817bee6e57fc37d99c953925123981da0455af7375b7d8d4a2273c9f63a91a03a454d29b96d2964fb5d7616";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sq/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "a4ad413f8bf4ea8333b3c182a5c02283886e395e58b6ac5a53a298afba0938ec38648b67af3009a44468ab6fa89b6684d86b4d83525f0dcbb470f078584b6dea";
+ sha512 = "76c69116f962c4f41df1e4a0bc8015307f424ef86513f88c972c2d61b533bfa5bbb07e7a540c91bafba7313cc53b0c5002d9be0b2bbd483a4801a3874a7b4229";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sr/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "15990e14d69bc0f043f7bcba54c5c27b7562c8fa68c5c14e7df695382303ee6ad40eb6b22319e8f9110b59f51209e0c8a6357e257862a50d8d515ea7f414ae74";
+ sha512 = "bb500d84058a6451158f0cd4cc6c057eb3fdc1d65bd438112f5df8396425d7113ddb96e833ee9ccf5345fa2cb6f089a0a19f46ad264ba5e6d579b943329d5561";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sv-SE/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "690e94fc46c94710e488b1a8cd096927756026d0d6ea49f983883092e32f9dc0d2fdbaf6efe4c236cf750873b7907807fcec6826d2ce8b2473d0c4ef5461a1e3";
+ sha512 = "0e6e5424e797a1c5870fb64aaf5b7d84d26d9bd31d74894efd5c7e326c0582a4ce30e7610c463c313c6cfbfd36f3d518a60577862e56638fcfd0cfb8accf4629";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ta/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "839ac81dd6cde69b05e934a4bfb943fa5c65f86d4c7d64c58eb86e7911f81d93a85abc3ad732ae0baa9c7df76a906826a109ea15cb4ee85e802248b99b9ef1fb";
+ sha512 = "9d0b3a76660ae382564bc43268341225aa36d3241908fe727550529fea39066ed924ffd59193cac882d8aa0e306b2608a78d6d11d398e6ff81a9059158af3c84";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/te/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "58b1225e50a0d3aef4b1d2da5d494b41e5ee41f53e2878a4945daf308d452348deed4cf87641aa51e9c061393c239109d02523596efb8ef7c675c885d80298aa";
+ sha512 = "556436ce9648c7adf9470495ab8a2ccc33864e92c2e41f4a7af7c476b249035e4e55a43a888ae19e03e6b42fb931767dd1683f7c444a29aff79f931388fb7437";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/th/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "6d0cd2b6cd315ca50445f3f87d1d2d2977bc34246481a58239f06a90253bbb810c0de488d064e80d3d2bcc475d34481c1f59ef0499ff59057b77c0cd67e71c7f";
+ sha512 = "cbbdc94b148fecee3b71bcd23af09354fa4dd453af01167adb8ced16b9499afced409dee7c1a23e02aeda9a452c1a3eb36510ba0b5bd8879cb2f7ed4aaa39bf7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/tr/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "291f0c8f1241120a4fe4c2754ac82f443ef6f0d354f8b71b25b2020948a4de5b7ddbc87bbe2fc08b09ab1ec491a34fbbc69e6d472dc0114e369a99f967bf27c7";
+ sha512 = "b21e8aa88ebf570aef2752a2b186347794df3677c4e3a1248b20b94a43e5eb2961545309f0b47b2445601256cb18f277caaa330c9ab12106fa5ab963c6c15226";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uk/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "a6db7a4daa79d614b2d7c94372aacc50b4068ad437b38aab72cce99aba668fb230d5b81691678e09efb645282118dedf25e0c94e9d9cd9ef6a692c43a288e119";
+ sha512 = "29edf3dcc7194e6fd0d5d27f354705cd25afc1fe53149964d8131844f1b1c3f0a477c0115a291d78a9d5a370e4918d39fd6fb6c5f5b3ef150bae6052b2acc382";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ur/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "cb69cf2aab416490b866e9b15b3706dfb81b003887456ad83907047424285f46d1a4b727766b78a633b33c6418c3f24dd9b53a90b151a1752709191328c0e227";
+ sha512 = "3460c285dbc67cac93b6ab4f477b25b56ab0ffbbad20c302d0901578c045e0f65dd65767de468b5f6b594e69837374405a1338bba7d67e0d8447c76f4b99a704";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uz/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "bb29f30171804b14aed28e5953bdda7bc94e2e1d23eb9af54c36937f90ff7bfd068abe4c065690aeab2ea61df08a59a5ed808e1f41e7d055b81235f8662d35ac";
+ sha512 = "85ef101a19505520b5f0c15c47ab3699b0dbdc65031ed12b000ccead70a0efccd489d8b0a7140d9d3cf93f906136e63cc51b62de160800b2dfd7dd25e035dba0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/vi/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "b91dade05c291572c257be0a33d685fb48079c4c1dceb95d6b51601430717c5bdd4f962b9047c2f2a22dad38578a041025ad59b424efd1260ddf6f9d9e4d92b8";
+ sha512 = "9de749c7e72264b48609d0485790048052394400ccc91dc0dbcddfecef2a6c81ab2035354aa15d3f0293339a086099e68d414f703a32b00a6c50a4f360c665fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/xh/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "771335861bfdb99f17ae6c8607e784e3901f637d8e4a06385bd2bab4797589377e8c1b875600e9d8434d6ce5a7003ba4ca154dced98228b85c6f70272c0b8616";
+ sha512 = "d33b836d739967701a95776a7b19c1b0d6ca681ff3e471defbfa1a25c8bfad681dffde12f92d04ad2a47433a245326f0cbd0efa0654b45ae5ad6eec7efe5ba36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-CN/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "d48c546975b92cc5c130e50b9fb3c84116235aaaed6ae8e04e975d8ed3605540b9ad640bc995fed23e42d271b9b2b598613b14822358c7487852030c5802dca6";
+ sha512 = "5d8754131064ce271f708b30c658cb16c360b083deb62095a3a6639e547ae672cc3554300105fc6a1a947b71e732a612bd208bdb5a5a8da2d59da63c1e9be9c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-TW/firefox-57.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "9e731700c738f0db2390478ba293f78a98496c374cd871a0ae483c3911685f0cca1b89531c06177f739fda77ee94fba03f2d93ad4669ce219d215cac8429819a";
+ sha512 = "e3dfd19dc6fbccaf4b300a44eafd8f9b10ba9838f8650569df5a397204c2374fd797b00b257a6b7e775ee2f9a5ec46ab37e1fdb0008ec35207b17fdb6f407223";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 347ceba9ab4a..3a6dd626ac69 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, config, wrapGAppsHook
+{ lib, stdenv, fetchurl, config, wrapGAppsHook
, alsaLib
, atk
, cairo
, curl
, cups
-, dbus_glib
+, dbus-glib
, dbus_libs
, fontconfig
, freetype
@@ -27,11 +27,11 @@
, libXinerama
, libXrender
, libXt
-, libcanberra_gtk2
+, libcanberra-gtk2
, libgnome
, libgnomeui
, defaultIconTheme
-, mesa
+, libGLU_combined
, nspr
, nss
, pango
@@ -87,12 +87,12 @@ stdenv.mkDerivation {
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.cc
alsaLib
- alsaLib.dev
+ (lib.getDev alsaLib)
atk
cairo
curl
cups
- dbus_glib
+ dbus-glib
dbus_libs
fontconfig
freetype
@@ -115,16 +115,16 @@ stdenv.mkDerivation {
libXinerama
libXrender
libXt
- libcanberra_gtk2
+ libcanberra-gtk2
libgnome
libgnomeui
- mesa
+ libGLU_combined
nspr
nss
pango
libheimdal
libpulseaudio
- libpulseaudio.dev
+ (lib.getDev libpulseaudio)
systemd
] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
stdenv.cc.cc
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 2f3e8c40a3e5..0ad35ee1c1f1 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,965 +1,985 @@
{
- version = "58.0b2";
+ version = "60.0b3";
sources = [
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ach/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "6ffa1c861a68b6bd7e65b0883c734baa1161c3ff827cff2fabd2e38b5de64bf973034f40958471c12fbaec806978a74b3e2a5a4c2e23caf87dbe747cf75d0a1a";
+ sha512 = "59a2c232a7551d3f75843bd71f5d1cf804098dc7bf3048bdac03c51d7e7da32b52e10aae2499d28d0dbe6cbfc5b2fde87c0624142ffc4026aeb4e790f927e889";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/af/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "4bf2e416ff864e6062a76c14d70d60da9c3c3261b2d401e4e0cb1abdec77f0c21878b36b863f3d11316e6114e358af200b762c4f1c7cb7cc84cb12c8c95d240e";
+ sha512 = "869b80d3f535c5e63ecc3c91150b5739d5f4d27137e11f279b534645660c761ec95155702c852b5bd915d41381e8f8c11f8631902bd0cc13f310b30d31aefda3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/an/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "d1136b831820dd7f9bcd2d5d20d68ba66bdccc610bc9d26b59937b2ba017fff7fa1be1d616ff5586e136a16d1a2023255eb430d78ab7c97f35bad2b6172056b9";
+ sha512 = "b5f850afa0491da07705ef4e3f48a1aa0a4678744a2a19e6c4f52041f91faa9249362f983b6b0dba030644ff67b065e25315b50d1429b9967211b4873d355a80";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ar/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "ab9dc901df22fe84d01cfbc7b251ffb50eea784c2cff1a38c404b75ac58349f312ca7b602c107ea8b08bab7dee292b99ca33d3651fe43479357b57ef2d36a07f";
+ sha512 = "843898c216e1c531151d2e123e1c7b822259915130ac198a7f115dcb11af079f27514fbb2796c00f6059d18d0d7b412ef7758c0a6b9b0e985b5272ef9662cf18";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/as/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "f7af5fc1e80cbca6227266c5f7945c665499f5be36436e7135721d67efcfb3d2b101e1749c03101ef491c231f96cc746a6bbae25fc5818f1790d61f59e4fdf2c";
+ sha512 = "f02f956b244ad48b94d0c45307d61b92a70d6cf2acd58789fb453287d0f53c47322dd538a0e1b17627a7e568728abb905a835c29c35add401bade4754d987dc0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ast/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "ac9fe13f073358dd71f81583e6d831617be46b65781da099fac48db37a942c31bfad3b72422ef8a14e65c5de28939cdfbb1c580f3db5cdd54819a0da0257e151";
+ sha512 = "ab7fd7a674a7292cbd9f79a72129a212c95c8960c2673de52a3b566efebbaaff316820a5f2613394592c4bbe249876197bf4dafd9e84c6cee35858521358a49b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/az/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "05e30463e29723157815f91c02f7d6e323fad0443d59ef9b6abe2110998170894aa95467d5f05f78daa43fdf05f3e72af5c9656134529aadc9cf165b201acbe1";
+ sha512 = "c9b7e536ea19b74ad5774e95a2195718692a99c7e59a0fd482cba9d7c62250983d0cd7689771db24b86c909df5e52a009e7d97be76807ad21dc5ab838dcf923b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/be/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "5aeac6d316409651180bb00de74ceb48bf8bffeb027491c1d42830390aa11d64d13e6748a6bd5519c5132d902e0bdb06dab35ae76d6ecf2a8e769503587c7660";
+ sha512 = "33d5175f1df479f85d582c8e95255dd42f004c5e53e5a11e31344db85eb1e49c7c83c2b348db840cfee44aedb17d52bdfeef63cb8f3e9a4530a33d34d05c0e5f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bg/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "6cce86d49c53498611c85505b5996c6db92b5a5aca9319b18ea0e5ab19dee2842cc4ca036ccd9b1bb7131aa539e38037c0363281e170182ad81e59141150f20f";
+ sha512 = "8d1f3c82a6543b8ae7ed19e5c6a34525899ca1219e2206ae2a6bf391fefa37447d611ef6896ea5210c1aa54e65edc23548dd76eb13f42b6939624409540729a7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bn-BD/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "b177f5531f887bea5a8b47da45a4ec1477a9adfe48de02ede1aa49761fedaff4ab06603ea004ccfc0991e9598982077dc2f30945e1042ad8098d8cd6eed7fa41";
+ sha512 = "f1b2f7dc2ca26c0637a3cbf9d649750e2c8c885a40b0767310ca7624d8947c6ba09e6be9529814524c876fb9fb60390f47ed88c131227a14e5af9369456aa363";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bn-IN/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "5475cc9261e666aa11915f70599a281dc5bbba7a88527646fc932b6272b70a936186077254d147c68bec28fee4f79859567256c327043ffa5504feedc76e3eb9";
+ sha512 = "5c6c8aade30d76f496cfafaf8c0882e72bc10c733486bcbc315ee5ad41565957f67c9b821b5b77424a67619211d5eb959c731beb28117c8b31ea18f9e4516342";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/br/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "ace1027ea7d5115ce7654a8b12609c4c78da5a6dbf8a08544d467d4a8766f39df557659c9c54fd2ee613c403ac523cf4fa8fe241544112e7c7999c572f45d656";
+ sha512 = "bc7f71477781a9e9cc50e41fd1507293f48892cb2001bd79360ec4ff65e96fca6f69d6d063c9c6e44c0e982717ecbe6a6af05f14485c13816e415b3104d93456";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bs/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "d8256bcaca634f53c60fa8fc4189c68fc14dc1aa7941beeb28692f76e4ed62465290fb0234236a684ac489634f71577dfd5d5e613d710f1e191cb3021b2971a0";
+ sha512 = "645a7bb1a4b5adbd3d7d9e190fe8ac24cb81d311457f426f8592a8427a263a0b8ded1817b8026241b1f3bed8e2e526158c7f1339d4584c1302822bdf21ebe870";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ca/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "0fee3a02c437015679460682325c7fadb211bd5d4a3f5f1ee04c978eefb0694ccae7b840801a9453f8ca0d383079fc0481cc157741281ba09be32a1012ceb2d0";
+ sha512 = "12c3d21eb2c7a121080a645a75966caf757e886222c292b4ead3a23278bf35d4242e1440ed5f7eaedf1cc4a7436b6ca2130fd2accb075714c71a1ec31b1dfd06";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cak/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "ece5f44da4de5370701ca57f6d3bfa68df19568ef07ad515a2937a49b77e63ab9752ac9d31b1da837e914ccf9805528e7727e04765cb77909e33c576358c6912";
+ sha512 = "8cb1dbe49d8bf0696b6291452a7e389da21dabfd1bca59667038b2fc9647b588ab1632c5d1a8101c1352807c57f42ee1f909c1e1c926321a8583300f99a0934c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cs/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "48fea82e0062a91b89e868c0f3baef3869987b9465314d40f9df109b573c24d826bd87a474e81d43b5aa9dd02cc1968f438c4c93924c06ddc133dcca592ab095";
+ sha512 = "06bc6712e27514529dc17379d8fba4537440f7cfa7e84d2b4201386a886030f3b4a098b6230577a36cfa9c9968ac8c1432100a0047f86c0aa32d8fc1971d0122";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cy/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "15cf8a4ee6016f4dc81cc1a4287ec1b7d26fe8eab613087bb3b95c7feac4adf89fc25777961682e5f85a158a5c1afe3d41d8c5bdc455a0ce0739c59885d0a2ee";
+ sha512 = "123a40d291431478f8fbaa13eb2197f3dc885755a1478519ed599b84fbe086c377b6208226e0409f156fb4d90ca1beb25fd255583018ae605d2aa4c5bf84d258";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/da/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "7e66d426d4837999faef4f8259c30720a39448b81ccaced2698be4051311cd7b7fec08eb0ebd738af7bef3474ad4059e2e90e9c8d12d829c8cbe7d758296343d";
+ sha512 = "4b556676ad9fa3bedb4ae49685344cad23da8c47c68efe986d14166308b6de53cb2f0b696d89e55e9ec1a3e7d523016ee7b87f539d4d6b02facae2014e815858";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/de/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "cda87407ecd86d825dcc15dfea4c1dd2f56d3bcaa6af2cbdbb8b209ea280c60dbb72b68db71f84e94783f7c263ad4dec503603b650411c72b38c1a5a470deefa";
+ sha512 = "eb53b6c9a000c4b7277d164c39f0d53928fc29527cf35a79c1ad1418f620efc00a16663ca0a59db3ee7a1d51ca9b6652777154827e916fc0346685080ea0bc8b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/dsb/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "db9da2c7397d64d1d5944f6dab29b29325b6773f85af1a4d5e87d06dcc580cc1157b4f7092e7fd9bde250f332d26983b7ac2c7662b240f4e97f2ee1404ad4b1d";
+ sha512 = "152b9ed4b6674f1f9f83caf6b344d83c8651beec699fdac4a9cca4ee82012bd8c8096b3bd6319a87b8ba3295088d56a2aa8be965940114b2fbbf85e102c63620";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/el/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "51c02952a6a1f94f25dae1de9138a9a39203eec9b02c3f90084e319f8e3e17c436937dc5525709229db22a27de5f79abc1cdd8502631b6ba280770d91151d5d5";
+ sha512 = "8c498c56a8266389fc43c80971bc379a1c79d6769d8560e2620320f9ca502c420bc5b671be09dd50f67afda11a45b6fc56c17373e562691527190bf8334224d1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-GB/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "b5925d08497647afb8f6cb6bfe5ea5fd899e55ed77f3709ae007e2359d1b7c38fd5e7cedc56f12d68e660b5d9f10c56bd65cccb92a645d25cc617f188da88a65";
+ sha512 = "68a54a00c74b113f2f4c33c92d872c454da2c97e34c81c91e5807d2725415d81a6713b68459dd75a1602f908012d60883f9d483d23fd638dc0d43a75414319d6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-US/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "b40a42713892b760d659c4fe5ca002b8ccb5309319b57d89b5f9af37c84a021ad67601f5c7f5b02a445dec7a00d671a28df6ab701775f59b1a7be7dda93d673e";
+ sha512 = "1be7176d5a5708fca376f9146a8ca49debf0e4702365535685d2a3db68628892881b3be3ae3caee972f3839fd48528513131114c5044a31d6468c1e8606a9eeb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-ZA/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "1765b79663475ff97dacaf441cf127256be5097205f52f3ecd5648b5d15087a9e43fc97e165cec714d452a3c802d798b89650eb3e9b33c00e739a1ca2684dfd2";
+ sha512 = "b9239303030197b776debb5726a25864e54795627f59bfe4c0f24913d56a04b5d4f4f69ae1fd8c56d105e8edb185e64bde96226e043078703c3b5805b507ac4e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/eo/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "e1d30c41b6ba56604539a5b527effd16c7a40f85691fafc04d8e006f2d09c9531f70f5e3305aea8eff8840487acd87657a0aae66a3275d5b64ce84ee151ba3e8";
+ sha512 = "4b603bdd4f1b484a87894f3252418753e2f52d6cf298cda6d18bcfaddfae5269ef69ebd0a7e9d85da8ab42ccc4065809ab34a0ee36632c4ee4cc65fe4169cb99";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-AR/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "6830e829c86a4860a3ae461e16d4d63feeb141cdf65fdeb29c4cdd4e4fbd1887a5425b81eae9a34a28d750fbe27e70f065acd70d0cffa6c9d1cfede023e43f07";
+ sha512 = "e27a814f7408198c200165da2fe6cb40fe0b11626e15d92e8224c12acf1dd133e419bf8f98b09dde3bc505b77750950f568bff295919fd1b38112e879a6694a5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-CL/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "ea55c8fda45368ab7adc12891c3cc19d27124e8740ccbcda6b2b7edecd3310dfe068344f856d97b5c8cff066427dd21baf2d242397ef249a7590d01989be274b";
+ sha512 = "ef6d2814d1ff70e2799a8a0d5c6aae1f711819db6e816f2e153e84701e93a0a7debe19dd0975a4092d8c179f0ef5fa8f2c53b1d0d046110914634fd3bd2ef301";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-ES/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "ba2776ad1a474183d828fc73c4a3e3f8036159c8ba08ea8b6bcfe562aac0808adc015c94f4375dab850fa61df6ce94d6bb684e028db07385486ecc2964f9834e";
+ sha512 = "d41bb50097c60e239b539de8b9b08d21552d556e36606078ebe36a48de8e07dbb60b3e2940c0c531f7632efd2206cde2fcc6294a1f3a74a5bed7100c75658c0b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-MX/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "14b755e01ce982a3aacab5cc70c086c877f16df8b46e46aca46faf0950eeab61e2cbc90de0f9dc452c6f27f8e4367e4fd70209491721c04a88af9fe8edf92b10";
+ sha512 = "d3a2a4aa920c864bbd28dd8cdc091b25d6b8d386f73144d6236ffbe63a99e74af6f6420a82bde6b2f8e35ddeeed0cfc33a1e9aadd425d778878aff3b447aecce";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/et/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "d211c2958e9927c2852801331ced3986a5a9f75b9fe3d734a5b380e807a6f91e3c328c48817e21b43ca2b6fc48986f80f5d5f3cf4c0bd03257c046b5a930c985";
+ sha512 = "f66cc73bfe130295e35c44cc2902c3f1ec7b271d673974e13e0d8be630f671ca548943f13c04a01f45cf5523b3e67147ed28a53794e714409cbe2078bdb0dd55";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/eu/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "d9f53b988a86a48df41a691742975096343a3b4905e5ae78ec9bfe5580ff71cc56457fbfad2fa8512d3a3124989532f21caddfb920d886c6891b2a1d82e26b6f";
+ sha512 = "f377f98e9d3b1774372add885bd45900e9d5a792d3b2c9c96f1ba4db0f7f03a7f693e400888c2d98a5fb67d4199f13f2262e0546f5e53491803872cca5e94ba4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fa/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "43ad5afa9cca9944203c33ef053bc86cc36e50497992ecbb7959edce25d54d588b736f56684af04fba8f10750b450a613ca4008715ec5edc2cc70d31a5288296";
+ sha512 = "ef1b293fc8569a23c2b60a47f65d672334a5ee8d20470460ea6a2972ae7e6be91ecfed3c3f2acdba614e7895060253444fdd805df00cb08a6a2abd4c0d98127d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ff/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "64a11c61a3104e5fa06c802e25ebb293e9fbe58b3d4af50a36a9919d213d75ecb1e1aff8d164f111398b0e4efb46a2574d05f23f39ffe845729e0fe18ec27720";
+ sha512 = "774ca258ad68a2a6a5c9943e7b9ffac96a54448217125fe61ff11a0ede25c96498f7153f3406c1322a1f83515147402a8b506aa81732f2617e73e388fdd0950f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fi/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "0c739ae31197dc3c9c10a40ee97eb4bd623ac3551f67bd2dd0527a4e6efabb47bab6c31c15925925d5670611b82de921e0d068491819b9a580c8062cd0a794cb";
+ sha512 = "e29c6aadb5dbb9d456a11ff66d4b17296d6cb4417e4eda85a2666a79d6d2fca65b93cd7ceb385456e950730fa165462df164ffe17ac7696e359d96d08400257f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fr/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "7fa98e4e5fd8174043d6d85ee63aa22130a9191dabd40ad8935f233559eeb2dc46bdf27047975251f4d843770f900eb1756161e2d5dfd91e95c4b03b0841af82";
+ sha512 = "487f9e0a439c2738f1eb2c55fa89e56b7829b8c66dc893ecb23f3705d86e1f8bd5948c2ba0ccf3a7eabeda68385371a49dd74b92e3daa2cc7fe07b958134ee60";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fy-NL/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "412827dd52dc04d0a342bc0ae0871108264048b13f3476af0295b9304efea3eb24719b5ed034407dd25f7d7faef635ed08056b12de78d6fb1ec0a30acc1a1392";
+ sha512 = "0e526712e2f203e1ec806216144abfcb9ef96c769f8f736298053a8ad33d6f9e3bc6e6f6b36c4aa93cd45ee8a6370a15e0da6aa312175e142b574db8f5e628ec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ga-IE/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "02272dfcf04b9ee4bf6ea5f1b03f59892526e0df14cab0dfa1b090678e9ea45a76962bbbb35ab5ee13a6bc919bb5849d5e401f8157f0e5119c265a53759177d4";
+ sha512 = "c21112fda5525ff7ded643407fe2be5c6b660449879a80dfd57b1f713c98679062cccc577a42573bc2bea9adecd660551c7f31c6962905cd51e6cb8eb14a22cd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gd/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "64a89548064d36cbca0a0572319e979a565470b4cc63aef5005f520e58f37e7a54e7ab5380ee5e0947d1a1b051825a5fe223a8ad5cfc833636ae9f9653b33779";
+ sha512 = "ed6d0fc2a82ee3c0e14031d58bc2074dde5160492de7920220ac8e72ca995b553ca8c9899d9d8f256287a302bdfbffd65981d64d8c778fbe7e4f55365b6c317a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gl/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "b69ab34709258444c957dc55f55bfcfe5965b31e984fb911d2fb8b8499a62044c5d24e68e93880454b09888f68e3e80c68c0e37a424de53786fcbe1ea8142ab0";
+ sha512 = "345bac14c394a432fa4ace22a439eaf2d16e6e0dfb6dd97e356c2b623000d14675154e34e4537b0f5bcd1e90c1111a263e7ba52a1ef6e81f6c8d0109a6263690";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gn/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "25f3c7753bfe47a5198e770def91596f904f5b4de0658ee49c2209afbcf53fda35c8058465ae21876aa733daf35bf58c14f464f2e125996e27952759671cf351";
+ sha512 = "702f85952d51286576c729c84e2709b32ffa0a1dd03c2911c1b20de7510e1a006531389c2bdbcbc1fd99fd3568db5a4157daed9c65a4be04648872a8200a808a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gu-IN/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "f20a7cf31dca9f635b96b5a95b24fef039f3a856e64a34b681d75e19e1f997bf41f7a8a49163ec1a63ea2d2a500eba174a3e8f5c931e4b7b9ec0857c908c5aca";
+ sha512 = "8286e8fb299022028cf17466c199badcebb23a9aa743d4c64b2737d3112a5d964fd0b534bec6892aea9d67877dece66c25b1ddf15e08a745924e815064768891";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/he/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "c2de1b8b8cd2af04efb78b432b865df564fdb70e41b3ae7ee17bd66f438bd8ae60b49774265ae9efc3e5e17d8ff947f50de4872e6004e497b3ad073c096d5110";
+ sha512 = "598d84026a03835044c8bb57e5f27ddd131a045c49c779a5813d06b789bb062ea2d4ed92f8d5fafeb1b2ed5dafcaa75e9c06f5c8354cbab80fba1d1db6ce61ca";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hi-IN/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "9f513d17bc01dd34b1a07939d8d4858b5c525d99a0bab1eb7ed5f205de3442e3f9dea90e5bf2a7743f6b624757dd3b182ad976d5b32771e99b8c62b016aab594";
+ sha512 = "a410f8d101396f727920c4fbb91d1ec6885ea98317a1cbe7557d6ae7b40a9e428c6a6482cbfcf4857dd0b652cea8a6b3953fb76455234b2a6938cd55d9f9ccac";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hr/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "0f43806af6aca2980e358fb7bb39b2970d9d7c32175ff9dd4a3af5765866fb68a1e4a5ea7071aaaeef4a70b502c5df86dd88e9a4fb5e6db00f5e11f9d99b324e";
+ sha512 = "40fe8d2dd6f232ecfb0f48cb93f837cbb9f731c07c11d6c51c44bd596b050be89aadc610dea9782d42fde6ac8779cf72eb6b459df11d6ee1dde8b9960ec13926";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hsb/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "4397b1ff3a113f7591ea8c2211fb7b15edc3af9d2d8883a720eb68d5f19024488262818795d9f14b67c91649337e8884ea12d6dff6fcd0650c31d2f917cef493";
+ sha512 = "319fe8680ff501e100ae9b3e5a818d6fc69c1dbfff8e11e6ed55d9e25628b7435da4632e5a6b92758a0f2215d79f49f2aa1c1f98029f146af30e1be36dbd47ea";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hu/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "d7dd0be61fe7ac795817b7e2eca9f9ce1c312e49e851e068b410fb9076fb83bfb82928eaf7e1bb11f7647890a0b74dd16b93ede8e8672f7a70e9d0482a859646";
+ sha512 = "a1826847c504931ab1554cfd4af989ab7046eefd9d1a28692a0b39bca390652d6e30d193076fbd59977460f5570b973bce1d0fec8c1ef6195ec70a836cbc5520";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hy-AM/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "a924053e4df4b5e036dd25e3f663239bce6e6879e0cd0060fe62a5f06c573bfbd25ded2be37940c14a13c493ff421127245dea88ef183ca9f496bc8a89d1eeb9";
+ sha512 = "3e7b49261d343eca5fb0828d7a5b6d298222e31066a7395d948f34d597642f1580e93852c2824d40262d142e679dd2169a05626721ed7185b5d0ae31759d2b37";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/id/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2";
+ locale = "ia";
+ arch = "linux-x86_64";
+ sha512 = "e9eb9c11cec68272ab8bb60f0f099c81e4de395736663f47a1221ea089ce651f844c16e3594b1ff39c8f60d3a6cb40a28b08e8df1ccb2d458f138607c3020aba";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "cd83da2536a067120783df1a5a04ef3e16aa87a47fbfc4c50d0009983652506e10688f05e2da66034051fbe8518754e025489b29e013cb07b9829dfb2c70cff6";
+ sha512 = "e94899aacd5cb5d893482e99997262f021a8c4670f5696999d78f657d7f6edf60c4f9373efef9c20bd552d7b55cf335e797a6d0c7a975f7223d40ff7c27ddd65";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/is/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "87e6c6111b9a30de82235201e9d341cf2ceed3d4599d94815d807edb252dea937d7870cfd229d7fb47af8c822201567f3ab990b15731f9fef243edbbb5ff918c";
+ sha512 = "e118054c8a2673cc771d4b2a3f9e4db4195ad487adc51a9e747545271bea4abb241ad264e474b30a03f88056477d0a26a3efd145a67ae2b5f9eb771d04c946e9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/it/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "bfded5c6a7aabd2120cc56c756d900b2b71766d4ea6cc6c5cc9905ec14068cc98f10a8ee54862f8223b6d7ae43b09346dae87e5b146df8bae1a63dc84686ec69";
+ sha512 = "fec6a82125d6c6d9c42dc36e18553570717233c5a23535feb8264a1f3c4fe766bb1d21def103aaebd92942d0d957810c3e3cd7dfae9c94432b306783855b182e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ja/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "e74df1de9adccd46ac36675084a16c7d07bfa48025802ef3c932b291bba76955de14f52282bf2cce2d69a355393e97aea946cbd3314c5cc97e699afa610c2afe";
+ sha512 = "376fd767808b561233b14d65fcb39668d66078e2ec7f77005167f505a7393cbfbfecb7a2b643353b4dcf0c06b736d86100ede42d235cdc1983b31648cb683530";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ka/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "fd729433c08e2c569e0c72859d38f70fd62293b5f1a97bb41ee01950845c4480c6f48e80cec6ffd9fd81d34e357d2fbfd67515a44c9db02acd5f79acb55886f7";
+ sha512 = "335007dbee3221ec42fa2dec5d7bfe4a9b4b614eb02d83ba6cc4c37abc6df1f9b5500ec65b326f06fb4225c65127bec8e3ab5d6824285c2e76e6ba5248d0a8ff";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kab/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "edb999b2b27885422defea989e41c845b0f7a50d47e4f6e7ff2690fae9b911b9c0dd93e40a7420b1920790b5443800990836999e3044457acddb55781fb8a7a7";
+ sha512 = "dc587b11b62269e6fc1b02abc4eaf99ed1121f1089f5c42854fbe55abdba7ae44fad1893df6558313ce0c11377b47937bb3acd496106411291a9b91a51947ab8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kk/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "21eba1ee7a9fa51cb9967ecb4250fa305e3e516d0d69285a90b1ccecda6add2793fa035ef434626f4d9620374e91f1db4d8489a1454e4d611a529e693e46d09b";
+ sha512 = "290d192cc9a46b95494e68e1f36c57d6c790554f3d1f05a66e8737a0ee59e26dbf53381a17c17f85c81a674292a4b7708ab5e0cd9f9f4ed8d21eec3bcdab0039";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/km/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "565028e6aa408c734684518d7f3d033639ebf6ab3dbc74b682f291933f1141fbb7b758b0c1e8fed555067db0981e8a4f5d5c4e2e9c53d2ad066b8df269ff489f";
+ sha512 = "9ff963c28b5a1452c9e08ae7cb5de82991c282c7e5a6621958ac4d797bd74647b9048dac9e34cfe9558cf16fb1bd84f55373cac7b1b336e2f65b4d9635aad3f1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kn/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "1f6dd3187c140ece200c16a4e80ff848131165603fcb38385842e8feeec5fd13db3d1ae415a8f428f2d22f20289a856bb3afc96d853cb9e31c5d1445a1a63dda";
+ sha512 = "4378e5c31835efc3a7215ca74d85408e583e00c8979d4a3e5026e506765b49448d009e8feb5f2a2ba27d7db734d0ce3c0a1679ef1fc330e1637cb764ae7c8578";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ko/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "103a51778565afbd6423a043340e9bad47156fad51776106aa0342fca022ca6481f7b13b8f2a51d2e9e8b1982f50f377ade1d73bf6b152dd61c329fd3456a1ba";
+ sha512 = "da43aa7ba706d780420cda16d409425be026950a7c71c43327c8271fe6ff13cbcefb179cfdf3c1fe79cceae2d6cee6f9171697fb3bddec3b5589b8b1881d7a61";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lij/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "4c92f4803f094bb5d64c58c6d8315e51e764fc80c1886e9c18a58f93a93f8794a00a4319ed90ba60ecc9ec4dbcc37f3e8960a8b67261673806a19c8bfac8d989";
+ sha512 = "e31a35622a83383f00fc9defbd9d8e39e7819273d0698f802960adc094072427799254ac89f2a4de42070abb1efbc93b9298b4c076161a9478064aba44ca6b05";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lt/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "83dcc50c0f7eb41ca6fb41a1b036b80a8ab4993334a632e60b9523eb8a4306db427beaf2527bc4bdd1143ebe6c0f4b406b1b9768ef8f3c03ce375e33cae6cc11";
+ sha512 = "df75c385915e6316d8a4f9d04b4092889636e0de116fc2c33439047ab8340c3e17f87ef23dab3206197a2d807123f62efc61421770583e3f48268d67296cc39f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lv/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "27daf42869ae64f31d8d83f52e9d3f951e1277352276eb8436c2885e1a1de023b3985a0057687dca48ba69aed0ef03cf27770099e45a0fed5461de8cbaa0205c";
+ sha512 = "2ae471d5cd45b4c2c5af47df903eb550d2d68910c4086767238d8df05027e9221a3619f810c816d1079dc1e0012bbb7176b9a690d229c8dea6f7a088b5fe19d1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mai/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "9b7c38d7d23f6604963f280132b16c0a949530d7df88f47a5328d1ced1bfe4cf8f12fd6540b54a4608aa0efe09f35f870f18c49d4a8cf1a95e800b541f534b79";
+ sha512 = "01c936ecd336a2b29efd4a63c9f168da42a920a140502c3d5f160fa34f14e62b58a934dc5f102091999768bc2c37077acca8094219462dee72a91ce113f44bec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mk/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "1cb4b8304888fb9a4adadcf23b0c624c1ece8fb96a972f6d788f1b8936f05f8ab331df7bb949a4883673d193238a80919f728b985e0a9601f7c59c519fcf9501";
+ sha512 = "af11baccc3925a2c877e5833aa0ee24673dcad71faa4e25020da1a62ec7fc3106036c46780fb48012358f8198ba6b56b7143e772427327c110a14c78eebc5b83";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ml/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "e801dbb5f71922d09563149bb12461d4661eb877bb862f04fea418b9fd488dfb871deb97c131aa680d551de5d46e2801545d01f17fde06179290e12288e5f74f";
+ sha512 = "b84b2ce4420d4ad9e9e2417dd8435645c67a133a9594cb39df81c63e60e64c9cf33faa2b04b63e508696596185dbaf276b7e08dc27581f46afe10564ef31ff49";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mr/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "41eff5af28b452069fed8c8408dfe47b46ce192b6d0a996c6c5b0600e862424580c50251fbfbaaeed64d387367413f69ee2ed9819bebebf9fa67b2ff50e4417d";
+ sha512 = "3019e9b26b56a82b08046d3430556eda6ef22bfc576f704aba6a4ac9decc2f317c7a3fc0b1681346a7b9df7be335e899e123c50ab2b6ff6f743ef804a34c988f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ms/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "544e03a7a03b26a5b2f9da0284325234149faa5bafda74895f6ea29743471e302cc33b5398bb5d3e0f2d14dc82b6e8a8d02927e2a2e2c2364b3e2d1f20bc3354";
+ sha512 = "40af56ea7072beec4893bf9134e16bd5693081396e7cd135e2e51c6cdbf0a7e0dbe6a8a02119a822c71258920bd42ffed1d7f32c0a4cb5cb2c4f7b749e645184";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/my/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "28dc75be5d3eccdff87eb738a909195b5832cd4deeab9f4f29915e372462e24c9160e0dad4ec9fc80cd14179bd1eb08e79ed96afed74ce053a43731b0a95ffbf";
+ sha512 = "7934f158163a28de2c4922f690c479d95764c36999d5df45afc56589d62c93aa3d0587535489acd0a2ded2c5ef9c084cac6938c20d08fda91e8fcc0b03c057cf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nb-NO/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "6c9dbe11b53af3ef09b9520df28c2ae606fc8ef552518b8bbe3816a871333a061f504b113e05086ecf590041182e3baa134bf6d84a45b6a5eb3c2fa43cbeaf8f";
+ sha512 = "d7c383bd900e3a2910d3ae599a582b5e6ad26cb6c93618a1c4c34cdcaded45873f995c65805b417da425525b912d6e883455641a844aac21a2471b457c7a608d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ne-NP/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "80b819ade71f4ba3034d04d3f5178b1f4221ef5930d5f5429c5cf255ade70ccfeda42d87da3f4e227446576405362dcade34db285addf1bc2474404d98f96a94";
+ sha512 = "48c076fbda7a15e7a36bde08a8036b6987f7450872129506adbd90ae554db50c4d543289dae5260f2358b63192f06e06bfd964a3796caf41a2cac393dbdcb9ea";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nl/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "a617fcf15d972552b2cb659fadf695ab5ef6953c7c81273ca7cfb5ef02d681c80d245ffa62c25a0ef6a894c9f1413245c50bff375c97e34b8a16ae30fcdf217d";
+ sha512 = "cbd6c317d82a2f19d266381bbaa9ec7d7db0cf9c665d9407c36188f95d4e45a1c97df15b62590be8dbf60347093bef95021c55f584897ade06c3c3cbd111e18e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nn-NO/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "e124e1b983dae9ce9b595423949767980289169b9b3609033c34176bd8d6fec9e7cb13504a8d03c0d42359aaf045fbe0ba66aadf0566acbc80840861676ae9ec";
+ sha512 = "96a88afcf2d3b20b88c3f1550b623dd844d6f6e9d86c4b55af5d857c11dc57b2000de3fa685743e465ce3b89288eb940a3ab8984847566eea27717c8d94385f3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/or/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2";
+ locale = "oc";
+ arch = "linux-x86_64";
+ sha512 = "f6b77caefeef02b017ee434b256349a0ad954eef10f506ed95d82dc56835c1fda70431617bde9601057928d6c03fd98642cb84a4be81a6c4cd0a0de418f893f9";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "f7b8643f83ef6ccc0d6d3de8629808372625d7cd75d0bed8d8993d4fcfbf37764bb29ab1b2a2d3519cb6e5fe2d43af33e407a6295b1f770cef4672f20f1aa9ec";
+ sha512 = "746d3576912f8820fac11335efa1289011aed4681d2725d9f0d1c48001e06d01bdf704503bc5632061786e9360a00c85deabf905dd1a9e48c2fc8ecfbe32d6bd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pa-IN/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "f3cfeb091d875fa35f2b76d5fd33c4766fc3d37dd4041b23e400e223d6be4e791a797cf95f534b935e6f40c28ba58b4394fed28c3beca7a097eb5616feb02924";
+ sha512 = "1fd8b03e844fa4bd010fab41a36769bd3ebe2d09d0b4272d626964e175afb6564b8cc05f7c7c2daf4451edc468276f0d9b69e45d37106895efed75a8284ac288";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pl/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "a0f5e040ce4614d82f5ff7fb5b6e16920299290840a961b8e71c5fcf9c9aad88092d519739b21bbd330d03aefeb25cb0c8ddb9d75792297b970ec741043c6ff5";
+ sha512 = "d48b30585b56ffa8174008dcd8f6c5f82269ca60990bbf5fb327392b4cb56df086f1a87e8027f6e523c36905bb99d9f136450abac6354b13580ebe6d9d13bef1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pt-BR/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "d9de5bd80a4658a4b7fbda8b22dcea6104a77034e62ac66ee4906c2f71f9048c9f8f3b85bce38a0a4c6f9d0243e23ad4ccd6db8ccadcd3a1d79a034554b5035c";
+ sha512 = "2ce189f455c839ad1bd701b6faed3dc408a74b463b7282ee09ed01f002b1aa105f158aa25e8b6dd8f26c90801af300961ad025ba4bdd9d1d588ba15cb7fff897";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pt-PT/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "ee24357ea59c9936f8bd4f2ccab32d73012b9bdc0f6416350a30a0c3a726a817eff5a275f689dce78c0256816f644b56e68ce8642632ff2394bb89719873962d";
+ sha512 = "be2bda3d0b6017b777b078a0c85c51a77b8400132d65276c65721092f9c3602be0b9c136d630665e063cffcc081246118235181e89e41dff4edeb218fc03954c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/rm/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "3fc05929e41b1da505831fd29ddc590b11c8cc68d656e6a29ceb36a8d4f1718d3e2c651bbe57dc6587d6cce08a71b2131e6310e3ea688f2950a5edf4dda5f14f";
+ sha512 = "0895b75497a40fdcc28663d3dae23913873d01ddc5b0c34192634b0704c7d81512a43306ef8ca25190f7b590cba8d753c59afed151a5761ff18ffca45b6623b8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ro/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "8d204165cb4a8b4861f2bdfdee197a621db698c767443ecfe25751345fb651be01d3d2d18de8cba10e684f203a6276ee71ed5b1b99a43d1df943a9b5147e2fd6";
+ sha512 = "dad44023860cd62bb141467ba6eee2624a5184c2a26cd42e3564055548bc074db34ca4aa4f6ed27df02ebd560deecf814e640174101043b1a65f2390b73ff0eb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ru/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "7b12852be30cba66d33b345fb8976d1edca871eac490d3c49f0ed89c48a772d48a4094dc1e52a32e103a3196f6bb12264b3fe46bf53a14ca0e5ed3eb49164d0c";
+ sha512 = "7e4a048f64646202b34b19731dd0923f41981b2f1384a7fd2fadda603159d724ba02e1a07d9718a8264a3975c9d778b7ea0c9ad89a8a57032b685489c2bb2b56";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/si/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "7079174fdf891f983d0415cb802470899af11e792e3abdc00f8503116a007cec1177fc71f96f8b0b8d15576d2046690824d152cf7b5577f5cfbe0aece16c36d3";
+ sha512 = "f52bb0f7241450beb5b4321554d8d974978ee86913af213246275a44fd2470fe8aa02b1e20cae770298da7381285bf263e3cecce7a59b3b5c4fdec59a03b752e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sk/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "820e8465d6b9bae28a572cf7ee3d2b8594fdb6fe54879151ab327f93a1313cb2019687ac335ecdb64c5047421832db50c05b01b0b52303a0cf71d4a320900557";
+ sha512 = "47b8df4d387f1155944b575cd99a5e3dffdfa241f230c9e76cdfffe0c37390713fa0c64b87f42740c87efbe52fde49f36680f549d953a2977f9db2fef0769980";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sl/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "d1e55e5cb55c1894a39ec3eb11657c1ffb491f165af8e645f28d2af6e3ae481a04177345a76e91b769a68fcb2a84dc425363c153820be564ad015eaf27ba77d8";
+ sha512 = "bec6e7592df7cdf1d44b4440a54ce3e7b968dfeccb055952efad14fbc0c40c098cd99b41448fe4d6257cb2f292be0bcc2e3345b851686ce15b5fd1e4be3e1396";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/son/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "1b46e24fab45edf3aa81535f282b73c8b7e5975b6f329f751a3f3300c7bb01fc77e08660eb01158473bc1c8ce2c1cb831da316d39ef4e89370b26d6fddd68fd3";
+ sha512 = "a26868c2dc5b489a6b6c4085d61d4ac194450f0a987751da1d43fcac4f0a77f4f2feb158730f129d630fc2d3ad09ac2dc7c21a98cfcd7ebfde4f7c1006cbc9cf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sq/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "3e6ac70fb3f1c7dd7617caf254abd3f4c725019d56d6ccb15a8dffb6d5e5046ade6e6b50be8cf8239208a4c4458063c435de63ba7e9c6de4b93ebf3d3b7a8ca5";
+ sha512 = "003c7056023bf71f3bdff0da37f8ae66cb8735598ad6ffe71758cab1dc51f9fbd6abbb82f94b2d783d5298354778690e118977b324f96b7ef4b77870226f6e6e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sr/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "fe2164cd54ec4ae280432e26310be2ff167a990a578ec1b6ddbdbdc14563c0e49f87dcd6358b745aaf6acb258b385dae97afb2a1fd6106e5dc269a0845740114";
+ sha512 = "1ed62850e036d808e121164a5ccdab32f2c8a25b14b06e6a57a869cb35912a9c64ab61a56820db913612317a3bc0ddc93e2d6a8b1e0b43278aca361742f16406";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sv-SE/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "c79e3ff3c3a2cecde79e2e5b24bb9806df816a4a1fc3d0f0aae67471e4b107bbdcf6686414fad8e3626799f12f8d818023f0b71bb393b1770eff38d6169d70c9";
+ sha512 = "2cd3d32932c1243bdf58f1ed138b23f9e954a393f43539e9c01fe4348eb67efc1879d803d1e566dda3317b87c1ed9647c542c45b6c31c9c795fe696cbbc22292";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ta/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "8266408b1f4e0fc2b96c0cde463619675f7038824c3ebb2c97186e79736431b77b35e0ae62fe09064fe631f07b77eb19becf6e435d4fbc096f41020bec291384";
+ sha512 = "b3e81e97920ca93902e7478ca749f9138b2d8974cb7e7d2496ad29ee82c40cd1d7c2230861d02689ab4ade9525823e52c7c736457cf1c3279dd1ee6ff3876f14";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/te/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "110dcbd4c13f9d917f78094914a25c8f7d80d44aee9553421130dc526c0d6c29bbead1e5fb2f778d955bf65436d983fea429de6f73b9328066541841f7475e02";
+ sha512 = "39779c6af211b751095ffc93c8ddf6402d545ae139ee6f5a492ed8c3b765cdf9ee626045cf189dc908f4599bb3054cbc26e70e24fd66fdc7d44b3e8631f93e7a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/th/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "1533d96c6f0e23f38c113515e7fff3caf99915035050cddab0ca021b176d7184b80e9bd5ac79d809a0d31b3be987f9e31367874b4c35adbcf62a2ce685d41338";
+ sha512 = "049c3602b06b9fc825e91ab51a7a8e1e8119e88cad178fbe137cbdbc0ca6bace8a3192970172e757bd10e608a030b5f5dda78564fb2269f2468661d95dc8daa1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/tr/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "da6ce35769007f140b9732d7d429def5267f733d8674a7a80b11aa89aaa7514743a61d1f22210bb7368416f570d7f0748609b31ac72ab80ffe0ef7fea3397bb3";
+ sha512 = "7c4bbdc7edf0d7ab81f3ba959e7ccf9d9df5e6f2f5068e23bd4dd9326aef3124bc95c2f70374853a2ea3816a6d94d6c30db44d81e2647ae5bab8a84bd24e9474";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/uk/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "df03b9d2bc39c4d620d1886dc1d22eb70289fe8d6fd7ef429beb8170a95b5fb1fa15526b9b68bf774a3f09170d0573f642173a6302f8dc9acc41bd9f2604773b";
+ sha512 = "67aff8c6cd90d9da7a3ccc84e17f064e57167c7fb253f919a1a64403e6f8e67c6ca1a578a9266f9ecb5b70c6cee22f413df935dd34d2ec349f364a69d843d9b2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ur/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "a0914042713f9fb91e52e35eafe4b6a666b670e951b4e6c3ed3945804a5640d06c5634eda943927a84ba274871242a4495b754280e4c601fd69c9e054f1b8175";
+ sha512 = "7c2248656469859d2dbf880c94b4bafc62e62a8c84cee589b5837300074ac6cdf95798f4b9d810178abcdb1005d47df6681ed3a414b0b3ba0a3ce90c9ddc53fe";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/uz/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "22eb91f33b22b43a81cb0039aa2f11bccf6d83433897d0607d5a52c127366a3b75c18d1df2ab985090a724b278bc703e80370b8ac765bd891981620b0ae36a4c";
+ sha512 = "f2e22d21d78cc09fe834b2e3ecfe33a648340ccf26c76bda307a1842e87d9fbee91fa86a6dab763a477602559fd777078e507445542099885b9aa9859fe56d8d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/vi/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "e6801f622d134be7811212ee8ed47bec259eea1463baeac098ec59e5687cd2ebe42d77d42fa0b18f4a054c7a392efcb6121ddba000323998901f46ace3a7fe4a";
+ sha512 = "e8d45d60913daba14bfd527a6e59fe3b2c028c47425f89928a4933443e3ec608ae744db50326814cbe716a35e632cbaef8573ec523d41fa63cc1133d12227b96";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/xh/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "0c0ec3f3112ba5cb7a8df9c9c69714dfc585539b4a13632bba94c8e58b7e5a44a25ec4206c7d656fb31c883454a337e5c3cf24ba67d758fbe9841207c4b84249";
+ sha512 = "c2a32a8dda48dd2e4e01ee23231788188050550c44812460084eb7dd09d042e3af0ae11aa6bacb671046be1effab018fa0a4d601e583910c4d8c5e269963e763";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/zh-CN/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "789602749a56379b7edba5bf5ea9acd1d950782408f07f0ecf505575ef5cc94f580a601d26c4225c40d49eced4d844fe4213be2df52c83db7788b4a42fc10952";
+ sha512 = "45e996b79bbc96515b8d2e767a92f25d5814fd035185e34ab1b32d1f319b908663f6334a1d95a0f34550b9416d283d152feecb47f4ee50b40560cde226dbeb3f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/zh-TW/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "44b7d87e066ffd2cb83c33dda0ea3edb18cb0439c3ffb45d78fc07109e370b6b8cb7e95379423162928e9f81d5be773377716af774f8b3378d9214049bc73917";
+ sha512 = "ced9591c578ea8b335b01bf3aee458ae9254e1c744f699789fa54eeea2d8918dba4431ac65369f86e114f2be597395bb34e466fdf5fd291b688a00d99745a41c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ach/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "586c8cb8baaea42e694dd5f9886df52c4a34ec8224863127bd3b87bbe2594420b90a644c7b414b85db98714eaaecae88d8b91fe78351cf0e113dcef89d3e0087";
+ sha512 = "b560c780dbd0776f4833b037f81028ec349681682b6e575229e7149331026356411bc13ee743c0037fd38c15bf86da39756528c432cbdb036487e91ba9eb714a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/af/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "5d66112bd0b361b7a064efc184bf51d498a61a58ac97ff4a6d542b7c6be6f1802ec7da9cf89fc554f8d3e8ecea28d3d1c694cf47b628a15ddce6bb24589be525";
+ sha512 = "f967733b7fc05009d65387e7bb185f64ad33e8adb659475f4f995f4df686ca47145ee841390834c162c604b27185ecaa225c9ccbb011dfd007355f495403d892";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/an/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "3726fa3ebc4d21b02a7165d12b0ef8fe2c3ab5b204fdcf6e8b71994ff48897631dfd220708da0365cb875de8b6e20ea0db416654d0de471989f8cc57f427e64a";
+ sha512 = "06f27ac999ade5ccbe214052590aead3c7fb07e93348b10632c044c0efa4bffc1524e72c2e96c4d2ab1adcc112900f15f36f1cfd943b52718be6c78ee718c1a3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ar/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "ba99e30e7cd10dad54df7331087a2667d8ee1397c1b184f7deee3ed15f7c6d6b111592e74be320808bf67846d1cb7278270a47cdaf9db1d0fd671387371a203c";
+ sha512 = "13a99f40d7062438671c1f1700be98b88b2a612aa88ff546e9c20031e5e3c8d2ed78b801468c63312d82cf91bcafefe48995c57bb2a90c113282b843e0c5c93c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/as/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "db6035cc1b2a6c04ae79e4179dc5f1a64a910a0c8646e8cb93af63460b5d8bb5a07369b93dd4c703d09a39693a07c3bfb913e4ba6d45aaf3e125c407b38f6d6b";
+ sha512 = "15427ab80ea609ef48113ae08ffc3e7f43fa375c84d6028b361a38a128a14ace80a974058d1b748f31c308ecdbf08ca9bc3e509db7a1e10ba60421247af26932";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ast/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "42496b6755ef735527419453fab12497a8d6762d176faa8b0af7338c2e62cba2f2560ba0f7a22d6eaf10badeb2caeb6367773b19d2717c1bdad64149d74d0f98";
+ sha512 = "91a31afcf25deb27bb9ea29c1a859c2b6057f3421ba5cbb971e35b79e76856b5ff76486dc449485fccac13258f004d967886caba10c8531ceaa9b9f867cd0c1d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/az/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "c16fe3c909a0793cd91f320f94fe309e1f0b559cc84fb01ece5bfe455a1854701b259821f79fa6db8cdb6dd630a477e55e51793947661e0b3fb8aa26f3c4e22b";
+ sha512 = "527f8f14114648dee8079a066bf5baf07d977ace0f6e7d514f0a494aacc7cb91fa0456f45e43ae167537af5f038ed72e44b5b985fc3ddc01a7f61871074033cc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/be/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "5bc3b984ad38f105a922d1c614e1783d32a84956848f51797d4f1b3b5b9daafeff0730d103bb27313840b07ee97be73c30d6674a527f57ea7d95542742a06a00";
+ sha512 = "791e69665bbe33ce84be02caf6f3b304a2012affe6508426cc4daf944c6616e613062265341a3e78b75a88c4a9d70ea5cdfd829d082189564a8905eb6007e86d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bg/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "50f64269f264fe1c31970b43d6a0a8860a563154b8913b9a6d186398a6e6d80baf37bc0f091a6ff49115d44d01fca550cf1d65c16dc77d6498a236595be2779e";
+ sha512 = "8121500520000276549b13b1179e817a7adccedfefce8727ad3cd45f3257dc404d5a72208b8393fca56ba2d00d3bd19e569ace9b14abc09faf971211c4ce586a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bn-BD/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "be9cf4bfba0a65d491a586a1ea2ed6a2dd1946bfa715401763b3067c3388b02a86a1d53a7295ea6ed6b47cabdfa342d0f0ac6598e62f396baff74db5858f0c8f";
+ sha512 = "f72b870b007c5b25344f384bebb58a4034895d5d7a3f662a8262660f6d8bd4238bf6bbb9620264895fac6991c7d004375c83d37f5595104eda48c4f2df32924a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bn-IN/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "f448f52a639102c82396633f62741861cb2a3a0434a0e7185c8ed6e70b24153e606a5ed22ff003ea7ac2aaf6996135e7094e5d0226bbb8f143f0f3871daf5ad1";
+ sha512 = "912cce6d5407107b0c99f44229746207ac901c4a533f887e41214ff46aa41f3618c7acbfb38368c67846bf6be80b9714ffb4dd27d1251e19e538abeb21861956";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/br/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "f52471ee4b82c820813accebfd6563494d41ce7949449ecfbb86da45c0a4f36c0894b830ac33f96894b02e6785cb8389a965d638f75cdd04018730cbae41c7d2";
+ sha512 = "fd344d214b13dcf70f32438ddf2d4ccc9edd58112ff4cea199300f2d59ebcd6ca3a556f88c5dde4bba9af27cb570c985136fd2aba47ef6d9b8b2455a09a44c08";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bs/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "9df7d37a1cd531c43cdba491ac5fb844c20f335058858cda88bd9934bea097d9d170e18b3b29ef0fbe5ca2808469b75a4eab767b37ed2e29ac7cf2141ade8f38";
+ sha512 = "efb5d9f802448e7d16534a586225f1882d429822a595789ffb01ce92d047777ff541535fa094547a1b8724c61acd5a49ea31f9bd976c1f1d5f637ed08aee0665";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ca/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "43fb2e6b9945a4586070d433fe080cd2b9b8c0923c12ca084d6d21dc3e22164f470a3c791b5af181aedbe1d76e78cee3981c7fd1872f45815a8db267a9ccd74c";
+ sha512 = "c2c42d915ce9087bfa3748c4aa1e2a5481174a8a69b3c7fb675c6e5c528c3ed13b7d85a3aace049c75a434f47f35105cad724a94f0642291372e0dd82fdd4abc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cak/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "7a76be4291a5d3f6bf150f09701df4390d7f74c0046694a220f4511468a815404713062ad560f75d35643548065a2340bc70c439e23ae14272fbc20375f5901d";
+ sha512 = "8155b335afc8b377e9a4cc12507e0108e02624850211c46e1d9af13488325c06d14c67c12012d46bcb95d0d5f3642a1ddf93161fb6ab0e87ed8a56a82bcb1aa0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cs/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "d0a8c61960d2289b5402f718db28a6ff355fcdbcda77124949c420c3023b57595559305dc763165550f0453ae0e4a01cbbd3fc37e6af9540c80f857c8b4da00a";
+ sha512 = "cddf96afa80f6935f018b69bde2368f8d4aab03c2669df1df136419e6f9dd7de7c0662530a696f1ff164837225c41a92ea5224c2aadc21e45db8341544c9d78e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cy/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "85d9dd9fbaa72ff350d464015f2ca2e810a66d2917f19a7830ef50548ea3b5de1a4e818fcdacaaf9e5c7009cef391bfd3818e196d89483abc43a1badadcfd41b";
+ sha512 = "b8ccb59dd3723b71cecbb1a3b47083f718f39f3f2aa69d5819f99d58b8a9d42902df04712e7aeef34401721f693e2a30b68353df2cb7f07c0e462708beca176a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/da/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "f7a87024c27c0b7fcdaf5cee4c31235043c1c506003e04c71e60792dbc9a4cb3fdb972b335c3b6eb10fc9774b36dbb2f6b415ca90f4547c6979bf4568876075b";
+ sha512 = "7b2b6da809040f1d0a7b89134a8a9923ff0e43872e5c49a22866db5344e0021722ad38488f11df51ac19910509f854ed7e316f88cb6b03714668e7c580438271";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/de/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "b4f1fabe3de50583afcdc27a3599dfe9d2a08f2e8b1942aa0045df6059e9686d2f2f1fb3462c2e21d9e6fa1ef5a7849bffe2cbfe1d18bc70879a98ce8fad8718";
+ sha512 = "c4c90865c7703935675619831db10a1935cdd995a0dde10db022890fd31b02c20387157d080c7724bd1e67d639c434db9a5a53291fe0a3c97b07083b909b8714";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/dsb/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "0d85cd11ad6c28c87d6df4dd9f5f16dfc37f885b1686ff85ea051bddd6f5b2db43db0a6b2f71998eed707533416b6af5e4dba209b43586a76e74c03ba26cecdf";
+ sha512 = "30d3720e3ed73c312e3d0cabe41bc95df6769a1b61bb9eefe8da358bff5fb2906ad7199f989242a2a8ad84cbc30b3ea8b4dcc8cea125142f1588f50ceb9551ca";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/el/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "014ff2a89bd240bd32399732647b4c0cbb47ddb9e5a7705be56eee3df8c8b2c95339be61ed35893c4a4fe03afbff3e48c9e03d44f0cedd5c3694ead76d4ddd19";
+ sha512 = "4fc63a75904ddad55379c7f6c7d6fef3f882e706c4a6d0cf27e990de5ff0fcb5b852fef3777f524e633040137736cfb1548f87f517e52419089c380801183126";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-GB/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "e8746eac5d253cb2e5968b0d2da6b596a3b14baa967622528d03db684f9b507cbcde59fc0ed6ceb64d4eaf5e1767abf1fd8e8b651bfbec1beb9b7a5019c8ae4a";
+ sha512 = "52f0251533b86b39f8ac166de96995e94ed1797effbd74cc487cf8fd42191fb98d04ec099ff850f053b9cd4e4c5188cb64673fb116db1bf18f43dcdfc102f102";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-US/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "ad0b071d92c3a882f81b7ac3e295e4234b9912bdca1ab70cae0d79f17b3f5fe04d30c70e91f5639b8c8e0f6759988f0f7bca3a0d4771ba3b60c63b08bbc71c8b";
+ sha512 = "6356befb14fb2a1d244df872912fe339ea0b2dc5148236a71a30b3f4120910fef56abae24e35eb871264db93abf1ea045342881f29e8098902935f7751351754";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-ZA/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "4434b81ad8cba0b9c380a73feef18eeb1f1c043842b24a13dbe1059285dd0d4c6168f358a38a31a143e2b0f7c2d19bea08734d02a5f7deecd2a185226ae6d694";
+ sha512 = "5522edbd771cf7233e8c805d45610acdc9832a4d76a4c5951f8dc5565810ab8805810e2543a66ca36f454e068411e573f73de3fe21e34e6b32a3349de869c9cf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/eo/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "1f3ab8f6e3969cb9aafb4fc8ec1e8af9d2f883e4013851d822bce47153a1d06fd689e0e2230ebb0fb3eea81f140f4cf984a4b5286325a576bbf5668d5c247346";
+ sha512 = "34a18384fafcd017594b94e8970da2d3521c8d90f3afaab0431a9a0d275630dd64adb892a8609a518217f097a3749ad65db646428cf28bcff5c9d6a03bdbd2a4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-AR/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "b609c22e7cab67feb44be92f8ea3cdc86a512ee96c56c82273013a02c795bcd8da4ef40f586c94133118ef5ccc7968f21a27cbfef499bcd61be069e55c6f9567";
+ sha512 = "b518c72b63ebea3d30575548e8ce6f15961d0891918d8e83996bee2fb9dcfd01fff9be4340b67733b356f2b77c0308727b2911317832099561b3e2ad050296dd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-CL/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "b6bdd2abeff665239e8f246940ee65bfcb54f1831d34aee5264b3e7714ad6819a5dbe9e3107d169cbf8f2532bef1d68bc40d185c281977efd8a3f8d918b06388";
+ sha512 = "b1beef1b4049c8b1c828ab1e201161edec47e3e83da40173be576a17d8f269edbc538882f7d5049401cbfeba409c5e668c1781e2a519b88038480993222f01c0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-ES/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "672afad688d5a03a1aba52d9ca29073dd2e7636ad049f98552978cc98285b5794b5ab854c78d169a14825455933413e5dea5d4779f5ef24447c1a414361fba37";
+ sha512 = "e2c4f71b6a8bf6d33dc76217de9215d21f5f1d1712fa981ec8ca8c203895c7ba94190b7be51f89c9fba03148052727cf76449c6130e33ca2d4965ecb5e4194e1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-MX/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "d10de0d07161e4cca3a7ca42fa7ec3941062db191f2d80325770f55ebc080be2c8ff9b3b8b52c47cd8422f6811696fd6dcad51cf1c2c4fd6c976bd197dd39251";
+ sha512 = "136d8600eb4635213d58f7ceb0550d821e937275e849e3f1b7dcc7e7aa4b4d8ad497947187f6ff5979ac5bdd2b677c20a2a3eac7029081436f1c6707010055da";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/et/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "c3ea53b3422a9cf101eb737d2cb511270fa4b0370453dee86c74f6cf9f36f6d7a2c4f36b85b760ddd089bf655f540f8d12a1d59c259e8beb26b69ab345569785";
+ sha512 = "8d130eee3db7e528bb6d82870f29fafedf28ef474ddb4a263c41f914997a5e607e048ebe438fd16f687e824ea6917b495563034d4459e1e53c08e613948906c4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/eu/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "1221a19d5fb265cc86fbe3a1f03d99d0d5a5088432d89624ce7c00f26dcaca5571f8b136be8fa65f4c829e6b5a371d22d49dc7bfd0c31f3c168a4abd7d49e8ba";
+ sha512 = "bb484ab3c756bf1c5e591405fa22232f5e0b32cbaf0c0192edd3ff75e80a9f7773edc506c601f8b11593811c14636abff7a50a1cbc0944b664158543b8171052";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fa/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "575757d295a420921db0528a8833cc69a7aafb13e4a51c63804b8c76517497f63e84aeb4972bdae0e7139233be50613c26179b6d7cd066beaec2d8ecdf429d95";
+ sha512 = "618668015e76163856467b2603000fed75505bd9e76d1557dd290b7a92da467280ab9ad30fde78f004ab60f883f783faac6293196ed9fd409f9b854e0ddee577";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ff/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "a729c190bb3579ef4fca48c837c886f152bfcb550c29fe01a65f6f1186b7e80b71dde3a4f45ab80f282b04868cbc1291e1949a908b7075752fe0af7409c3fdfd";
+ sha512 = "1445d4f5750b9100c5340c354c9b6c67dd2be5b73500c70def5c1522d0825ff808da868b39a60ec509684e77bcabbdf0816666f14b2dab7d5f48c4b6282ec1c9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fi/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "ac7a6844df3a0183d9516e3f526d6e8729b831f241926add256eb790be4d05ab58c62726940eece24b0be6dde8530c62280c744b00117312e937bc024b16d197";
+ sha512 = "388da3ca86d5c9ba4adbd3ec90834941e2148c57138e6973628caaaa32d44ac8d18f8f2fc584dc43f0302c4c3568d2b6cadb94db40ab0ff24020e4fc3cb4cc7e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fr/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "f46400d33f72dc888ce686e270c981b0fb11b68207d89297288010df325a71b29f48200c34322a5d9ff493d9540aadcf5f30282fc1da0dff75cc63548534378e";
+ sha512 = "62423703ead40cc91179eccd15f9b4ffef8072ce4f236d3a1685ce666426f8a0bc670da82f360dc8c2dfef4b927ccd408a4466b7382999604abaea11626f9149";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fy-NL/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "17e6da89a57a34e4609acbffdda18679fb446c3d931bf5277e10099f3ceaade22bd9db41e9d38da6db09d9150888544c6619a818a50737b429a6f03def94479b";
+ sha512 = "162d7d4ac4baed3c16b119ddc5f3b0d71dcbe7e26a3977ea375776a033a9995be45a2069bd50e8bc378168731c983f36bb8b6b7f5551a1e10bcc1b9b3d471b2e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ga-IE/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "5671564000d63a401e40db275a9ac2f131c9a0811b0165cf1f1d3769324eb481b2de95a29f4b3cb8935ba9808ece9bae4e7760c14764c8521cba1517bfa69626";
+ sha512 = "3fa114a52582387ba51b04729c1c4895b29c33dc743cb9e4593750389cd9d943f96cd127fd2b49448fed527bb1bb36ddf4579ef78502f66925627277f02e46df";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gd/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "f7c280869b2468c173f0c45a92301c16252365e5cd1fac0b3ec7a3e779325f0cb6a31bb89761e37b697dc5f1a5dcd8160d935769a683dc656f89ffc29995e782";
+ sha512 = "62d16ba8dbb06fa54e1f4d6a383959740a466bfcceddeddb19dec45ace022ed272913d4096b43050bfef3a53c43329499794d5abfa9a6e911fd35a0f8df31cf7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gl/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "75e161834e33a4d9e761f85b2cf1de2da88113503c1235d26a2db0a0ebd815ec12e6d5673aeffb368dc6f75877c52d67e59f27ee44e9eddea8f7efa17b4b040a";
+ sha512 = "02fbb3eb9f13a8f340f5fc5c340de563041bfbcd77bc1f7f701b5b5eab6463bce6f3110e962e4c1a0667f3dbadc234511c3ad35718e3d84ea30952a178f56e7f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gn/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "5aeffab6468ba08c15d74cbbda355a8c51132d8f09f5d603e61c6caa04f1c57a3cd659463454d967a8fd68a17bda9185a0d281368381bed772d1b7e8c5722fad";
+ sha512 = "10f64025be270572da5d3e35672b2656f902e896bb3cc7fe24e99b514c4647727308609c9e572f89f836fda677ef00b6a3be4ea4844d966437d53124605144b3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gu-IN/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "89d204f7b931897a9a782eaf99b5cda7a049d35f7e4f3336b3f941d6234ae3984130c59a352052878a72602d6fd21e9725ec51fc2bf990ab395bfccc1ce202cb";
+ sha512 = "8f3db73e145bb4ddc0606bc8adbd228dec27b20c6bb5227897ece926df2759209966c61a2b67d4e6618fc205616c187dfd9e26e63e09ca761b2c9da3d53c113a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/he/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "7e3bfa2d8fc1ab1640bd2310c596451afc25ebdbf5b0827e218afcc7144b126220bd4cc94c8c769c20b6f00c6ab338adf4602dc271a3480caa1db69b28e41409";
+ sha512 = "f497c48ed108134f02d977eb7f0f9577eddaebacf3f1d177f95b1e481872b94ce9f6f7c5914d6fc1c0464fe999670dbd3a2935ff76d139b49d529b87adbce5eb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hi-IN/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "803312f7e912059d05c88a1a6f448fdeede2aee53532fd67d685ad64c4961dd125c81ca9792a2ee781269221da738fdd7c76119a3b9d4ce6b9a5cf579af90388";
+ sha512 = "5a827468b04dcc308384e95017980d87249082e894998c77662b4d455bad5e8f91134e9c88ef159f89af974029302249a898ec932e01b4bd4d62c0b79b31718f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hr/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "bd4c68ee7fd5d7ae80907111f184825b94b1f12d02019cdf1511ec76ea98098b1935953b5c5759f28538f110a71cc7804b2161d29b8b3835a481f6f025b70448";
+ sha512 = "f1bae26c1699036a832a021f0336ecfb8b61a378cf62ed6c8cf10c3a65e6546703474924b5f7145f30c2e9a458545ab6bcb999320a04bbbb65022731a23881b6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hsb/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "6d9d67e98cb39884b54e068b471d5e16e38897105ed890f14d322568a910fa29c5a3a927a31215133a8635e47800f8863afcfb7d88243b8cf9414b450c70f44e";
+ sha512 = "3df882e3542af5a1a82e344cde5f55f852f863ec652eb66f49e6f6145cf2eab3ea3b7f5a2170e4ad87a5dea0264f5002eb8d74e4e6e1662e3aece695ec6e405a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hu/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "2f07c74f085e7490ba851448db019d7e0d5deef9a74e53c7e0e3bc13d4be5ba341032b9c63d5f2a7f631883858046d84eae5612166e966c330bd14777015a6ff";
+ sha512 = "235ad09d75274a5299226a99911596b16b6b3facc19a896865dfda2467d2352446187a1ae6b64259ad41089203313b76d8486c869aced85bf8aeab692b860879";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hy-AM/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "91440eb5832be50208473b6474c0f13d794cc24a37b2f9a160b2f173fadba946b934fe0c0867b7e3bab605da6011f32fe834825f2ef229e0a20813f58097ef7f";
+ sha512 = "b038b36b0cc8d0be3bb02b6851e9246bb849ba835cdc160c48c53df9ea5e937e0ed57c1d5e6200b11cf7c751b2f0e5cb69543d2e781852a9ae7e612a88a78b5e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/id/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2";
+ locale = "ia";
+ arch = "linux-i686";
+ sha512 = "12184beb0c93718200e11f17ec53f71062c443881482a2406d558f4c76652e81b2c3c3b9b5750a03a06fc1460a31f0146062e94e6a13736d7654649726c2914a";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "b0a2504f562b902bf0ff11363c44bc6fece5c327d0acf9eb8f0b17d5750846df1ad1414c17387a39bae5f1ac33de9198b05c55b0f2a97590a29e6b9c243ff20b";
+ sha512 = "0237960a4cfe37ac6c88b9df34396c19287c9d8fab62ab6668fd5aac1e2277d9c1a8e468379cd8929a5ccdb5e86828ccc0fc4a33e306203989764745256564eb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/is/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "e3518d927758c3e6c0bf73026b3896ec44cd5bb0abc3e0a8e280e458c66b70a32b15d53a27b97671335fa3a00cc7a88032f11458962e48cb1e984aec6c22dea5";
+ sha512 = "01acb4ca4726ae3ac8daa21aa0acf33fee71777f5dfdf496608afd8bd33dabb3c84bda1fd9c13230bb7b8c956db2409821f89d4122d9fbb29d8678cd8f9607d5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/it/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "617dacd7122d8920c9b51974136b7834c079adf0486e9476f4e203805621864c47138a6bb79f05496f075071d37e45baf6279815e17a3640a805e80b7489b61a";
+ sha512 = "b2384c56a236420ba479a8a3e24ffed3b4596e8af8e46b868e718412a05317faa6bc7e0c39410931b31cf464f24300aed3e23c66a7cc3871ed88dbdc31c07aa6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ja/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "a0e21fe3a2eb933ebbf379294eebcf3c9f59f5331d4ad7959f5a1241aa4c0a90aa018c901d715274b12b2bde9533571ff164bdf71f081024dc0810e838f73fc0";
+ sha512 = "d6b9e43c73bc9c38e93211abaab22e4f04bb68f31eb8351fdaab6c45bd7b70fa56bdcf3bb87901a569ea9917b59d7054bfeff1776373099268689238136dbadf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ka/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "1f33af1629bd806aea449d429d7348362dcce82a5a02ed4930375e9701c700eebfe5773ef492fd303f68d86dd3ce47cd7c3f73e1a5bbf3d82bda1095e696cb55";
+ sha512 = "d5e303c5182e218e3e9173483e32160e78c9a1ec812142fcaca35f970a043a08d6ecd8e0a4de1ce06fe58569be456d2e44ec5a3ef234d5ebe4fb9c8521d4748c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kab/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "84f8b464d56f70ece330d6cb5dcc9d7c65b201b4365bc030c02c4b9892ba8641e8686e0f0419da40d620397842c4dcf0de58e9cc6776108e99e9659fe0997a75";
+ sha512 = "2b32e8f2257a4fa7576bafa69ac00b149d30e1114a0a174848deaf4cadbbd6b7073029515ae1b1e5a905bbd2dc53346507e8fb8dbceb625901bb9dc44da3ea85";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kk/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "83774a6b52db454e9a8b18b1ca7199f52ff215e5e35fe7cf0d86de6ae61af3846eb25510fdc7dbe670fc227688ee97b1ac6f25fb6860575431500a0b02eeb4ae";
+ sha512 = "53a081d779acd8d10e9591c929c5bcdf6122d5a9f53a9b496556d4a4a7efcfad783ace2a99af5cc11ac295b16e1a055658b1b2cabb8385da2a99494f41280b91";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/km/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "6d64e1ad6f6ae88c4d32b6ce96c7f72c03cdb1d13fd25c819e8aabfed07b16bc1ea308f991c8671b6812ae2f91114ca14ef8049bf0a95dfa4b79d11a38bc8afa";
+ sha512 = "473130d04c3e559159c9801d55961fe261b8f45c593e7b869c31eea4c96f4cfc517a35c2f505c8a45bbc62405bc04d9b1d941614f6d9b3dff6eb8a05d50ed934";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kn/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "46bc7f686d971754d1ca3040fafa5573c1b4c6df63d91511beed6848b15717e4820b1a1ef842ef5704dac42e51cd6102102f0566807a2b1ed86f8fc5d8e1cf2e";
+ sha512 = "4f0661375fd0bdf67356c9b742095878e2288324b23da18c0f9c105c6c0f7d0bd8d4920423f4415ba9b164417936ed8def36fa945538599ca6544abafdade820";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ko/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "1eecec7d2ba6c2052f26177082384a48505ea2b88fbc5a3880166b11ca061ce77f9e08055776b9904d1d677ce072a87bd9f703dda51667f3fb50b62b42d6bc03";
+ sha512 = "cd861dcc4e17ea389a42deb66feada2e614e91eaa8f2911de2c7e7fd66257759f937fcd96b2eb976ca7c605d7ad37cc3648bf67ec944fd93407ab9918553a6bc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lij/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "20a4f1a52da9e853a40049d7fbed2435ddd48f748a453ae94c9ea14bfae3082aebf032c8f573104eb07317db4ebb970992db667010d0d8e0af6eef995c6481ad";
+ sha512 = "f1c0a5ecd076df26dc635bf0e6f6f43e4c00135f914b9393462efc6d969dd6ccb662df1c8745478952896950dbd216cb4dc88e0a1fdf4608a926702eefb4d835";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lt/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "b427ef0a9af8c10b52d4ad55da69d314a55da4de8c68572c57a0983f3e8d566f1604f28c06267736e1d3921cf81912a8829bceddd0cf72b60c08cbb49a190c6f";
+ sha512 = "2856270b337da7de6be743e3ec3bd2badafc14920a46d11e2b260daede010588c9634c2badb7b402b0247fb770f8b0c869119a1be8719487689ff48783c35753";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lv/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "ff70e130c43b3a5e6b378aa4c048e5b92488a75b8c22a4df4a08ff1a100d63f02dd1bcfa5d4713dec79f65bbac31d3078f786143497c6b0a3d49b545ff43613a";
+ sha512 = "95d8a14c884976c31be1230cc1f08706b8f1032d6727b0a88eddc8d9a2b1941da783d9113dba9963f5a3615d515a7906906779f8dd0d445220ee6aa633c2f6c7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mai/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "cfb436e43c1eaa7c5d7b0e4102b79a4e68833591a3c3b09df084533c0ac445bc6ad9a7f4e6f3e3fd0c4ef10c5c177ed7149c992742aa3512c0761a15a64e808c";
+ sha512 = "c8f5706cb28419c2ed311b37dd4391898e5ea55cc70c3da9018eeb104be696d80e9eb6e22467601e44b3b11d48695479a9448b97b06a37b63d042f22056255f1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mk/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "59c02906c3ae7f810d53b04d8eb1ff6255d62dc3062d5938453a37d50bd35565215e6df9cd13eedd552d9121c415ea94f6a7b507c50b510433c41b6451f1f61d";
+ sha512 = "db68dedeed06365f5378c91241ba21474fa490234ee2f0e8ce8d5439879bc7e79a6b8a81ba4883c5b6f9eeaa86c8fafb4079681eda5c7c1de13bdb7a6587967e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ml/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "84c005fa8b3310ee98ec57e882205a465349481bf4cdd3d2daaecc7104ed82882d93df133f6945a2bab2e0b03ef444435438670674d426f7902ef55ead3ad4d8";
+ sha512 = "d450c55f00b33546a37cc96b2daad0ff9d9bd74a4c8219fe2e584e683a813e328059851bad48f597c60c0e5afbd15ff5f2547249e9318ed1a4198f8db43ef653";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mr/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "0bd928955589fe29d3801cd4995d9b20c816262549f96e894d06aea026dfcb621aea12abd161af991ee533491408660e38dd8c95af2cb91f24ae1cd6de949c07";
+ sha512 = "3da1c044fd4abad499d44fb4e30942f6e92f0bf5b0bc98badf4cd7a4b63a62bf7a6752483964112bbc9fad91ec87ed40cc64fa5cf9c14edebcce22d78600e352";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ms/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "b9486a558d50b1afd2f7b2dce4a932f233635c2c15c08ca39ca80e83b1319ee1db59aeba679cedee109e4bebe8082017aa7c61ab79bb39238e3c231435a24399";
+ sha512 = "69090fa168e4acfd16bbf9c0569b2d537570cb798b8d2bc5da26911c1030063ba0f1366b6453810c31038edac5fd6fbd988efec27e923d08ac61a2e2f654be4b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/my/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "d3caac45f5923c01c5c2f7515f2d813351fc8941b8ab11e856b69353f7147bc8c8b06c535642b8c04945c50f923533ac06f87fe3b3a5a818024cd42c08b71a03";
+ sha512 = "86bdce82f04c68e32e581d32ea1dda301e68f39a93d762d4e40a85def20490d54cb62ac4baaa4770236b098bcada9d9767f5a6bde263968919eeb2063e5a6fa5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nb-NO/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "56dd91a54b47451bebbd2fdddd5550ee2f8d4339bf46a38d16598e68d54bb853bcc03bd5db946fb800d501c1aa4630f8ed35cd0d8789ce260c78dac0823d7308";
+ sha512 = "e3089af377c2f5faf97934e40e6abd782b4b518abf1bd6dbc9655dac192523051f11b1e7a016465c76005d42cf5382c21ee02ee65b80cffb00384e0b9f0889e6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ne-NP/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "93667ea20de391de78cb8d2a0e06c9015998d00fd4a9fd112912ba93855cae49ce0456fb562bba8b2a32875d4e891ed5e5253517d05ef2b8e6a48bb884f55dc2";
+ sha512 = "fa001a1a31036a26dfb3914a24cb882ca3d5065f0687e0bbb4e33814dfa16f5f8f5d9cc44d24e664be7e87a7ef9fe21d2111859150bedc6f30d59e3badf9ad43";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nl/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "9255942bc49f5fd871b4d1c701175a4b74cf555ebba1b89bc8d5d78b9d1db9fc5409c162c2434b78f3094062eb204765a55f235695e6a8c2dfefd70c14cf9fc9";
+ sha512 = "629a28f9a05c758e1d748206cbd81db22fea7f847b16e42674717ec8ea33c035649d82a9418a691aa31507368fa2ab91590cae207439031703c1a8c8382d6a7d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nn-NO/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "1a72ee04194b5fd4c0799363eb55bba6f993ec51fd920f5a7fe68c06622aa8d92ab7e014275b66fe4406c1f44276d01b34c843c84d16e523632fe2697661a228";
+ sha512 = "5f5065f0bc2a515daf388f70d503743fdd2d55006b4bce58c9c85fdb06644c729eeff3a2ecea9b2a29be1a0f94147838287d9c7624e44df60014a1a99990a050";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/or/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2";
+ locale = "oc";
+ arch = "linux-i686";
+ sha512 = "0fcdcd5a965a8cbfdb1d0fab0419588b63b26216f65ca206052c0e36257d6b6d29a4c2639a0f8fe456ff8458e60766670a022c84f18426a60c3f230282206d55";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "8b0230279f6d2563e43a0fce11b86c302d852c8acf72a1d27e77d6480d63252518ff5b83ee94b7e5188f687f75bf8929118d01e42e4a7335c0fb5c721bc991af";
+ sha512 = "a86b3ed1e28aab56223b1a8ed7d184fb526b75fa27178eedf676909aae0931cbca7948870d50966b08ff7ff3c79efd037ffed31a74f89f25d302c2fbcf8d4952";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pa-IN/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "d7feaf16ea00a77ab91a9b1017f3589e6ddca518cfdf09634fd74142d0a4ce0a87c06ce373a7dd356236aaed6673b3d274bb59fad6113a10cb285abc663ef6a2";
+ sha512 = "8e844efc0fbaec678092e97594aa4afc57b40ed6f8b38685a680aebfa4344ea6813a2bf2a93452e9b24683713493c5dcfb8414ecd51f9e2c334b1a5aab7b447a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pl/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "4da447f1beb6eefab3af199090382a1305332802a9e466532a3237271540dc8d1d7b32795196c17a7b41e9884276beef294159db35ca52e3a289e171844838d5";
+ sha512 = "a74566955c633d173c9da3c0300e8e8e327fc6fbc063bca00b934a2ef8dc4fb75e993e9ef263f2aa4709ba90c33593e990cf2fdb0d6a9fb944145c31e7cbc667";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pt-BR/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "77bd9d6d893f9c89bbfd6feed241155ce1b6b2d6c3e31985e64fbecac7b254dcae3c4ec7418752d2dc0a9dd820b4358e77011087a61414f320bbf18e93d0ec74";
+ sha512 = "e7cb5bc617eeba0977a749d5cd16f0787d588e73e20effc0a755bbc85ad9d3d422fbf0114a290a959202b0238848f7f525de8f58fda0035755acaf405fe5fca2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pt-PT/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "29c6bb56aa2652aec25bc46f46aef5743ea6023106a109e50878528755e31ddcb6e641841729415453161c6c3ffea1a2888fddc046077a76aa723b393ae1c90f";
+ sha512 = "f97c705c1973122181052599a81f44710d0a1a9a7369384993b2636653fbeba2fa77a30e2f13e6dd359c6aab28d55a3a0551180b4934bee35ca79201b90d4f23";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/rm/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "0d28de9c90068bcf336959588e2f202fedc2e5ff47d08fc15b4baf127ea79162d89080ad933cc7e57c03270a5d86100073a403229ccefe590369df4b085eeda2";
+ sha512 = "c4a743e2ef548d26e0aca8392323c63d3a55861e5e9dd35f1b1c7fc4ff8b44aa54c5fb9261ea98b0a7ff4ca21edd3ff46e3b8791fda9927cacb9e75440092047";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ro/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "a31114b63d5570327302cad0c1e77d7e6ade42a65f53dda70434e3043d1d5188d96791572433d9fb2acbaa1ff5110c9c24cd022c1696867ff6c2999571568076";
+ sha512 = "9ee0dfddf90dd63dc1069f83ae2d70fa4ceede0ef535369aeebd2629f35b3c54bcdc05ad337910d5e860c39ddbdbd82d3d6c3ac979ee835b16cbb99705594328";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ru/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "ee8aaa73834322c22b239297738eb2ced76a1c2eb7431288ebfcf100966599eacac11ba7e00fa9211fad6c8e624a0f0988552ff1674ac0395ce96c755228cc1a";
+ sha512 = "6ecf4202844494e297bc6232d05e9da34dd11ac2a3a19d7014ea54ad27a2accedda42c31fad1144b22f9cc839109deb90bda9592b4081a5ca731f2a5aa5c0237";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/si/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "22bdfb93f5f153d5ec5556fb8c0e04183c892bffd616eac296d2f2b0bd8ff32bc04bd204e1e62a56a52c1fa00c9d8a309bccbc353179cf3ef1b8d74a4e0c7168";
+ sha512 = "e772139fc6618a7fad213c710582fc9bbc3d63ef364e83f92ff72e66d361e25ab2af750df7b8f53052ee9be8d5ce10cf9883c64f331a219dc3c4f4a633c53ca9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sk/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "3a3cf394d15b11dd95fc0e597fd327d391f06d7a0731b3b57f7a9bea1a05c39b6b65b8a1092f44edd16f08ad2ca8cbd63730650531d1697fdd3fc55a1dcb6c01";
+ sha512 = "169abcdcb9e67b1a1cdb97398a688f0f432c525480e1cb47f7bb85f0bd9cb5fd2c58d8511e1e5fb44e93ffda3917abb34b5babd9ba4cb3fba76cd962eb6da9c3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sl/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "cc27b4356c292b41756eba6debad5b4b18e24435d90c4d2b8afa622328ab96fcc0c854cca03d6ff6fd648d3322bf01a57f9a83fdf5966a7467575dfb1c227db9";
+ sha512 = "94ceddceb154f0fa0f70b7febf3a8741d7fbf85c2345220f9f3afc26622118ea23d4085aaaad6c1be92a01ef5e8c507d4035b70dda0363ea1e362666d3aaccbc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/son/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "7dd44cfdd59e0e1bb71aa3b2ae8243751bafad89e6639d13d0efe4a3ab99ef34d87ac27f249d768c457e6ddd01d574beaa8ba689a7b85e9c1ce841f2506c55f2";
+ sha512 = "4c59ab3169489e9411ad97b23116232ea9dc63337bb0ab31b36d5051f39c96fcce3c5e5e23e7ad65cceb93f21d2a194f46a2884e639104fba6bd0e2b89e74592";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sq/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "60d7b94a02b6eed876aa7d8cdad849bf384d0f62efaa0590d19907d18d9f42cab2b77b0ac93ba2eaa721d44237e1256fe092429f7c95de4c38c97e8e3d7cd2e3";
+ sha512 = "31c31241d1b93fc5b4e8a543b248b92e457e4c454c0a9f2c4a36080560600c331ac68baf2c56b0284547bd32082af6a7bcb5e217f2b0e82a696411a8a340b308";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sr/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "268fe1e88100cd55fe5ca1b3c2a028e436de0360e0c9e95ae2f77176e67f975f1609e97447eb98eefe82d188a804ffb04c05eae69ef9f6e405296f99794e5f33";
+ sha512 = "3358555e67ee43160065b0b0a74ac76b0108eef9e5545a00d891c376e1f75520a982534944fe4e0991da4af076aae3f389527b272309e3bc507692b2b01eb1a4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sv-SE/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "39c049e89a7e48f9f1d965d8fe43499856c3cd1ff5d86005d90d486b1cd04adddc5ef5246c71908ea38aae995456aae22124386b5a45d53e86e3e74380193bd8";
+ sha512 = "5a84e72b7e84774e56f13a7edfc32ee7718171616ebdb2d1f031965631b79e08e5a5a392bbcb7a13fea22b8aa87a51a3d21d0ba8c471e507d5cc4171de9508cb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ta/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "bc4fc2ea66fb0701d77ebc31c92d0a72775af52ed8ea7273a470783f972576349db571c861835d78fd201cb28d80fe4ccc5fc566af61502e74cc8e72cc1ac3a5";
+ sha512 = "ff1221835cbdd6da1697a9f915ead88e8b1f0afe2dc33e001079143424ae8d12dc048985a918133b26c17ba7422dcaa9db873af1bbcf1f4add68a3e07d86497e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/te/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "73090fb7df13733d6dee28cb6b9bf40aedf19ffa85149a5d0afb24732b9420f13b8d9860494f83a908c54db9d6e864eb73ca80cac549333f6e3a24b87c8f7337";
+ sha512 = "34be87c79fd43f8d1e3da76a7f037f7dca411cbfacd3b7a72420abee9dd2863a85ea38c53d58bdd124d2d3510fcab0328ef1195cc332990b22400b90a6061c05";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/th/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "d6f9e42773736a179ed85ab2767f74270d868adb749286c1221484296f269c5087074e40678bf3abd5b420de3487d934982e53f7d094b98b1faf84ae9b19b7ed";
+ sha512 = "78a0814b6bca4267d11be6a180836ef275c41c9b7e29e821ca3559835a5451b689c0a4a7c771d51726641d04e1fbc83a415eecf0b72b8b7ef1c41e0c92ea6dc3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/tr/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "f9714e0d2340ed9c76a67c733936485810cdf2e3b38c32e1958fabdefcca989102c175c77a34eab30fce1270076a81127ae14b68b8371aa86bc2be2051db4a0c";
+ sha512 = "1549118be4af02a05465267fe48720dea903e1199c33980dffea6a59bc90d31009c61b4414ea57f03a59e27182b8fa6e8e6c95eeb97a88426d3b6ff67bdea590";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/uk/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "784692df6d887e23480cc66730a2e487440d22812398415e412e2d8bdd1f1f9f0235a85be0f1dc55037d3c964996f57a1739f1ae54fc8857d211715a20a40c5d";
+ sha512 = "f8c1c8b9e97d4c09b70d047c2dc81b9f2b9342014b5e928f11d0705f83915597812d6ea71daf8e315e026f127b18f67161f116bb6139ff135181d25b0bd4ca66";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ur/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "103d50b878d74827f11c79005f008fb8291cfb8c062e136e2d965bc61200fb6c82998ef3bd9c186a7ce5ae1371e5f21ee6cc6d664fbd60f737b7d05a85abad2f";
+ sha512 = "afb767b85b674d3c592fb7f6175cceb14f917edd68d2f272b3560450f91dcae5a30c84d9869a08418a727ba6e010364752b52a22f3fe2f0a881ca01cb137306d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/uz/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "869230cc3f649a9ab78a2de7dd68cd6c0d416de0f27640c1b2bdd80c88acf71b653bb9ad51a8cc7a8c2be9bcd7cbf5ebe5574577ad00cdec542a85e19902ecfa";
+ sha512 = "b33fc09c365ea57136dd53cca5a5bc54a8a5675e37716519a419e0e24286863741660af72cbb73809ae2efa0cad9828d523fced2ffe7c25f7b99781bbf74c382";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/vi/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "f80a57dc3d505701ba4a79819988133a74913918ba96692ed6e6d4479672e28b5c4acb06b978be3e7494ff868737992b8a34223964b737a7346fecf2a93eec5d";
+ sha512 = "6a03c39d8736dde23d1d9558b7ba371840a95fd5f74948e63ed4f9b404ed478815950c196bb18788d2b883a68cc4760ce329e8b110e12c355655ca8f52c1ad22";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/xh/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "662b14f48738d32b88c14bab1730e73ab208e85317a4abe8215419642299020a491d22299196091b40af41e88fa4fdd6794385152d9eea49f2aa9d6cf800c8bf";
+ sha512 = "1b9b9907386e7efc27c28f602a4915e8b9863f5ef64748f44ea7418f7b48eec512e19e906353abbb92e4a360d8216ec93675aa890fcb9de469dc4d800b0e5a37";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/zh-CN/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "42562df31b9f69b0370c01f281f289bb7bde34f5c82e43d46cf22084dfd12ecfea7a340116ac16744d5f6af04bbb9eb48d31b610dde34def50860327b9caa9fa";
+ sha512 = "7d97a23fccd265da8403fa842458f4fd36c7316dd8720fb2d2a9a3a6ef1ca47eaa007a72348b8582d891ed2c27200ff40f62cd877dbd72ce213dbb10f64e533f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/zh-TW/firefox-58.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "71965696cd645d00cc0c2f212e89bc63e023f6c36c3182ed0169839550752559d8c1a04ad47c832e5113c321a54209e00ff598dae7cf5a46edb169176f3cd86d";
+ sha512 = "f027e228551efdbe2aebdc1244a4495b31fbe3c713adf4c8078d6cd65997e0701a1813f55208b13a9e51e6e80637c9e6d08571f38f1fa8111b42f6d463e819e6";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index edb19b1701a8..851c95fb1a27 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,955 +1,975 @@
{
- version = "57.0";
+ version = "59.0.1";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ach/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ach/firefox-59.0.1.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "dd75abc1ff917398dbb8dd6821f6cff4d925870fb4eb654f18329ceabefc537ae3c908abfdf2f2f836aacdef67ca251645bca2a14c7b39ddd7e57b9eda537503";
+ sha512 = "b982f2bd54312d66b7a1d6d6e775bad21eb1bce3bbe161cf980d03e55d4bfb5eaa217b05c16c72cd55165cdf7ee409c2e0a56143a82374f66c67609fed1464ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/af/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/af/firefox-59.0.1.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "eab1f1eb0e5931adc06525fbc68960b70b80fc070077c10c7eaf7fbe4be8d4db404aa74e35b83d5c1faac6a78782725cff8328d99f20d2a35f1527eb47c3bce7";
+ sha512 = "fbafd3dcfc473b7ebc0d6230cff487819c37b6f41135060cceca72e8704afa147edf71405c1367137bab6c8013fdd98ad487bd7039a291f64b0b37eb468d5b18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/an/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/an/firefox-59.0.1.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "384b37825ec8a55d91467a26ff9b14a1c707babb9ef5cd8ad0a73581dfe42ccce5915f3f0fa8e3afe41b870f858b4c27b3ad95a2bb34106b0412a7ee53d606bc";
+ sha512 = "b7cf1261c2e776874ecb7c709d82f288e74d16770acd3215fbdcf44f6167544e626c1f809e4d68dac7a040e0dacba0095d24c1994fe329e5613c7a561ad652f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ar/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ar/firefox-59.0.1.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "a6ded39d52ec035cb71b816c6c61b81236f808a95538e578faf1e61ce72fdf4869845e23094351da2d4d2bdb3e01814d864f257730742b807b92cab008a472d6";
+ sha512 = "16e308336b1ea37bc7aa18184e30eee4f1a073bc1dfe009c515a338f6412de6ad19ce96653cd58aa99d4ca34476e16693c03b01b7d5b1df3154ecab58fca157b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/as/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/as/firefox-59.0.1.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "a9e77c4dcb3672f917212baa11417cb5e947a561d4f3e5a2695640183c51b521dd8cae0d269c9cb7df1f608d2e82d620d2dc284c1fccd67fa857612b092c37ef";
+ sha512 = "a6de3e421126adf95a02911db3140791c5a5dc9030e63327fbafd5fa3f5d6d81f4d62fa705c84a573788840e921ea1ab71e52d08df443405a6c8b2e69773e76b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ast/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ast/firefox-59.0.1.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "07ea65e0c973248c4ed63525e24d09868c879f1eebe2530e8511767867e7954ce3bda16492835187013b134cc085a44d5de3205b1272aab65d16d77573274745";
+ sha512 = "2bd15deae2a01d09a622df87ce5329adb5d5da2e76dce678aaee202eec2a7ddd0ae79de205d3dabbcd189fbd3aa5293ee551c31bb3850b3cd7e5c02d73862548";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/az/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/az/firefox-59.0.1.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "2810713aef462af14be0729488bd05e2992f263940dc11bf544eace53b639f63267ba8468c50b0a00748e8498a64bfb3d42110debf92e0aa4968baea47617038";
+ sha512 = "ba021c1531fbcc1c7f4b44f798d0046c39b2578fb4fa8f81927f7a4bb3a3e8b3d7de545bb2d818cfe1c095cb4387477d05541b5e5021c56086a700e8cf928b64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/be/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/be/firefox-59.0.1.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "d8856fea5d7f52ce22ff6bf2af600695494f458214a5d2de254509fac7d4208b816583068fabfd5d2a1460bff9cecd13d1c0ba0880470b4975eca1f7a7a2eeae";
+ sha512 = "ba5ac2b182f9534825468829b62359f5c24a2cfcfc0e27ff47469b814f746240155ceb228bb7fdf1855e378048806b70106bc0a3999b0cc2d4f69b28f7565784";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/bg/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bg/firefox-59.0.1.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "caae904094224b1c0374a07c22240bf06629b81f475c71ad38835c12cd59de016d05690b1744d5e44384db4c1ca86ab8cca4be6101987c34cb5903d920813f72";
+ sha512 = "a1aff58b327ffa5dc62975e31e59306350bc8b4a2b38e5993aea4ca70fd4c0e295b7e25a8deafc9d354fc674d8c55ae917a110bfa832f54fd0067f4e2f35dd71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/bn-BD/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-BD/firefox-59.0.1.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "68004a769f2cb81d8f76b66ce713377a83445ca56aa6baf5adfc2617b85ed54cdcd4b410f415b27368c5437f3af5be882cfc701e10ad77938ab7dc2bd9ac87f4";
+ sha512 = "fe96f073482488f66f0b7a46852d763212e444c80cba0f495e275b4c73711374949d742bd8ca0c69cb9e662e71b13b28084c004b3530f702445796d7c1716f0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/bn-IN/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-IN/firefox-59.0.1.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "c1cecadd1ba310335cee4fd31a2754c469a8b70725e01e4b33359878cb104a700d6f8c64b8575d09faf843a635a7c26630cc9ed68daf1a9d93a5e075b25a8caa";
+ sha512 = "31d8f589ec72a8ff3315fec3bcf9894ff6590768f2c380313c38efa2106bbc71bd11d54b553eca568cee0a7768f0e57b3ef8038d14ae2615fa1160145b123cb0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/br/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/br/firefox-59.0.1.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "ba39b82ac0872a958d9fe4c9a20bd7e797c6f20ead48bdc379b56a1d227a6fd6d3f2bae9333a133da8bf86973e98af945431e98d8e18941164c0c6ee10923c84";
+ sha512 = "7ed8310521f981a4ff75037198a9bcde4fa07077c298c43f5baf532e84be017d604d27d59ae38c10d0c422a1cc793652c148e7c3944171044f4e9f267b64993b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/bs/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bs/firefox-59.0.1.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "99e891b6507cfe76700576211e5ca98bec8172c59733102fcc60fcfb036b9e44e44ec8bb50ea568baaad8777aa09b364aed0c419568c3de15d5abaf6e9fba07a";
+ sha512 = "7ce16040b19d61d39936fd220351d6dce0210aa0edc0494d1956d1f19d7e027cb2d8d100940bbc34a77f05d305a5af3708d16bc78bd9b2364407bdb71ff05052";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ca/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ca/firefox-59.0.1.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "87189530b94e49588c323ef388a34f6e3391d31bb7255109d0f25ad256f298576ebf3b3adb436605c1068d6ccb1fd4bd9350d2c48c5ce1a545ad4e28f11d0bdb";
+ sha512 = "8f8ec749c55c4dd930d3e359b9a3003edddfb6ca36f6f65f0119d0049b09a4c3cbaf558178a327583769fafa2d64272099882833e2ef7d6956b606c05f8a6b76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/cak/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cak/firefox-59.0.1.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "91727c8e30bf12faad978cea98ff2b71c600ec6cbd85ffa603b8de7a70d0d93aafa364275061c7960b4d15e9ac729066fd0b600c1518c73dc1c78d13c93595aa";
+ sha512 = "41f6ae5d0aa44b90724e578d51ad7a3d6903dd74d30957a8786cddbd3ae427da0a453c1504a11ff13ab9dbb350829c1928d27ca0ec67e94995346e1414109e26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/cs/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cs/firefox-59.0.1.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "32d9b6e425bac23ca99ce024668995068cf31b2252dd622886bdae395c10a5e4705b9a3bdcf5f72a090fdaf07d4f1f7264f6dcc16be3909d74b51fbc48bac969";
+ sha512 = "e219ec91c7346a72b64503f89088554f8d322968fbed0ff764d90df53fac06d4febf407773192530ad98d6c51dea23fb7c5f07e2b9099c736759a3b60b8b0a48";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/cy/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cy/firefox-59.0.1.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "aa206dec14352a4289612c6a0e8f11ba9daf3c48cd3943413cf9a2528b81bf25addc9392c47922ba806a29fd717e4c9885f6f0335ed0f4c8e6b2c38c4567983b";
+ sha512 = "c6650b47193449b28e1d9f6420b59c1235986ececcf724234e26fd8168f52120274d3d8acd8aba036c494393eb635c0ccd68833a1961a36a10b04b1a1050bd7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/da/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/da/firefox-59.0.1.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "af047d43a7898c3f2897d6356d60264b3843fa03c1de95d334a346e5c713303f591dda01d2067677cb3e7d2da465ec4cffc195dfcc5f49ee30e354ebdef0e271";
+ sha512 = "b66299d7f65fdde01b644a21524635806c703df27cb4eff928189d65285f12140926e8d20d1f83b54263b8b17b7621034ac1da5867fd28d36b2733212c9b65ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/de/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/de/firefox-59.0.1.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "009ee8f67aac1639437e340f5f6a67b7e881751923af24d45abc0a458ee1186a4dae6a2b049378855e3982aa01de23d063c0090840d55b966130024cae9b8a6b";
+ sha512 = "463ebdafacbe1eb4d0df9d4843ceb41849fc2680404e1e5f4af563bcd4fc4410f8cb212a396ccfca874c37a4cb245bfef8de4aa9620d3e30908f1c94d262cf71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/dsb/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/dsb/firefox-59.0.1.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "49ac45a821d203e1915536b0c478fb4fffe905b4efba50361f10eadb824337bc44d4be0e9a83dc6d0e8cbcc24bc69ed8b2609b766b893432dfe14c19d7f0804e";
+ sha512 = "947dbe47ad286c57a62557532232a5e833cc6f7b6295699415c727bc30cd1cd67074a568c1f842e3e7b95460595b16b0a9c87e94f38a37f22b5e8db82a3a4932";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/el/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/el/firefox-59.0.1.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "055946765db4b9b0b028a94a49cfa21174fa4628c1a6d3d9cdee61fc418f7a0c49fb14515ef57ca802ed4ee90618d5fb3bcf2266f368be1e2c02905e3070298c";
+ sha512 = "b0d5015676280816cde17b217e078c8b912aaa87167317393c0c20b8ebb27460ead4a4656587bda19b93fcf4362e07ce11a0f5410cee733ab44bc2b1f0a1f093";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/en-GB/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-GB/firefox-59.0.1.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "e9e017ac8f12032928f16e698f61f7a1d9b7ca274c0c365873e1853cb70189a08f5bb424351d46568a13412851c639b6b355a7e34af53a2ac68f42acfa45fdcb";
+ sha512 = "94864d56052d619d495c527af0941979470a3c7410e51c01e5a04be565a62a29a6055eaaa9f5b4bd6b443fb87702f52c935b3071b4ddccaf97a494fc2256728f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/en-US/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-US/firefox-59.0.1.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "53918eb367fa58b4e54496d186f918a6b9f8dba7dbe3b19608a2a49cc6f5abd656998ac5006845d75a900ccffdc8595bbcee7c365792f80c3322fe2a09e1f6fd";
+ sha512 = "ef8c7518bc9abd2f730efa428ccc418410c7c571b32c06633ecf82c949aeb3e4006d888362ab511d55db98ee2d6e152f9ed7cecdd976272c89f8cc5957c9132e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/en-ZA/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-ZA/firefox-59.0.1.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "bd3f538c644c5164f21d7f14bb1d118b1d788b487158aabf085b43a9a10af4df9079ddbad13427d381566f8841198c16f14ec949b8b4c94edb51e5572685993a";
+ sha512 = "7e172fd957b000d77e4ff832ebbbf6b46a192668289394370ec95f12e5f319cee59da140bb3a809bcb7e161349c32f682083e7639bfb3f6fa5cab53ac4f33716";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/eo/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eo/firefox-59.0.1.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "e149060c094d856b98fc6fbe3dcea5ff632f2886e872e753e4416a9461956e1ae62491a052d115c4bae879382915d8df8d15c4b1aa6ccd4aa25464e2a2da8a4c";
+ sha512 = "369e76a861625bc9e757980c896fbd1563e5127ce770557aa7e81cd80040146af62c526ab148168b2a078a9c16432e97e96ca4fffa5db5945c3475353cfc894f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/es-AR/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-AR/firefox-59.0.1.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "34b4d77e53ac80dbead9b4bcc32a6de1a08cadd23efbc203318f3b9c312334efddfa5c0cc15b21fd7c21f64fe74f52e4aeb27f9dc5039599f19faa87143a0cca";
+ sha512 = "a053bba1fb77617ccd9b2bb1595ebaf040760307dedc9984d3ccf5212f572835f9463611f38bce684e71728b04c4d3e484cbe6c20875b0703d39c3fdcddc6cec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/es-CL/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-CL/firefox-59.0.1.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "8d379162adce9913f14c4ba9e6bca43fec2e49db6543adde894d1735ed8dc548970a61b2338e088f65a1c9410722bc683436c11f7f62ea46bb8f5a1565b25faf";
+ sha512 = "618eb3fef5f3669bc104ba60b76cf280503bbb4f2700341e95a6024fb3113c56388fcfeca294e3fffa3af5db15d639c0e7613397505c63509d7f248e7a1825e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/es-ES/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-ES/firefox-59.0.1.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "8b3ab31799d6b636bdb8dd78a2e7e3c482169b9e09dc5b8d403e080c41404fe0a803d315b00b4c047adfb7871ba29fd1aa93c600e3b76747bc3091f1613c48c9";
+ sha512 = "f8fa78438bf7561d422d9187b16c1284df2a79c6f8cfdbdcd838501b5f2fca1d2e05bfad6d59b9484f46e4dabd2630706a8c47f3323534e24ef4c8fbc4937a56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/es-MX/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-MX/firefox-59.0.1.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "fdd08f2e2fa4cfa2f88edcdb1781f06b87a8deed929eae5fcad733ceca93db5bf750c83d0d5b5e37eb1094ecd68f5958e65fb5f905e2ff401433b3c6ea4ff869";
+ sha512 = "4dfc8c70cfd5eca191ed4feaaf8c4dcf2dadfd7226f1ebd939997e8bdcd7d867afe0c27a51cf5d578c380665023770b2e54110dc2af78ca63a2a38165d879665";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/et/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/et/firefox-59.0.1.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "21f4cd8a7f8964f25013c3d3e2c261489790c9ae54ca765da3199c71c887cce955a710eed744b4f763d123bcaaa86c6bb154b1a6f9c933cb4e799cfced8ae153";
+ sha512 = "9710192f0c87ebbbd68bf336f1560007a86f9c9d55ee3df7311725f7c81e1415f5d5346378fc86424cf1d94e51efcaf791318f040c3652132dacce59a8c2668b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/eu/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eu/firefox-59.0.1.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "dc8337134ebd464d990ebafb4c04a0a57f84f5a013f7a3dd535be454d0588e62d1df796891593c5e48c4475f4b863cdedccce6548294e1799b8fb8548bf17651";
+ sha512 = "47a76627b97b2190f532ac82a6684787a6cd45f4f831b2af6315e6242367af68f84be7965cb6d91df89d8e43d04655c0e41231eff0b86cf329ffff5b26a56dc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/fa/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fa/firefox-59.0.1.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "a8464c89ea4d9df863eb02850fb4a27b2dc5f65c5e85849f4ce302d4a7c0531e1bd0b3c1f2a6696ec101c509a8cdc87c91fb1bcbedb0dffe0cab9359e7d584b2";
+ sha512 = "3a888e43b737998938a624003c6eca6362aad95d0e13203d655d67c4b76c69484240da43d00e24a809e1fa40b18249c9549d52794f9cd92469a028ddb4b585ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ff/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ff/firefox-59.0.1.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "92fc49c3f38a3bec9608c1a5aac89eda97e970f64a6ee0f90e1cb1e8ac98a4261307b18d3bb906bb66a20adf161118744a297f2072900b11a17e548c31b8baa8";
+ sha512 = "365b907bb5d720874d206cc2fd3e6f21095ea1681a0bff5ffe51b49135bb3b3984e5cbb0a50951afc5bab3ef2bd2ea55af29912d25dba8f4680bf6bc25f24b05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/fi/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fi/firefox-59.0.1.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "8c03f59ee65e22299aa04296530f6d21f036ae495862f80c4fa0ec97fe728fe440c723599bf0a66f088050bf40518ff15f62b526c3491c26812ffc72336019a7";
+ sha512 = "9361b0554f221e13c4146f9eb0df4af64625062a368ff828d80350e932ef0bf6f9cd87e3399bdb42ca5e7ca0dfaec9357d57a345a978ff936958ddd074ac6c67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/fr/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fr/firefox-59.0.1.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "3ae19adc3840c503f762e1625cee9b7b009f8b577f1e498ec1f2b05dac0ca827c957b9ac239a4877e151f8e6f4167111630f0f0bfeb4068c8e892d4ead9f13b5";
+ sha512 = "61123f188e491c32e9b912026554afee17d83ed8bb3480bc6ed8f10f46049e81f2444f6850c5a9f7841f9e897311ac0955105401fd2661ee703243c6e204fd60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/fy-NL/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fy-NL/firefox-59.0.1.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "fc4485f1bcdc129e8199a6e46b8bc4df9a3db3940efde49be569d8d56bd77a932ad69d512d875742e2a2653dfe11c933c83c22303838483ae64e038b947e531c";
+ sha512 = "4575949552f1e0951d75b2f3eae5a6ea5fbbc6b69f0ba5d82b69922209a46b8f9701112cd1dd61b6c892eb1f4e6463e28874f3f84891e3eca3de0b52036ad429";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ga-IE/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ga-IE/firefox-59.0.1.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "b306831c247b8db75db2b7faedfc382b0da7d9eb54fe25b1b540b65a1127ac1e672aa56e3c87089d6bbbedc984e2f571611cab0fb2c1d839aa1710ebb2868ec7";
+ sha512 = "4a05d48803502ee435ea3b50f38ed262aa57048b0f013c7165af37ad44494a1aae7f643e14d5aaaf7a2d5a1085a67a078e70ade9e614bfe33295351686661ccd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/gd/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gd/firefox-59.0.1.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "8d0d4c03ac39fb0b29e328a2cb6a1dec6de0fc9fd956ec5a0c6e431b739e3e98583e42c1bd6a37efe0813fb1d76eb9a881d4e1946ecb98416486e8a6e5d0b181";
+ sha512 = "df9dcc72aacd44ecf73f0ddc34a6d97dafc9deddb35075273c2b958b2c23ce3a346433b050766f8b83040c495c2a84b454cd7742cdf6b59b69894a94553c21c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/gl/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gl/firefox-59.0.1.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "d7acaba4ea2ee4a22ee64bb918083eb652db21be450fe3415aeb2e4591624b4aff364d37cab51f718c832838a2f775f42cb517e9ef6a81aef6aa283ebae35297";
+ sha512 = "3f55336a02249aa06674adbe8f378ad2b1a7b99164608f04cefe8c642ecffd336f9f370fcc190debeb89f97f630032d41aacb46e03cfd09a9a20bdf5f207312d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/gn/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gn/firefox-59.0.1.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "65c97e250d7dfef68fb5c9479e2a5af25e90bed2608ed4f573591483e1c8db2267c035180064adcc11049a14e6b56b19456cf46a1072ecc9ce054ed0b76c17af";
+ sha512 = "9bdb650bb25ad573a5722595d7b062b370d79ef6a9079354ee467ae8fdb8e319d3b666bef0569286a868e7d64453b2c69098945539a259184334910f70914211";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/gu-IN/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gu-IN/firefox-59.0.1.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "88780984a9f83da05f7bfeb469442796b78c4c1148fd554bb57c2e55d6c56a49c77412358ada670f857e0b1a2b10dc9021bab84ffff2f7d252679c50fd6ea5a3";
+ sha512 = "5f2621253981d58aa643da76dadae44da76bad3f50d08c35c43d52da5b0a8521ee4c5df5262558edb4b2bd817985aa02d6ff908f326d99ea58dd4d96b9f04819";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/he/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/he/firefox-59.0.1.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "a412169599e4fbe019932751abb67a538870cc3b4c2398d3d021d6176224a8d699291b4b48e5399156a8de8595077bfffea2bd987916c6bcec24487c4dbc916b";
+ sha512 = "ba7b0bedc2f8146dddb7f0a8a2c357dea4d23481e85f23e5d1f820da6b9c6ea84298ef609967e62741a2f9b57a6c4e94b0a90896daccb80b888313c75359879a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/hi-IN/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hi-IN/firefox-59.0.1.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "4956f4086e061bb162b024ea249db8192b1179313aa7735bd42b46483939c4773ab2d3d43ffc056a12500c1873b45a5a6251cd1c89647d375dc605ea8e7b0c1a";
+ sha512 = "7804c9b6bab169fda70db8ff3f638add9fc22a6b8f9adde30482558e97d32946085258bfdf93b0e67a35709c474fb3aa028816e7f501dd554ef05a282f656815";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/hr/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hr/firefox-59.0.1.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "e0acfa0d4a1b0a228d8f612a742b71b88d9ef569ee263cf0c47d6e7bde108496f36fc60113a3be27a52d45c07ac3878da2bc1c6a47c1a6ef7efe47eea99090db";
+ sha512 = "e97cd1b68d5a1d471edfddedbc05321444880dc9ad2910010c447515ace632c25b0516ca1dbd529d44777c8f9046b5a660a768bdb35ac5e199d1685724c6a7ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/hsb/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hsb/firefox-59.0.1.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "689592f815ebad0cb2b347ba214c30ececf13e56c48e57dfbbcb16e39cbb09b5689daa5e90fd5adcedc927cc2c5906f313ead51658a2ffb9ccbaeccd503bfb88";
+ sha512 = "098842a0e8226eee716859b7e1bd1919a2bd251bc368ff6df58c95b556dc503f15186bb483503087a7e02d785453edc77d081e267b08487c0ff874361a82ee1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/hu/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hu/firefox-59.0.1.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "1cd1aa3a62426fcae8879013937ea1059b172c9b1800be9c7aac7a5d716651f2fae270ed99b61a7794d28ef86fcd79f3712f97446136a2f5b06ec3eca8d6818f";
+ sha512 = "cd6846f6268d96f84d405aac06c11322e188da3124ad848faaaaac7cd562c004655a8f7732294b0ce2ca42597c82d82fe8b1eb65dc5b0b659f7be342aec648ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/hy-AM/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hy-AM/firefox-59.0.1.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "03709c45ab2771f88ca0ccc2caf3ebf7371d8ef4b52dfb3847f258081ecad6811b4c9885f4f652ad995c41850e322b19078ee5e8019398a015db0dae8ba2e1cf";
+ sha512 = "3e4f4f536c4dbd4337e301272fd433e4e0ea26976f2a5add8a0d90f310e2c3fb14a4b558c556214409788bc2be09d36bdbf95bc5385260b70408f00ec71c30da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/id/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ia/firefox-59.0.1.tar.bz2";
+ locale = "ia";
+ arch = "linux-x86_64";
+ sha512 = "35adfd5eaaeb3d40e32d501ff49979e4db878b6fab5598d64c3943cf57f846e439ef88693b39a03df65367436ce3efada9c367ee5de20a1d769620b00299bbaf";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/id/firefox-59.0.1.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "1dbb481b7863bfbdb0ec7c85bb8ebbc3766799de8f8fc6b6f073d2601771ffdc523d9206d83db9831e8f62e5ef81af2d96b166269e5bbf0dfea9bcb05ff504c5";
+ sha512 = "3203f599f6ed436280143aaa563780c64864488f125462a56241785f9e7d6d48b2d3fadd0366fee131d575d8dadc8ca4820716a03de4c3b23eb0f0b033cc73f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/is/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/is/firefox-59.0.1.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "bd21c60715943ac698d2e1dd062328f63d3f5a706efa7d0f31948fc4293b8d644897b0f62352965944324780dcc5e19a0d582aaf699b2c79b5dbb0530aaddb32";
+ sha512 = "2100f728268efc1d2c0f96e745e2574847aa844ef4366dab44f9f0d89e79372a2180d530c7fdfe627e17644871b3a71387037057058a0ebd117e187343b5d1fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/it/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/it/firefox-59.0.1.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "65d991e4be62df38110f301acacc042a56cbdfeb20d6e5d9d52a7a610a5d0ccbb26d7a79b581c1e654400a4f162c09487afa7a8de313b4f483fabc2d9e2428be";
+ sha512 = "abef6687c0e0b90f9857e29d5b82ded6dbc0b304dcabf2586e1328bbfb9948b37f582a5ac1c58cb46026ed674863c437a15872c46741fc4e8d0a4a4be80cc05e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ja/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ja/firefox-59.0.1.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "ed3ba62d9e158a4d8aeeca8a9b2528146c5970c473e4ce9e088a80aede8b98c5e4d822ccf9996868588b08eac51b946aed202a130b38b2cf408a332dfc932c7e";
+ sha512 = "d953aabe2368ebe9f944d91769b6e0fe18b1b5ad819040705283af6739b03fdf6fe9f3cfdbadf5231c9789ce62dbbe831035f8776f570e0be1e483b6eea578a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ka/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ka/firefox-59.0.1.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "31180f189e68863a54ef6530befd184abae6e6590117ca6a89fcbe8a24a8b8d180d9500bc931ba0b5adb13a7d0173cda9a6b2f7bddea8f7ab3781620c2ca3077";
+ sha512 = "52c4b6338dbc79a670b33e97d7996daf1ef72c22982f16840ea0cde0e6ec16eda6eee1688e6eafa2ce6eaa9cacb33ceb7196f2923c81d4e1fdb3af9c200b9c7f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/kab/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kab/firefox-59.0.1.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "55d5de7a1cc6f5133f3031154f25d8e74b253410808acf8020b63a67833a427467d3a4bff74d2cc32bc5f9cbd5c6a1d06d1378281889d4ec78313c3390c8e6d4";
+ sha512 = "4832c730d37b5890a85091109ca150b882202be9028b448aa57fa8e74a2f91673d2c6be4e963235c0453cbf070a996423e64f7cd93caed973d5c5018d26d7a4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/kk/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kk/firefox-59.0.1.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "e7c3244cececbda5b36b07ad3e9ba3bf3bd17aa11bf3e39f4ba112f1a9cb51d75819d299fe5e027c29f9e8ad115d1722a0ce318288193379f0b0c7d562f21e5d";
+ sha512 = "efb2fac05f337f22c326822efa17f7063dc71180d54621b95c000d6c86bf5180d5ecb012ab72cef23177cf07d7f46f507bda862f87dea507a4c1be026829ca1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/km/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/km/firefox-59.0.1.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "c56b3f1b1bbf610abf38f8751da86a092b57e1caf771548b232049041e9bfe252a5204a1e7bd5035444807b4990fc2631b9fec39dc7f25ccd33f93299708c490";
+ sha512 = "c7817dc8cd3e78b15708a863727627ebcdc6ad054da252f273a6e68cc914f5999fd6d7495d64586e1d218c068c9f38250db0ae54944a67f1116e5a12132c9dcd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/kn/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kn/firefox-59.0.1.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "5f3e23febcbcf6d71210c4bc77d684c2deaff72f1bbc6bc2d0a5d0f340ecc063dc332464c4b9d8a6e9539723ad44042aeda88bbc872ea7c0bf93b6c5fee5f5d5";
+ sha512 = "9ed4c6d0a6a5579d1cb32e35a97df2b05d836e5eab5df59406da4d86ebae6374c38649232c2dff849865f538ce4264d8f08c7fa6c778f9ac65362cd47297ce51";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ko/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ko/firefox-59.0.1.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "3e129cbf532ebd3cfd3067b666c87118054fb5ff12dbf08f4f2f752c4a36cbe5938fa825fb16d9c1f6b39fbcb44f1a36c0a44f9de9b3a62937c931cd46629782";
+ sha512 = "f133fda3bfbc59f895ead4257a097102af10954f0fb7ddd6bc9337a520641d8f1a26bd86011c0922c2770e8191e68d96e46d56a76d498c7a44c713207a9f8585";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/lij/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lij/firefox-59.0.1.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "71ee2a3fc0fbdfb96010dda366a0fbaf446a7082459c8e221e6e9bc8d6e8ecf94088db26a3605aa59a0205e5e2eec7fb6a246c2728de6f15874e350f35d4b64e";
+ sha512 = "e4d55a021271186cf3553781aab1953c9bc53b86c5d8550c6d45bfcf2363dcf32def20d411c4df10aca3e7c2a79ee527b23e248910ec1bbef8d1e15793e1b831";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/lt/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lt/firefox-59.0.1.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "f8396adc3ea3e924dc2a74f4a2a0ab6f02f5e6985dd92825746c35834bf9d2375b5d6fcb73e3195e08961a0d71e7a56bfff857e436702bdc57a1fff3ec64f387";
+ sha512 = "a08315a4134181e2f8c559e0c70ff05b1455f85a85d5b5b06c5b8cc70bb17f3761468af42c27be476ea3e342365262f18b98c523e35576425ee8e5ef8df9c362";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/lv/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lv/firefox-59.0.1.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "9a03ee1f41168f427f995134ca83c707e7168fc7106405befac319620c9fb0e8a3754ad8072e8bec5a4bc6ba8fcf250cdeb03f4a776a5e5958b401e88bd1cc27";
+ sha512 = "e6e62886b8bf972668e3da6452bbaa970cd16aa5593c8a3d765e0d784ba755e17641a1d7e5410ea6474484eb14b3b6b18b69e3be38f2e2ff30890afa18c9a405";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/mai/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mai/firefox-59.0.1.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "1bea3eb0befe931908b47fe7220a240c245df6d87001d87476c63f40856c9757ba76a8032b184b71792d746adf1e4a126e1cd735a47916c1fad461b3bf6a0cc3";
+ sha512 = "a28537a457989974e11161ae84dee2de28d783447c0a0a6b5b03a36fcd1650d609ddbb40ed063f0c68149d314b1eb17dfe92d5396c855794d45a0bf8e3491c7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/mk/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mk/firefox-59.0.1.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "27fae01181f2c0ca2a2abe3902425c54115dad27d771700ed37d2f7c7e6f1ee23f63c688305eb33475f257605bf3897e9ce080e60be7e4e4aa40883a33fc25da";
+ sha512 = "da601ab25113316cb9ad44d2a8bd0eba23800fc97ab18ade8324048b1d7c757c51db9fe039992d18fa7b78846b5be496d9f3439500448f21d66a9d3a335479ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ml/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ml/firefox-59.0.1.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "52dcbb17a6dcdf25f6791664a3b0cd58c605a768e29cc50cb6b82b1e84b69dfe8aac9ee533492cf85620521cbd9cc9d7883f0a6f98fb42a72e26a6e813bac1b7";
+ sha512 = "eacba5bf549f1398f561ad574775af8c749251f9d4a57a2c91400236cb2b72b00e429d4dcd4597b6dc6fe95a629d4b56c2c1776e03cf5d158cbc85743bbdd443";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/mr/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mr/firefox-59.0.1.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "68fbff994395426996d8481598f4dbbd9d1d599b62578622e154393257682624deeab680544d69fc89eb3eec3f5258e1766563267d4ae30eddd874d28be8ac43";
+ sha512 = "e9e9b13cc3c4f48871d5b73ea88aba384d0ae792f7c2bb49f41d5b7da36243c108dd96925c122abb0b202ba8ee7591d8edd783546402c2066f5459883a255897";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ms/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ms/firefox-59.0.1.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "5ed20dbb422470379e4a9746c184560143d39e8fa17d60b346080b800f7bd0cc8a9000bc4c07c5e84f9513a08ba7af07a4425b89a403db41c842940f94603a34";
+ sha512 = "edf6153c9e18e620558e283086a96d49e484a74983b7d5823b1c17f9276f3c41d4282a46dc120a181a7e53595e1434f56658d34b2cad4c97e30753c07c899fbf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/my/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/my/firefox-59.0.1.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "f41e5e44178e1744ac26749dc47b091eaab5cd6538fe341bccf9f0fe32f87439007df1fa1625652ed37e4e81da1b74dbf0b6597074442aad9057df1ed143ffec";
+ sha512 = "c153e6cc2bb3ea49de8dea3661b4c5ec23193cd40e68da8160108b40fcda6717e35e7ef3bd2708ac2e47014b224e53f74b9183cb2c50f36d517f1a5ade425d40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/nb-NO/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nb-NO/firefox-59.0.1.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "f23d6595d69f656fe7c6f2508b16fc0964eed25444d4fe7601f5b2ced86e732ad4cc5e9e8b11744c9cb84652f4447b1138d664815a026e3476c09886493099a8";
+ sha512 = "1b94a618ec8f132bbf5b246354da4b424a682fcca74259b94f1ff5cb12cb0602d327dc7b9af2814fde45e5da829159df316442db6388fc45bee8c8255418a1ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/nl/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ne-NP/firefox-59.0.1.tar.bz2";
+ locale = "ne-NP";
+ arch = "linux-x86_64";
+ sha512 = "552aa2504e1d5c15a413a0e7e47b509d37a8b424be9ec4371f0920a9ac8b6ada2cafb9adf054b695499d41fc9b606f6f0c95d99104318cee1d69998ed7bd1812";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nl/firefox-59.0.1.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "ac09484341ec63241a5f36d96fcb3fad70d91a5ee1dd76c1262916f9a6d955800abef91f74f533521db9f79d9f73e81320dc8486cdb740ff52a84dfb42b2f922";
+ sha512 = "2449c6f7cb6106e7f49b5160ecf973a73882d653c68a8e5648a31595367ba41dd93e334f3a67e69958f4bf429a17069bdf5d66163f2be14e86068a30acc29045";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/nn-NO/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nn-NO/firefox-59.0.1.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "df79f4edba46642470d7a63bba6095540db649193acb36573edb2e53028919830b68ea3240d3fd6d2ac6f6eea423af806e2935a6158b1f2647f06cd72ebb2c2a";
+ sha512 = "c80169f8f2cab78efa8ad06a6e3dcea41359bfa2b4af7baa034b88c934d27243eb5b20b4ca4f956707472daaf1e315ee4d34e5abdc25edbdd0b8aa3915c14d5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/or/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/or/firefox-59.0.1.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "990c0c81ce39d2295e035b03b704245fc68c79be7a6969fa9f1229eaa1e4a2f8dfd36bbc532b8e8809204320eec793754dac4941dec2be86a1014dc7db3d4f57";
+ sha512 = "48ebeb9e4233b303bf5300c9d7413c82f9340a7f1fdb4ce23cd9868ae6c8c7b61532535dde653fec0f9a56a3b8d4595d451c3abddee75f6aeaa5b2450f26b0d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/pa-IN/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pa-IN/firefox-59.0.1.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "ee7055df27ffc800d30833468de7fa7013caddf19ed8bfd770ccc456069c8076a9fc307be5e320dae3476bc17aaf9095e0d4c8ab2d306579dc7a2088de0545e1";
+ sha512 = "4d2caea086ddd56544b59793d3e2422940d64b16a623e9b9717329a639ce8a89f9e69d7c8ed9121bd08d692462c99316e1364d89eb8d1cbe978c67f99bff2469";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/pl/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pl/firefox-59.0.1.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "83d698d4a1e4808ec9d5fabd158516e4db9824edbda5f17f85cc0473f033900c86b9a2119bb3533664e29949fa999761bea2f47e61325e37344cb91b86746772";
+ sha512 = "6d10818fe57a2b10bd5cccf068f42ef8e2d949a79c4ce6e4b2ae088944f17dee8ce14396b2e3f86d492e3ce31780bbd96ecd4bfe39cb8e15dbc70cbdad6a3927";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/pt-BR/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-BR/firefox-59.0.1.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "be1e97f4b7c95615598e734f7e09778046e2639b336b404e4b4dfcfc47a2fc9a50f95836dc9b4ebc57a84ca47ae8fe783d352992c6d1dfc256a4eb85fb60bf39";
+ sha512 = "b2a8732a03983b00e7e606099a215a8b6545e093e243662988400e059757f6699571a29e6c24433b345de5e47484d19c08685fe1b5410d71bfafe023d3bbc669";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/pt-PT/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-PT/firefox-59.0.1.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "b3690a9c0e0319273c2f0b2f20eab8b296321e55035f83082cb30581c50030bd4f04ac2d91aaadb9c94bb4c6aa397ee133856c0c322afb884dbe20dcc693c044";
+ sha512 = "ffc7c4a8cb7a092ffb86ff32ff8d6e54b4c49600ea9c8ac77e337f4c71b283adced784d23cfe8e69d034b9cc22f118756af44fc5a22003c77c33135a24197b2c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/rm/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/rm/firefox-59.0.1.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "2aa88ec2aec0f18a81ba3db642ca2ad7ec4ef522950539a5238a7ddc1779355749f890852dac03678ff2802423584b671c0b10a7d4d3bf67f333a711bd9792e2";
+ sha512 = "ca174bb51554e73d647207c62f4f17de52b47ca6960dc13f45becf0a0e43b73edcc7925a913fd42e3b151acaeded5bb68d6cdc6ac17f3add2bcdecb8a4b20c3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ro/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ro/firefox-59.0.1.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "011eb6813084b482943237f6ea354400dfd141a17b8415a6c6a65c847b699f1f4f1e3178201014cc787090f88716f3a7d418e080f57df7e4071ed70dc12eed26";
+ sha512 = "4046be435da5d23a46ea007ed04c35cc9431d22858211fb2647df1ad4e00e84476544448ca86ce353b889a8db92fa1723c0598e7d560fc9980b1c7b82fae1552";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ru/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ru/firefox-59.0.1.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "9ca6f6d611f0ea2f9e866aab1b62a648114ad35baef2624281d7cbd1da70e7eaef5371d37ed4bdaaac06d90ff88a5b68bb0211056aeff12da35d9f0003eda47b";
+ sha512 = "a7b4becbe30e27c8bec3c71af691a03b916774a77e4626a89743a7a7deeb07e9489ba6e276e80b53becb78e5c2575465b6f141f694b71bf9cd68dd761c0442bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/si/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/si/firefox-59.0.1.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "171ea0277b6b96b63aaab0b58eaa401920e7245f60dda6e8b22f7261e788626e6a00f34b6e549def0e09f796a81b98524c1009b4053f11743311717da3dbab2a";
+ sha512 = "a9d8162bd8784be11924e9cc0567ea720b87232d175dee18212dbecd8280fecc610a964df77a3499c5f25cbbd466344221f5b071c8d83c3268d936e108adae48";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/sk/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sk/firefox-59.0.1.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "402330695a3ba72b1c7b286862b7cdb677799b2eb3d2e2408da0f7e2d1efa1f2fed197d15bf9f18deda19fac01fd91a89d63d535b859b4fc4a1796e7d2457564";
+ sha512 = "999229f133193f19b49b9e4107515963fa28b524323cbf88a2d13542568997a91af911c42a3b353ab3d9dc4d05e45b8e2c9e08b4e6436da6292073365cb5db0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/sl/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sl/firefox-59.0.1.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "840a062dfd292f27b9aed42682c326e8326294817c44b5269e6ff53bfb7f639f35a100dc031f321f4ba9d90e468eab1483118ea8ded4084cc7df927bd8d2731f";
+ sha512 = "10ecfc7d338462aa350aa957b3ca6c0de5eba93fdd680aa2dc406bbc0cbad821854c9a45dd12c72403393d7f9447d5dcc86981921f0eab4ce3c06549c642e08f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/son/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/son/firefox-59.0.1.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "d9e8e3490147571c5fa1418e44e9d2739ad3d3efb303cbfe9afe7884af89c4ac185abcd7e2514dad09c880c9a134c1aaea46cfae01b10ff36a2d01e54658aed1";
+ sha512 = "c0cea7d6ca475896c0b2b281a4a0df33311eda128d573b38b89b8f1653596d8d16bba713b8cc8bba267afc2a5cf734aa578532afaa3197cc92c5cd03db030dd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/sq/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sq/firefox-59.0.1.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "996a7e70c32ac0102b087fa11b269f98166a5f53bae4d075db2602e40df40f3c4cbb4b73015c626ee0b856b934dd5da7171a510f297d86995e182632a34f65b5";
+ sha512 = "45191b5974de941748d38ae74e87b135ffc813d5f207219b21469ca7804cb4b6ce9e7fdc1892bc6a6f4fc15d0935a7e770e82baf94f1c31dc77d1108d5f25cba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/sr/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sr/firefox-59.0.1.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "5af926ee5e008b4192af127fecbc7f841886aa0bf9742bec3701ea0e954edf36a605191905981ab5ab4d1bc4dc16a27adce74c05adc5fa03295a06c588e1fa4c";
+ sha512 = "e931f1d47644d6a770f193cea61148445d8f43eaf5670d7cc76b3b115db15ccd4fc0938a59e7bce237d2d05a924660a791f4b19d44ccf06572d814a692cb9173";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/sv-SE/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sv-SE/firefox-59.0.1.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "a2b860bcad1b1ca27b3e086333496c0a3bec5ef12d138765817445cec52f4ca6e5580da5c60f1182676dd577afeee01560b50a15fb8399ec84d97b4c3144c58d";
+ sha512 = "95a8391082341543c2044a72d7f52de39767079957c99ec75c6daf95607877fce0ff1d3c42175964516cf93ff632789647f420687d51e717d3d51a280f5c9272";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ta/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ta/firefox-59.0.1.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "8c379738b92b525b9ba166d0b40a76d1ea20d2c756113588e6253adf53c62d4d0d5657162bb71a68c449553d127b6ee9a2e77ace547f29558072fdc2f5b0d779";
+ sha512 = "428e2269126ce169f0e83ba1274d4a11cbad2964dd6bb31e8f3c3afdfd3968fc9a06d0f92a77a0bd745f36810a526a75f8c670489cb8a28bfe086cd04819fb0e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/te/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/te/firefox-59.0.1.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "90e36b08e06bfa6740e57e31cdc44e250facb4d85927f74be61beba13261942276add3abafb5b57c72126e7dbfbd82541e38198c605fba7157e9714917b5d854";
+ sha512 = "34c0b91b14d70670ed0d1624a5d6b93ead775151b432add41bc13544ac2fc5acdf3ad9f8f26059655effc8f5507081461f737289011b41bb3972edf7dcf933ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/th/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/th/firefox-59.0.1.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "698d255326a277ec4dd92f9d91221e04794c9f68c1ff9b6c1b1254afb32220b35505df49bdd66f14fb044b6747295cffe15bd145ed8bf9d8c78cdec69ac86869";
+ sha512 = "bd7bce3cf04674cd6423fcf7276bbcd3585c061b77c692cf33680f122b09d2c5c29ba0a2d8ec857425d9741ffce1ee23383d35c9b7a620aef5579d59dcbe0049";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/tr/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/tr/firefox-59.0.1.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "de399243e17cf1598467532f2cdda5f87569f07956cadfcf72806e1972c0495a0da11b6cd8a3823076658ee5e8b56ae1e6664296b0e06f9d20000001f216605d";
+ sha512 = "580604b9e4336aa6eac536d4514a41603890ceb6e9630609b4a36cfb0b34952f3d273ba1d100ea1b5509a6dc8dce9f10a335bf5aee7a0c6b133abaae3c4c7352";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/uk/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uk/firefox-59.0.1.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "12cf4c40f3f8b2040db20c72fc0a604fe79ca328197ad05bee4b8652ed7769238f15d5ed7d026dc7d51f35c76067d814d873b96efca7a641701099f49963bf30";
+ sha512 = "f6c7a9fe068ce1f760a7ca45a82dc5dd28c7e054823e3b9dacb6d00d628ba56c8b2d831a36237290d8803b3284b90cbd29c3ef685cd0d4973ee338b91ab541d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/ur/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ur/firefox-59.0.1.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "8524c2e24d48645d03b3f6f60c38cb69d16f8d9b665517ef86dd4f1d79d1a83301197784e1e27cfeb9ed0e978c2dd9a5602b3be3c6cf6fdb2e51a0d8f4bde264";
+ sha512 = "41c6ae7d2f80704754865982d4b64252a9a04a222c5cde279708960c8a2c167f68805ca2302a86f03ab55ba93afd069d4c289434dff8ec61b245123347e53e78";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/uz/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uz/firefox-59.0.1.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "930df760aea0d9f40414e7d2025c81e3e9752e5d338e0799012b888f10fc5ae2cfc4871a49502bd18ccada0a64c3381c3800bf851bd98d61f8380be2db126eb1";
+ sha512 = "5974e06472aa75eb2b9cdf1494d8bdf0f394d5a7493e9f77d631f47dbf0a0047dffda5fdbe23f32dbe65612b9b77caeb7c3f15887cc51fa7c2609d3960b9d32a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/vi/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/vi/firefox-59.0.1.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "0e8fdc9ad8aeeda7ab905a81925b8cee9f3aae65516d34f1adfe9e5f8cfe1d392ef98e86cf361503d4d2dc21ea761f878595237039e4adcec2609800ed52152d";
+ sha512 = "5b35c3ab9593074c8f88f2ad34db0e161c075d8b04785ea658a8ba49172707e9776a5882b291645d0aea5e333870723b5fbbe6c7957f7ee02c9674eb237a63ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/xh/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/xh/firefox-59.0.1.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "e4300974b54297361e3e43a20dc790a1ccf54c23d6cf10eb9d8bc4e43347399d90c7bc1e9eaebc262a882250a38ffe4d0008b69426d2179d50dfbc2970fbcb2a";
+ sha512 = "8ae8b2f36cac9e1aac1f44a786d6992ea6b31dd83cfc22d1cfd75d057ae429a35e1d61272aac7ecd24d4dbfd8448f54682388e4e708222d1c2f6c6e54c0b0da8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/zh-CN/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-CN/firefox-59.0.1.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "1647f1f31d0bae5aba3e2823293abf755cd5108f8bbd9ab28c5d2794644995fd394c0ada3b28a2df3f3903741b5ea863624b099c9a99c8714022813165759093";
+ sha512 = "76e09c7f0835270ed7788330486e1d00d10e8237e5e6b5af9bc2de227fdabb958c697c11f74d7df5b6876339adac09b6bd5e87c9d31b3c7945ffd00ef0d7527b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-x86_64/zh-TW/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-TW/firefox-59.0.1.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "55ce566e70a1479bc81542b6205724febad35f61a32a11124558af2132881f0cea6b52d590befb2835fca4af6d31d0ee44c8e55ec2809989a247742c062c9241";
+ sha512 = "87f298e06f0b58500231367da1e9fcf19f39c25cbf2b4d20980f45947539398f6f394833a6baa676c6ea27f87da26e5f211333c76ce91b40e7a3e2a6c6a33fea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ach/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ach/firefox-59.0.1.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "1b9e00b08e50a56c2531656e7deaf3cfbe87928e634459f9c4fb04c8a206457294e16850498cfeee0261a26f4303f863a51bcb025812c8fe1620307f710b1a23";
+ sha512 = "3d922035f62c78c21e997f0b9e1265c8f9f8bbcd53d67d7042d8d30d418d54b3bc4f5b8fa056149d8c8dcd54afcae1ba3e418fc0b89ec19b7c3af27239a0d4d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/af/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/af/firefox-59.0.1.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "a0c9190d0864d4424be8ea703aa9f5b8abddcbcaf66a0e38a2a13d991ae34a62e926ddaefceaced72cab6c1c03329ca76279051ab40ebfc9274fef6658bd4336";
+ sha512 = "d85f3a911741b6dceb35ea6f2daab06a6258e66b07b79fa7fba4b1c277ae8debe5fb1c45c3d9eb07b910a172ff94baf6e4520a6fe755cdeaf19204b4dadb1f42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/an/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/an/firefox-59.0.1.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "7c1f7dbed7e600fba0c24e0426c53cce1bad28ab260ffa5461045485f1898483127de4622733e9694dbb06af058ef7abdb77d26e3f7297c856d4fe254eb1b18b";
+ sha512 = "f1be5c00436a1b613fe46f5adfc19eafbb0639687346a3939437e10e64a7ba0c94b9656bff988a07210be68c7e57e982e9280aa03a0e69c2cce9f3501846ff20";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ar/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ar/firefox-59.0.1.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "0d945bc6df592e1ba2cbf6183fe40b2feffc4b747312860780a99be3e4fa9cb1dcfeb18f2fe21a3b4a5f4c382040da2b292ffe45a5869366a67dda639e2bb969";
+ sha512 = "aa2ce3ec19633a86d998132fe54eba30e52fc29d5b1dcde1c3197aab0bcf0a9f73caac3662d58e5465923edabcfb0559e8f23bff7f13b5cf89a11bde7d4b2eb2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/as/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/as/firefox-59.0.1.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "7a28131e997812f9689ca7afd63c3c72f9ad324e996eaf981e066dd8f125895813a5bc63a97f83345d73e04a7a3e0538163f9d7c878197329bdd2e5684fe679a";
+ sha512 = "993be32e81700a094358999edc280a0e0999efd1478eb03f0924c0fa6b8c6347e69e0408725b916a80f350d3fe93484bfe83137fc0ba007e7f7a0f41d1c12e60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ast/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ast/firefox-59.0.1.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "f0b4e167696f4fa02a1e433914636cbd3d9c3ce4c8c3c61410b54670512d0c7d0c2ead7a1ac880181a6c5b5db262ab5bb14ef10341bcac2eb4b81afa4367bca7";
+ sha512 = "ed49c1ea33b0057a8b6cd406820c788248016bede3983121503a8c5332fb305837add00f7a5c75ea0aeacbda16873cb519980f440d9c11b0b54b01c674832132";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/az/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/az/firefox-59.0.1.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "71c2313cd4c7f809e9ca4d999ef5a2f8311ff6d14623c76ac53ed74bbd876c816f5d9cc56145f53b6c2a64d924945038a77ab23047b20e866f9ee3a490cac77a";
+ sha512 = "f02af6b9865d4f6469f62c1168bc33ac1f2abbd0a238d38524643dc5fd84de4a48b146928ca7c6d82f9db3e55ebbe861c29850a0a3aca3b3c1cea632a6938f0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/be/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/be/firefox-59.0.1.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "d38d69409618e158cb926c21cff4b30b0e5e6643a4f955e5e16d975d8ed23ee7e5589269603979f9332206d19b676696fb2ebef6cf916789e9f016a2945fc9e0";
+ sha512 = "5b82b010b2ad960b8281e0cc016f7125bdae1b1f3b93a581998c4ef891ecf49b6b075949420d595ad644aa5c75ac6c552e7d26086b5ee6e807df5179ee6ad36d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/bg/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bg/firefox-59.0.1.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "74c9b878c937b29062d8a2f92a89e5e3197e0326a1f629b44739e7d896d753552fb12045b5369881f0106d50d231a56f837fbd2363e2e8f8eb616e61324c1eda";
+ sha512 = "b404b3f97a9dc8675e701ea2ef8bc0a57b40a2390d98573434fdc82097b12abf28e9179de3cdecd0e3c03f0cf78f47cade1e41795eaafc113ea2c954a197a1e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/bn-BD/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-BD/firefox-59.0.1.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "bd5858cadad888d9392c756eb7c88e4dfbfc42f71459c2a10b992b7be51a08ed22cf5f038ae93b39abf298c47d7063e2dcf91148c080bbb2d56187cfa480dd3f";
+ sha512 = "a992b1cd5ae8c2237acc97bd1f7e61dfe2abb3b93c270e64d2ca190d8ebb84c84f8a45de5cfe7eb853f4e3e99d79eb19838c4d0a02c73f13795fbc42e79ec04a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/bn-IN/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-IN/firefox-59.0.1.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "ee30dbe25537c8376debc9f7d0012034ab05a9034a03b147d242d0d19a2eb31990b8fd68fd14807ec92b3040e469384b191faa002dc8e9956ce4eb8aa79274b3";
+ sha512 = "4188f40867dc0f23b2c52d59e569b7f030d4392bf7715d35678c69a29b85b0573bc3de6701bc550735881b1055bc66258f4c7090e5f4277ea494a60549ad98d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/br/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/br/firefox-59.0.1.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "435225909135570713c333887cc0a31667261710ebc05077aa96d11fc6a9506c8524eab15e6ce09b125a57c25447d8f107556c3808fdccc794714a09dc5948c8";
+ sha512 = "c69b56c43aea2821d9b085c7be10d3cd8c7f609b8c053d8fe8bbce5f719001e620bc56d1e70fd85c77e01501a0df466cbca62e2e6ecff78196ad91b6c30cd8cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/bs/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bs/firefox-59.0.1.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "c702e9f765010f1fd2b17d5790411e7322e78e8b3e86c41f1fa7667e953f805b46a2249e5ce35f3c58dfcd3fb8a93fda6ede6a04284e9d9786bd912c5d5ef71e";
+ sha512 = "77dab75b3c10d6ec24ddfa436dc9a6e037da3d692912d0417a6781890eef992cef250e8a38d5c1d03045dec7a073d2658a3d17a1f3e9c6d85a58c93ee7b4e19b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ca/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ca/firefox-59.0.1.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "89f93e3681627fc3b170e48f8e2e133609a91eab9eb9026a280359a49d650100bdd482ab0e28c89b80b9a751f5fedd29cdea27c332a5d41ca0d4567f81dba828";
+ sha512 = "7fdf1fa6eb06cc338d06d30e8f1ca432cf1d7930a534c6c613e0f1278ccc70f1e81f74e43cce1e1b865bdcf2b9bf10607d73fb18d51e796c731a735f1e729dcc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/cak/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cak/firefox-59.0.1.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "91c822ca0be8366e452c8c40558f1f8235a214c6925dc36e6ab7ebfd93ac158be6a71cb424d3f99ea169b27466a44feaa4621af7ed48dd6681f4035948868b27";
+ sha512 = "e4e35ea7e81190343337439a3fc95786f318c1f0dc338f2d816a9845b596473067095d0f3b446087ca8dea98dd2aff4db1c8e9a8c1f8fc5d304644b06e0042ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/cs/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cs/firefox-59.0.1.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "a75ed999a18061f53d3ddf7591b6c342d7eafaec68bb14b0144fa790d2919e1c0426cf46e6c1a30be568f9530951f0b42e65ead2a35dfa747d72ce5feb63c5a7";
+ sha512 = "48288a7ceb3fbd579511950b9c6d5fc133c1fcea8435994e804ea423e0cbfaf4780fdd6317bfea37a958f800a79b62792e01c7aa25a908fe62b21684d6fda060";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/cy/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cy/firefox-59.0.1.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "7ca858d8db178d7e7d2cebd69ac4bdcddd76da3fd893003fc90d24fdcc41329526b3c2cb5099b1e0adcb078a86e1a4e1841376b907a042547efc7870d15d9fb6";
+ sha512 = "ae9fc1b0c8d9b46b86b6ec9bcfd97798fbab2410c6ddfab531e364871be70a3a74c48936bfec085220bc5f37397cd83fd31da4a709f337c57a8bd944e635e7c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/da/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/da/firefox-59.0.1.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "1895d076abdb32096a94b8f74a879b9a94b474d6a9f12ccdb5bf6281210529cd2df3b28ae4ec243f79f79a537f50ff2c6e2b99ee847ab799d1c4763942599394";
+ sha512 = "9ea4433a5c295abba639faed9681d68fb8976b1935a131ab763f6ac12f32afab2c1ead3709ad741e04c005b19fe230e13a93334434c76a033df69d6891f960a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/de/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/de/firefox-59.0.1.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "bcf7b391d1bf74b9440455461c68736490b63484f842efd9f8e631430e480858c4b3c540f7072a163f56cea32cda75d568de5a957474a90b923b837227a78cd6";
+ sha512 = "6d864350a270efabd5258157c78ac6b70bb81677939bfd381b6996fb672da240b5c7ef5780819729d3ade763b9eb5a4222c361394e48d9c1c9eafc54795be93f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/dsb/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/dsb/firefox-59.0.1.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "1d09a9229db6879710d36b1e7c9e2aa606fe837e69f0107dafb7c1ad18b4c6cfa0540338aaad2c404f739d8060fea7c317a691c695ed57eca8220081ae43534d";
+ sha512 = "71e5608acee3d2cac48160e71739540c6d94fe5523415d9b639a3b493910347d38f6230afc0febb444e35838e3d402fb5b3018cf437eb48632ca1d8b873ce0e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/el/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/el/firefox-59.0.1.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "767fd415fe7d35ddb7a54925568c334ed693d84208ec2338940e1cce887b80fb552ab51c0b11b2c29e2bcc41a5d8663b761529e5d44e652ad2887fac9778c31e";
+ sha512 = "37ec4073075a29403e4637b48a74bed5c470ad9722c28cfc3e1d7aa5bb63034a0660fcdd2f78d8681ad21b569bc9060be05f4e1cd3eaa3d347ba0d2304075eba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/en-GB/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-GB/firefox-59.0.1.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "35e7f16f208eaa6d5cb3a3135c566913bdfe7c9e47aa5c68afcf805ba64a368f0fee7791b85e07f151ed7610ec70a78b457d047eaa01e2010210bc6885d5bfeb";
+ sha512 = "d2731ba3dad5298e07edb49b608f04784312e6d7e0d1219eb45dfd38a65ef62c1f9b94eff5f97bf35d75ba36cce8a831db6964251873572edc60656a87ea5ff8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/en-US/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-US/firefox-59.0.1.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "4d257cc3fba63195c0d74c1ec5c94768dbb29d5f86bb6e9339af4da20bab24000573b33103693cc32f003d974085c4c028f525668cd3e62481b97d2c665d592a";
+ sha512 = "d56c62b111bb629a30e9de4098a9bfb11b9b437bab572f3e588f4d565d86979c64ec0bd4be4a54b6c1d2718e5cd91094ea046424c9e85952a4ddac2c5de8fc24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/en-ZA/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-ZA/firefox-59.0.1.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "4fde656e27840b0763cadd7c833873b5f012f920ba988953e864a89eaae2fe70482ed32221cbd6e9fff770dd4b6b5d93cfcf5226f70a26c12a3fd66abee232fc";
+ sha512 = "5fd28d0239dd61c54a062a0f6efd5d0f406bcb483cbcc111a631199d430839129dcdba84b4da66d35f1c5052d530da07e3bc8fdd7f177a366974bfa54cb3303b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/eo/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eo/firefox-59.0.1.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "2aa40148adc4a0997d370099b2a624b44d4c995aa2d150c8bbbb91b9bef49f5424a572585faa3f0756588b6013e7369d5bcfeb051ce80182fbad175e3cac2905";
+ sha512 = "327b89fbc100d238f2c1211752ea1a95d2a5c33cdbf8fba35b44ff52f2b63f2d05d84c4c714090693df28c0057e29d047278fef6d4f7e5989ec207495bac3134";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/es-AR/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-AR/firefox-59.0.1.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "da078fe38e47025e9130c0512bcbc31410a8e42cc32037e462b7f5ff185029d160e921577e31f52fbd3e43a1962a07133e1fa3f24f950915bd456a752bd8dc0d";
+ sha512 = "676b58cde2394983a7be06039fcd1150f6e73c95518f5889702cf71ce780c4994629c5452924354ce9826aa5e0726a5de75321295f55004afd10f727d456659d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/es-CL/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-CL/firefox-59.0.1.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "bac5ec18e2f78fcd67533bd8c3a8483a2234f40a9bcfad66ba7772f9b896d16fd492a229e359ab851db829c37cd72604e209cdc9825670301411e5edf5a0a548";
+ sha512 = "274acb52107294b4a65f22114da6e79d4bcb6b06a126002a371c983a926a2ab9882896439f94ee2d2ded5e5955d42cc4a87fc0f16c8960e42d406b773e2a5fd5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/es-ES/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-ES/firefox-59.0.1.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "ce8f14d68c9aad9ac5d92bd8793a8a07d7e4e08c4ea57ff11511a50a2b815e5e3844fa0a4ea5353883db071789eb61a011806fdd8c45237dc48d678ffdf2f484";
+ sha512 = "d23192f6cbbad388d8f3183876a176197bd82ea0bd596ef03935eb020d5d6dbb94692335dbfc1b98e63097b7c66521154b0b3d013cc769c83bd48883646e44d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/es-MX/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-MX/firefox-59.0.1.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "3bb2f44e0a00ce26c527397c639dadb7c9c459e40345359728876eec23084463cb89383e27c97c971dc9a1b0bf2fcea4c1fe4ce37c84d59265e0d7d029cafac9";
+ sha512 = "48da06b532fa91a6b482b57a8cbbdfe3ee938b353433d22af479786129bed784380134ddebbfdc58bf06f5fb81629ec982ec5e1d9b51e92d75bde44014770fa3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/et/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/et/firefox-59.0.1.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "948a05c36edf1662ffb6af1ee090b85408a739b330b81ebc4705ae2fe7803da209ea50bd36da79b48691061bc1eef66213e3a15dbbd958a55527c83d3839210a";
+ sha512 = "71ec513f6b3dba3145c7b424c8f331c2108d0420a75a91045b4dfa4529448923e3ccc8fcb6b90cc01d8acd18e2164755ace78aae2d8da5eec056222b4dcb1b00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/eu/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eu/firefox-59.0.1.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "5f994613b3d6f6489c6d9b8fe13a4bcccf93d5663cc493b22d902a0f34bc1a94b7913f3e0e0d5af19b451f44d8a7117da9588c6fb318b610aa306f49804af2a7";
+ sha512 = "b978c35a4ccf0efb9023f22cb05ae9696c94c8a642e3deded9c44900c84d3c0a58cfbce95aaafe7e99ee108db07a6b07a76813f7c2c3d971757eca817dc10ba6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/fa/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fa/firefox-59.0.1.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "1fc669a66daef43e94e1534d0d25b55b60099e60c437761c7f623529e4d5d39975de0629ecdf4606fc3dd67ff19092e59b7cd14d13426a0c5fbc143c1bf158d4";
+ sha512 = "a67f89767cbeb3b37012c4a1ee64c53e74b30de6c5a14bce2fca15a16ce11a048ccba4e55f88ce7f2a888b7248df51fcfd03e0b0715e826f6b936db953313994";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ff/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ff/firefox-59.0.1.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "5745915b80c46e983845be25a17ac07db8ffce0b688dfaa5329855ec37839a4f00cbfccdcbc88862d51dd97ca7c54c4405190c1d2fc05426412301b3d576f5bb";
+ sha512 = "d7b7d9b86b90d5ca609870313b2533b6feb048060902727ccf34dbbb4f180f7fdd69683e34a7483804a1ba2dae8b264ed3fbff81b065083631b234a2893d4716";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/fi/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fi/firefox-59.0.1.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "5ff972e73f132f11684bae62a52ec0439378442b578c96d55a1768e45cb2cfcccbcfecd484cfe1297a956f8c6be8a1f63308ebe3e2c3f7b508c19c5485a14cbb";
+ sha512 = "7c555f5ebe3fd74eb782cf9f3508c9714844cbaaa3520bc1c3b60bc8d2840874850e5f92bbd1db4f2dcc4cfba211f4aba485307f898f0b47d4b9ec93b4346ec8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/fr/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fr/firefox-59.0.1.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "f7147fcfd193b58d0e777e3563edbbf44a9f4b299ba5e8cf0cf2c6932a69ed04b5ce35d108049175680ca5fe3e5c32a3916ec32d5b5b647f4a10e12ec1161bd3";
+ sha512 = "edf4f0669c732312c27aa40f4aca66aa2a676f9b019cf1d35d0deef2ab4d27f5441ca9aafb3ed896e20538f765de4715b67a546e4364f384e05748cd495b3f0c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/fy-NL/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fy-NL/firefox-59.0.1.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "4a5bb7f0c8035a4b6a0286f242b65e2a025a55a05fd861da84b6e11c1d33756f3c5e831cb665608e1ba403d7b24e7c3a2b51256c272fcd3b8c5af3b8ec17fc4e";
+ sha512 = "58238d57335a18e63230fcbc67f83059e2439528f3d0ac508750dcfad4a2c48296e43c53ecc203258f917f87be78fe50dcafaabf88b6183d5d790761bd21a7ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ga-IE/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ga-IE/firefox-59.0.1.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "d93e6a13384110eb1b8452a9b890ed63ebb96bf1044bda8e0b58ba6c1a19b77ea8e41b4275e4d6d9efa327a6f3d95040336e21e7e6b1109fa2f961409944b40e";
+ sha512 = "fe4865df72926342c139309d34c8d42187b39e098848ff32b7a0bfa21798f2d1e6dc0879dcb17ae150d977942f355c532de7d402fca3226010de8812da0ffbe0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/gd/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gd/firefox-59.0.1.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "d0a1a5f637e59d25a4014be203142ae31a976eaee97591ab3d7a50593c87e235406ddd2136364948c17ee2de9cd8739cbaae6ed817da45e199f81072cfa1dd30";
+ sha512 = "68f94b2511f72a2049c07a20d120fe282a6b85a3f4284e9695ab5cbd6eadd4ee1926bcb133fc7f7394d90d2e3b47e2ee75b9860a49229012c208a144fde5e85a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/gl/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gl/firefox-59.0.1.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "5cfd266d1e9ece838bbd45d6e4de824e8956325c097c9c91bf22ceeb31d5e2e6f4f6b2f14a1a124b91d2bec054f12f0aa57ef4c4374bd5d1cb759202d6767850";
+ sha512 = "24bb4da7b5bd5a8bbb3d5bc8ccdc96ed29d9435ef00c35c70b67e0aec5baacbb910d77daec54fddaae7d68541bf1e9d051f3b1bc80e8467cc78f3c503acc0682";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/gn/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gn/firefox-59.0.1.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "b1fa5b9960eafd78d0a9e1e21f0a25cdb527ea69f088db035ca1da97d3b785a570070b0854b368cf73758437acd3047efcc87e1c7295d8cc34eedc93ff340968";
+ sha512 = "24a6a40ecf5f8ca418c83c828cdc6905ed43afe137a0d59b036e68c093df3d8be679c64d06a71973a891d5765f9c366252959d6c95cfc8a5e9b5b145999526df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/gu-IN/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gu-IN/firefox-59.0.1.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "d86f0baadd1dfe89f753fed204cff18867ced55ee0acdb8228d821a8f324da84df2bc79a75a7e50d6be0c3b1c8bcd4e02f8cd2adf66067ce495e0e7b3908fc24";
+ sha512 = "b36047e9e9957002d33be2c540104dc530d010a646ab8d8516ecffde0b89b9a6f82bf8b94bb3f55fafb002b5c39437b7941d5fb2a0cfdccc5159c2013db1b058";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/he/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/he/firefox-59.0.1.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "da29910b1c43d71a674268ea2f8ca2d5345265a5226dff48292da471d340fa3b1885232ffe93af61148a93b6da04563752598acbdcfabed59534657788909cf8";
+ sha512 = "c4d0195f72ee0afd3aa746d0a1ae5f0f7ef58646f6b4e7bffff8b1c4ac863275881c29fb7cca09ff12765e9902a6bf9404f11b45399919c9873758bbae8d017f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/hi-IN/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hi-IN/firefox-59.0.1.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "f76ad192f1ba83f29f99b0dad313660abf85384803e3d1ee8164d6a917e30b3eec12b64b8a475c27b21134cc394102ac934b283102129947ddb63da3bb8608c2";
+ sha512 = "7bab64a89c03e37add1c6d45756acc3ba19751313f212f3069b9c1938f7533ad1d0cb99b7bca392bb5598e2c10b461f79a47b45dbb77285f7afe12f5de781e94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/hr/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hr/firefox-59.0.1.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "5f58ad50c9c287f3722447f95631c5e80523332c64dc7ec9589a669ae68392abc3a7e8ec7a1f822141cb94101ce437b36b74ccf07b6a9535cc659ac5cffdd101";
+ sha512 = "aa68496e4e82fa5f491b0df056460ab3169be81869248fff0d3ce2a180c9b9963edfbfbe5b051846302ab713f436836dc63d40f65ac10ab185bc12e5942fc71b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/hsb/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hsb/firefox-59.0.1.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "236232af403496442820285b817ea1c0cfd6a48cc9ebf77cefdc4a242e26248e055e5e6dded371e27257d3d1155f2a45fa183311898a8a386308c0d1f2063836";
+ sha512 = "89640b9df29c1fa946351fb74ca61e6f318ac190976f75b73aa56c66f2a67ef88b64c663cbdeea86c30c6644cf7870b59c2f9fa479ac6557e368dd486fbc4a34";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/hu/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hu/firefox-59.0.1.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "e053b499fbf7e4b134f5f1035377e7c639ffc5dcd31fc5df2192733360616b8f7e818e58befb4f597d101d22b2fabc2d550a9b2872205059944b0639270987f9";
+ sha512 = "46a6cdddc77b1d29bf85b40e6e33ab0d6b11a72d425ff59e9156cae7548288f02e3e1a54d296e4e1df1efc1e8e3c252a955c2a5be8bcb9e22d9d0e6e6b12d08e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/hy-AM/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hy-AM/firefox-59.0.1.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "f6fc4218af3dff916c0117dc6c5fca77fb84ae24d3b39430007f1e1468aba74d2bc6340f3bd48737bac5de0cc76ba01b15875ccaf591691256128e473d495767";
+ sha512 = "0697f146aa1e7d0d4aa8be28b72a642c66a15d7e6a2208a4d704ee8559f4f814a8a6cf601c58a7516816c86a374bca5f755d30e11ca668d9f77c8ea4e388f204";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/id/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ia/firefox-59.0.1.tar.bz2";
+ locale = "ia";
+ arch = "linux-i686";
+ sha512 = "107bdfde5633415250fa0cd34ecf29dc39bceb8a5762445b9b5429f4c83690193fe433128799446029f458492d4bb2fea27d7654dcba5a7ce3007bcf40052ff2";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/id/firefox-59.0.1.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "f78efcda46d3f672fb083329f810f174eb5af1da78f601d76a22ae3fa02ad412a383845368d69938fe8d6b3e4e67a86aa111187fed6ea0d8ff4b40f622ebba63";
+ sha512 = "6935a4805b0498d5246f73720e02a022665fa40750937d31ba35d887ab289bcfc65fd122e6c18297443a6488a92a983e00844d384611e04e2e947d20a1aa82a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/is/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/is/firefox-59.0.1.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "9c73ac9d89bd7a45b338b74c8cafac4b27e46bd6bdf8162f21ed7d11e114202b1b5b6789ab1c4a6edca65af257b73ae7a962c9d402e4e59b5ebe08437a3de242";
+ sha512 = "f04f5a86e348802e38593a0c6868a1f0c534113d4511a35ad4e831a2b3d00d8d9f7522e9813230e2abe710708d61c502337de031f934813275e0d81eea8b0379";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/it/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/it/firefox-59.0.1.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "03b905de20e336a49372b51e9e1e977e861359f8e9f515e19151599bf27769cdfe74567e041f3a75b5c8039066686edaad2e2899a3df46513aef64d2963024db";
+ sha512 = "c0db0620e0df091f31ff576d5c87004f4c283a7455afb0098a5de50cfc8bb7879ece4d8525ec1c7f4d0af9d7934d254f114cbded07c8a93126cc6b35d6058f61";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ja/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ja/firefox-59.0.1.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "5769e414b18f095b5f1bc446d8fc68bc16467683f44f4711db9b6d6feaf6d60b801b2760fe6d046c062d30ac4ca7e08d633484a79c64cf218c4df8380d7c6abb";
+ sha512 = "8a705718db55246b74ec0d1baa30e82c18b5898151d4b0ffa7f888cd53cf704444627c47a00af70eb381f9d5e4d163119ac57b23eb316524a4f949a722809d6a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ka/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ka/firefox-59.0.1.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "244446f400a8270a1c01a3abe73da8840d28e2660233bc5f5d34a654fe78099d0634d7a927c2b46f2127c5f0131acf5f5b3c8518ff892b0b3832b71af9df016d";
+ sha512 = "6c0c0f2b67f327e03d874ea02fd084caac2756c21838c9787a03213961bc585db5bb0f2eb068a714dcc028a7d503836f1e7f652f60e08c0e9ab45f496e53b780";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/kab/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kab/firefox-59.0.1.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "da679fa35fd7454c820ff5c2fd461f545ecad30cc13891a026244ffdc92867cec7aad71e53a32f98dc06e3679d7571824467b4f6ab70896167cbd762f71113cd";
+ sha512 = "381d4835f2dfc3a3a553d228e821daaa6966efcb47ca5d7a625813d59db8081a81a46dfd2f246842c937f75121585124c0e7607a9bd0cafb59ab42d88a2c908c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/kk/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kk/firefox-59.0.1.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "ff79b1aa99c452e475b61d7e6c773c8471fcd04d8e9fd3eb5427ad1e09db97ffdfede5f706b8c7a5fa82aad2e89341771318a36be55fbe1761bf4dfa4e944295";
+ sha512 = "82f0e6cbbc9a686be9bf76a0c582800f75edd3f608671faceb813addc0e2fb66a631082e083016118dd3aff8775432ef566319cf9834a8aaa09ed6f774ddc34d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/km/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/km/firefox-59.0.1.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "cf073c84edc57468a28fb5a1d7c8efd1a7ba00e09783e6660374423a466aa9260e314d6f94140aaa3d5b42985fcfb1295edd0cb3b093487998eccb516c6f9220";
+ sha512 = "7b1e81cf13051609897ad632afa18709dc6d9bbc66a6b7289188abe2f04a9bd1be159aa08342ce746930fc0cb50b19f0ff8abbea695787433acd25ad1cb48c58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/kn/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kn/firefox-59.0.1.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "8e7727b77e6cbcad8c5c87aa12d983b18ebc79dca7b727ce20320a7e384b23281968542eae9ea3207cdcc39d2eaaefaf4c90866071b08f9f944c26e6fd6383d4";
+ sha512 = "c17d8eba5bd0c1923f958dbde4a2fca62c423213b249fa1e2829361ade947aad32cdbe257cccf5d5160dd36033e827a78c6934db6bf96f166152b967a2c5d07d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ko/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ko/firefox-59.0.1.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "9f7db828c0c1525d30558b543ac0cc6306ef34d83ed6fd3a25f5899b3fc6e6e2b8355f22b6fcd0f58c8bf7c634243ef878f67c039243b3828be43beff68c7938";
+ sha512 = "c34c899ed8628829dcfb48b80a8b4022db9fadafc4edac4e227849ee58e06b0a9cd4fe089e080ff65e70177f7068686dab678f2e7b04dafbf1338caaea779b62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/lij/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lij/firefox-59.0.1.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "9a308c8f7d2000608adf33954ccc2b82b92275563096f801cce4ded8333d786a1c879833f6768b9749dd1d718b33586b84e180971b92ff29387ce53741028381";
+ sha512 = "be96ae1d90a0e5f2308af47cae8bef7e028f01ef156bbd0497e578a0440a7362b18c63b36806ab4f1f2f1c4f8d6c9e5d9d03593ce38d1271809745cd2b266584";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/lt/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lt/firefox-59.0.1.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "c1a57ee983fc10155813431845a1ebb46071da4748a44b2bb4578ac6c4e1d743341df5a8ed0c0c02343c360bcd6f50b13b2ab62b760e079830ea0a82d781b0de";
+ sha512 = "b141b12385d040596085c328ce95b4ac741ccaebe1e950f00ebe09e96a2ea5b5ade4c5438f9b622423ef658f84659bab414eb467227cd9a664542fe76471d1f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/lv/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lv/firefox-59.0.1.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "64fd05ef07e08677efff3f57f2c863bb1b070e9dcc088fa7d5217b59fee9db5b9af58086088b488c34734e3a6e53c683d26a8c5755b71e7af17b8a515854edfe";
+ sha512 = "ca296c7d74bfb0b4aa59da3f82dfe32b7c6564953c9850513bcb429ad68b6c867112eef7b7a2f9e1eb0bb8b7baa5f0f4caf4c9da311729e21976d70f8847bf44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/mai/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mai/firefox-59.0.1.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "ca33c7b7f812f6cb8c9b56e969c7f67ade456d9ac6555ffbebd8096e3083d6afd3c1e0bb86ab14ec244c1cb6aa87c55b15d34d06ea0c994867f9e52b38389422";
+ sha512 = "378b32c8ca6cf0319c54dc239bfcd9edc8b834a5ecbe8c990ff8d7f7f28a89a30c53384c413352219309bf537dc4b0961ec0ea7eb2c1a4977b062c280ec130df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/mk/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mk/firefox-59.0.1.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "ce4e7d7693e0229a83aab9970d1678c621b58dd481d4c6aa4ffe2d478f15d72984968349ad3e4febb38e96c30847631f0bdd7abd8eb09dfcb2d4092e1539ba97";
+ sha512 = "7925c3a6beca9e35cf301dc7b4ebb059fc87cd710e0243c71b65c55918d10ada853b4a4b8a1c7aa0e0c89bd8e9cd4414d5a162a430cf2222e3d5c0e824b96c73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ml/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ml/firefox-59.0.1.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "0383725a278add1e0b78c8c75bb7d541967726d90bcf7264118349615e96ab9db83b8b363bc68f1e9fb220078385de4f92f726555c10c8793aa1a190d5869dea";
+ sha512 = "aa291245bcd21bd1e1a08f1b84346ec61311df8a9fa6f9b4af5b9cc6fcac6f332472cfe009f02faa9d842383c5e0588dd7705eaffb37c030f5e20951a4c0b2f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/mr/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mr/firefox-59.0.1.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "f50849e45b52a34b7cbb02edf3fefdea3c9a9c5a60f8517cbc852cdc5209fe281efd7d182a53e4a793447478d32a79bf529097f1041165d6b1ed37459e4b02bd";
+ sha512 = "3bf781cc015ff35393f2d30244bc7a8c32a0ac789b0eb9da9616b1d58bb211982db2b03873a91d500f3972d0ddc32383a8e77af4b2f453d2fb8dccb71c7532c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ms/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ms/firefox-59.0.1.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "f8ec236546a7dede2b502a254c010724c636b69a1f4b7dc73e2684f9d314b1e4d79cab8a0f9ba2a1942c6afbe0b44152c133bb5c94cf8d1f0ef33c08df38a1dc";
+ sha512 = "705665d30a04883d1fe5791348edc2fe0aa1554cbf2932901b99ef1f4334a1ea9658574fc02c05ee64f6b2e3e8d487b8520b1f1963f285f6475af1334160e5b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/my/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/my/firefox-59.0.1.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "ffae5d1763fa88c57961c3d11c71cb1e3540f109bd553ef0ef86eb5537b3599154943365c7368f4f06a1d5911aec17c52013bc414d899325a5dea8aaa9b92817";
+ sha512 = "b1272fc81d358c3386cbdebad0595c7595b1d16dcee3fdef5f49776d6607f8737bdd4807140989e16873455df4a8746e00b8d3548f60cc9b22c282a5cea5a136";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/nb-NO/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nb-NO/firefox-59.0.1.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "c8e569886b7470c1856e6b3b6fb756b05d14b21a57dd7337d490d5c7cacec603e9670ca3be8d34b1e8194ef053232d5d758e824a48b66205a5e26698751b0fb2";
+ sha512 = "b44fc5f73c1dc3625ce50c9f6058f56f874a91e04178bb179667c6fde462a2436c6b35d58155ccabf340742f03d0ac1470b56fba405a13caaec4075567b3b8c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/nl/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ne-NP/firefox-59.0.1.tar.bz2";
+ locale = "ne-NP";
+ arch = "linux-i686";
+ sha512 = "bb063e310856adfbf3fe433d60d4fa19e8d5ace617064d334faa595cffc77d39d4e4e303b82858af8a956d43956928c7fcf70f319ce4059dae9b750d46ee3cf7";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nl/firefox-59.0.1.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "d55277a2e99a63e0a2e7343bfb5250ee70443bec1be8629b858ee17e574e0124d37c6d15a03eea58b0f9122ce17042af94498430517cacb0e59058d53f251aaa";
+ sha512 = "64f3cfc10133c3fb0e566422282764679f9d1587b1aa742f24e9ba77f1f45e2c1dde4cb9b97d0eb3895b745cf2037a6dda9bcec469fce3b1ee125967f2869380";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/nn-NO/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nn-NO/firefox-59.0.1.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "ed01cae9dd21e46a6fae031994e38980b72fbad6dc521571f5d21d8a23c9a2b4f4606ec92435d2aa2deb441b7f9e15d61f443fc6e557bbbc6b36d4c226f2ace3";
+ sha512 = "621c8767c5874fe530a0b4775df12be89c778915ba1f0d46271390c2208672d4211a9de501449458e88429483bf1ce453db652256c59308b3d42aa294d36649b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/or/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/or/firefox-59.0.1.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "2007dcbb344395d80ba05a8a4f87c2f7c19254966cfc08c728ee7363cb763a93c50d616756ab3e601d7a98114e89a6bf97e76e88fbc1ec48decfe028f5aa04b9";
+ sha512 = "3c271c3e01611d8e046d44fc90ea3a13cc974ad3fe08aeb1c3fa5f18f104dd1481a5a5c9273bf21a29b7aa15f49791584b32bacd26063ffde1ea4846166d4225";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/pa-IN/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pa-IN/firefox-59.0.1.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "bcf6175628c4ee73746ec8337fe3dd2ab329ed971ee3044684d5ea92bb500b4c708dbed46c97848e56026f00cf26659402cf2f213e106b0b7eece28b87b26ff5";
+ sha512 = "b0f6248a44d247c7affc35c2c4e664620e6ad5b83c4135d66f803245180052e77fa84db9d05b96475a221d5c2c288b73ad23cd7c717cabf2557282d72731cf4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/pl/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pl/firefox-59.0.1.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "b8f51a95786571aabf58cb81e4cd52edabfca23686a481157a11de47adbf14cb39c317c02e9f4ec313bfe282f326d70e531f83735095c51df40ed58ebf068a7f";
+ sha512 = "75726fff593b0143a192cf3947f6c83a30c77552b227ccf2e5d0869b7a48dde22b1d555fee3baae8398b5cab58e1523ba7e15db6e237ece085b920f5fbbf4094";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/pt-BR/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-BR/firefox-59.0.1.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "f53076ea2a933f2c30aa93e222cad9a73d981ff0e7ca9fb98df0f1db97ea4393a1b5a37388549e63ebf7a7f44fcaecace20725ce6c7cbb33626de9c9754ab999";
+ sha512 = "701ffb3a4dd31cb6cf50a5523a384f222b6578c2d2a2870dc1e1cd985137dc9b78e81de092b1ebaee0108164bebc94aa1a8ea12981c02d49f885d8d6c9c8281c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/pt-PT/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-PT/firefox-59.0.1.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "3032b7338b6540086edc86a8c5f1298ad546b77982c02013ba96df564c4c99670db6eefffac8f56f540fee6c3a8887e81fff5de2391cb5b29a8429f72b9ada64";
+ sha512 = "a978e219a044b3e507ff5d907626939f8f9d0c3c988662ccdf394e613ca1127b2714c9973d90bd7d835e2af574d115b495c277f2d668142155b54e9098a285ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/rm/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/rm/firefox-59.0.1.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "7dcc1f088c20687d322f83e6eece96d48fd43a63cfa44816e729e623f161867af3725ee88fe0904ea826640c89f0c84d6f46d7bf847dfef51a671dd2dfc2c044";
+ sha512 = "f0f3d5e022793bc92cc84fa5f8b413fc1ae1ec9da126386283297b41e47d722b4399722f69a05aac216d46d1a1ee90a1b6fb57194284c157e68c84121d4d989c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ro/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ro/firefox-59.0.1.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "b8f6f3f5b10755ec2b13fb68d1add7cbdabe799dca9077036be3750c7f4f753c89c5a0382e45f1b02da5b3842ab095153ec1f48029515f6513d35bb28012be02";
+ sha512 = "4995938aeb22e69a6cd8a6b37b479e9d23a140b73ce2e5c4e29e6ff4f34d702db426346a596e207c2dd2e4d1bc6f1dfea00bc7ab7a2eae763ffe9fcfbf3e00b5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ru/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ru/firefox-59.0.1.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "7aaec71a4dd8588ad432ccd2f8a44aafe0d5b502f2a15b11e25065c9a04cce5c76e48492f99c6a14ead274d6180564cca3eef7d9bb9e98cee2960d0433cbef71";
+ sha512 = "32ab4f1bca6a51d204c54f4485d9642e8ccbebc008cd56e0cba55ea3a5ae5aebca050fe1e8e2b2a7fdf04480ecbab04515c0944c0d5aae0b81e350370cc2cabd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/si/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/si/firefox-59.0.1.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "6d9032566a45fab13a685258f94bbe9eb937219655924224873635a41fae3d9973f762eeba206b72f3990b5517a96cd984464c86d30618130c1e3429ccd0b00b";
+ sha512 = "c2407c652b1907b3508f655c1bc831ecda75b8135dbfcaa1aed1a509a65fe2f21f22720bc80fdceede1e77c86fe39d0badf8d23f37ae48310df132c115bca448";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/sk/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sk/firefox-59.0.1.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "6f5359765802799631ca6654a32f74bb27fcb8d81bdc23cfc912805fd10ad9ecd80ac0d24f23e4fc28bcb104891a0846ce7be1a1fd80d7b91e1b3b89f3644c8a";
+ sha512 = "f2a99e4f688a3384d23d36a87017ba0b5f28bfef2152867f8e8c8ca134a26e26052339c6edca1c24dfe5db5ce09d194675cac364a4918e46ae765d30ae3ab8d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/sl/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sl/firefox-59.0.1.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "d18cb826761333b7fbf1e7d056cfdc4bf2871f39da0ff93d89efc97e808dd79bb8837b9a2656688bd1658737933d60d5cb069d6ce832e72a7d83836887672e7d";
+ sha512 = "f454a9cf5a2e1528a546a82d6c2a1f4f2a668bd2b56633216d3955ec5c1c89d8734d8cdb0ee9306698aaa5060bc5f4797a9e0fa1c8967a00fd204eb035a8ba29";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/son/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/son/firefox-59.0.1.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "90e86f1cc8b35d28e96f417589d69f2ca016495297d54c74d0243daeeb39b9564cb56e4b66685ba708463284b004b17bb157bd55bde3cc962457d56cdd1dcee0";
+ sha512 = "4b020b9c0f6e9bd594afc47900025dbd2223e50668f9f43f139b00f5534487806810bc933ab0258f5fcc8c277f7c5d2411d8605dd0fbae893f5809f9cc400c22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/sq/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sq/firefox-59.0.1.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "5c90e9dd76aceaf1ca6995349ab2cae5425764eef75303b3d803544d156b67ce5d353429f3acb15b55d32d5a9f37c6f753dd1a1081cd073ea27b3f88972928ec";
+ sha512 = "959f10db2a46cd8616686618d55119b01f0ac8e00e79093a949788ac903b6d3845a919a420d7517813e28b1227bd6f70fe8be9df39de8406743ddd7c65865e28";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/sr/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sr/firefox-59.0.1.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "32cc44f8aeafa861004326dde6ea99690be06c4960436c4eece48353b4de11b1691d347628ee239d7bcebfed14bf1da20180c04ffc5d62096172cbb183e4ad3f";
+ sha512 = "407e9337429d644ed75d3b2ae4953c5da3c6994e2f2ef2320becbde68662f16c711c987d4dfe2f0a784833b3c721c62cdd0080cdc1ed45a099b0c7b256411b85";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/sv-SE/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sv-SE/firefox-59.0.1.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "c9d0f7eb815474fb866e519a00b6adbe47b6e86b6ee16af3d3d72ba9ea52eac202b3c36aad3245abf25ca88845c65d079a1fba219dd77a5da161a667c06676ed";
+ sha512 = "f59c60fbeb82cb56ddd447d4c3d4125ea3a98e95a74e7802d73eac25489f2acd4566e01397b9ee6c70260779bb895fb104ace61f2ce9268b4f3f3758d686de1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ta/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ta/firefox-59.0.1.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "af662b476aa060895e50cb43d49d2b509af24ed3294d5f15d1a5c5d7f00021cc60bfcb77476375e0146f6d247243e2f3701a271a246f08a3ef408cd9cac42753";
+ sha512 = "3ddc5a37d37a7db421f46d1d66d52197473f0e73c5c633ae52f12caa473ad5a4e73612a57bfc8d5d212c2b573b8308fb1b7697f78e153094230f8da64f074b64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/te/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/te/firefox-59.0.1.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "e7d7fd6b38d654c72b34b186fea49b7707b2051600d87628a3a8ea02c48bbc810153928bfd556bb88aa9134c1bdac7fdd6f47954519391bc83e478ea5bfedac2";
+ sha512 = "c60cd73ec1eb27f9ab5e4ea63d3b4dc691c5c85d57a486ea408cda99f0c44c6c17e7d8e2a1de585dab1d4717bcdd7417b38b785c6f37722a3056a701163917b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/th/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/th/firefox-59.0.1.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "6bc2827c5de337c7fee9ac97ae31911361661ce107231da80ccc13afba8606944976003bd013ca01adf91c5282dbb956791b47e94363c0f18f25eb40159b2871";
+ sha512 = "0ec9c7b5143268d1266e939e5ed2617edf41c99e5bddf2d4240f49b1ee2822c4c6b269a24aa607623bc82a54b501cebc1f924a9c87fac21f95108089495414f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/tr/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/tr/firefox-59.0.1.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "b03f28b336b1c59ba4a2f5b061f950e9e0491ab6b7173864b3dfb5588d52c397120dc86e9a8beaea47184c6b519ed42380ee6d94d30edd02b8ea8166e9e9f33b";
+ sha512 = "ecf26013bc9cc189c89780c4b8b01c4f25dbc8f3f6c7bf924f528fe06ebf8c4952133e8446b3e0c8a09e3fa9d84b09883b3d4665d27ca7c028d90d3fe3d7fc1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/uk/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uk/firefox-59.0.1.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "bf9f67458a280a1ce7c27119680a5b5d37c2aeaef3fc79967a61d0e06b0a688faf3c591d843b8783eac203b60886d298c68d6bf2cd318b982fa91abd98551236";
+ sha512 = "c8595f21e86c4d1124b882ae4f1be026756b7cecb3ed5a02b4c723c37a999e2829881fab5d6349485078965881a91cfaf28bc926b5e96245e1771a9160adec76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/ur/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ur/firefox-59.0.1.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "069ca0a5ccf90f6a8be96b2db90534473045241abb55be13611ddce7815d37db4cf82fbeab753b3c04a898574a3ca6ecf954e30b860b6d70395c0b24ac9b8a1c";
+ sha512 = "8d7be769c17135ad58a120cba472565597ddf05893f061e1efe2d2cf57c79bd8ec6f6a55e3271773fbc6a452e1794979cc619cc1a41d1bb13670b4f1badf4bb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/uz/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uz/firefox-59.0.1.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "45b1f0eecf3b6c05be541d764608964db65861f937e94ac011d10befd0e71c7942658a5a02c0a482a22abd164730dffb45b28aa9b8ca4ac87a21a32050b183a2";
+ sha512 = "cd75b674a8ff62be2abc78cfa25873950914a7ef0fb6b652c483486c8dec888bed9276c2c7b323e5787ce802583e1d140d9414e7af9ce3ffc736e38fb1521177";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/vi/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/vi/firefox-59.0.1.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "4d1c3418dfae7b8929ab117efb1febca6c7569f163ae0d805a27592c00aecdc9f7956aa56c01e898cdc09bffc5d9a55654d5d98712a9ab685ac1f6061c03680e";
+ sha512 = "c5f9cb57563ff819236358c0ad18992f2c3f8b80decf690ec3945b029e2dbd6bc6f564af2a5bb6394eddb8a52ed0a0cab446cbd9c49284de821a814b766b60b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/xh/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/xh/firefox-59.0.1.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "a79e103d319ed72e28b011a658436a3036d1f280b733db2433e36c6c25bd5192a8e44527f591b92e0d6836ec17e23decb9d41ec50623e051484e7fbd20733cc1";
+ sha512 = "9f96977530f745eeb1cdb14b40bf657e9a3d9e322b250fab799b37d801665fa47a47aa88c1f28998a29ed69523e42f300b69e008f5d2ff7f166e12b3c1fb4497";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/zh-CN/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-CN/firefox-59.0.1.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "d27040490378d8c61d68359715ebfc06bbcce8637936fe399b42c4e38c0935f0bdad34e379c852d00961c22fe97d2b43c0214cc951855acb41cc5c7ef3824e8f";
+ sha512 = "5f3cbcfad55017b30e72ec4fb266d5b9f822804cee329c67c5998ad44a9fb6852b32764179586862cff1dc311c9a9a84259894282d57b5d2146c1d4de86442e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/57.0/linux-i686/zh-TW/firefox-57.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-TW/firefox-59.0.1.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "99efd3df2a3dc1a3e4950add00c6768d694b6d349ca7c36c7c7ba5c53650fb553942795923c40c7bc0fadf76e209e9b5f357ab9648f57bc3ae1f30c85878fb65";
+ sha512 = "3f48bc028239f8cc8bf2f818129b1509f0e8d895087e8e7b16375df447e0d0ba7b543679a808aa579fc92bf2fc4af6c3797eacf03c905ce3714eed897a8b8f86";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index ac3f7d1380c5..df928f88c386 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -37,7 +37,7 @@ in writeScript "update-${name}" ''
# versions or removes release versions if we are looking for beta
# versions
# - this line pick up latest release
- version=`xidel -q $url --extract "//a" | \
+ version=`xidel -s $url --extract "//a" | \
sed s"/.$//" | \
grep "^[0-9]" | \
sort --version-sort | \
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index ccf762afbec3..e8e1862d7f83 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -3,9 +3,9 @@
, isTorBrowserLike ? false }:
{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL
-, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
+, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip, makeWrapper
+, yasm, libGLU_combined, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx
, cairo, icu, libpng, jemalloc
, autoconf213, which, gnused, cargo, rustc, llvmPackages
@@ -29,22 +29,37 @@
# Set to `privacySupport` or `false`.
, webrtcSupport ? !privacySupport
-, googleAPISupport ? !privacySupport
+, geolocationSupport ? !privacySupport
+, googleAPISupport ? geolocationSupport
, crashreporterSupport ? false
+, safeBrowsingSupport ? false
, drmSupport ? false
## other
-# If you want the resulting program to call itself
-# "Firefox"/"Torbrowser" instead of "Nightly" or whatever, enable this
-# option. However, in Firefox's case, those binaries may not be
-# distributed without permission from the Mozilla Foundation, see
-# http://www.mozilla.org/foundation/trademarks/.
-, enableOfficialBranding ? isTorBrowserLike
+# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
+# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we
+# have permission to use the official firefox branding.
+#
+# Fur purposes of documentation the statement of @sylvestre:
+# > As the person who did part of the work described in the LWN article
+# > and release manager working for Mozilla, I can confirm the statement
+# > that I made in
+# > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006
+# >
+# > @garbas shared with me the list of patches applied for the Nix package.
+# > As they are just for portability and tiny modifications, they don't
+# > alter the experience of the product. In parallel, Rok also shared the
+# > build options. They seem good (even if I cannot judge the quality of the
+# > packaging of the underlying dependencies like sqlite, png, etc).
+# > Therefor, as long as you keep the patch queue sane and you don't alter
+# > the experience of Firefox users, you won't have any issues using the
+# > official branding.
+, enableOfficialBranding ? true
}:
-assert stdenv.cc ? libc && stdenv.cc.libc != null;
+assert stdenv.cc.libc or null != null;
let
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
@@ -58,9 +73,9 @@ stdenv.mkDerivation (rec {
buildInputs = [
gtk2 perl zip libIDL libjpeg zlib bzip2
- dbus dbus_glib pango freetype fontconfig xorg.libXi
+ dbus dbus-glib pango freetype fontconfig xorg.libXi
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
- nspr libnotify xorg.pixman yasm mesa
+ nspr libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx /* cairo */
@@ -85,23 +100,26 @@ stdenv.mkDerivation (rec {
rm -f configure
rm -f js/src/configure
rm -f .mozconfig*
-
- # this will run autoconf213
+ '' + (if lib.versionAtLeast version "58"
+ # this will run autoconf213
+ then ''
+ configureScript="$(realpath ./mach) configure"
+ '' else ''
make -f client.mk configure-files
-
configureScript="$(realpath ./configure)"
-
+ '') + ''
cxxLib=$( echo -n ${gcc}/include/c++/* )
archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
-
- cd obj-*
'' + lib.optionalString googleAPISupport ''
# Google API key used by Chromium and Firefox.
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
# please get your own set of keys.
- echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga
+ echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga
+ configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga")
+ '' + lib.optionalString (lib.versionOlder version "58") ''
+ cd obj-*
'';
configureFlags = [
@@ -128,11 +146,14 @@ stdenv.mkDerivation (rec {
"--disable-gconf"
"--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
]
- ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
+ ++ 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.clang-unwrapped}/lib"
+ "--with-libclang-path=${llvmPackages.libclang}/lib"
"--with-clang-path=${llvmPackages.clang}/bin/clang"
]
+ ++ lib.optionals (lib.versionAtLeast version "57") [
+ "--enable-webrender=build"
+ ]
# TorBrowser patches these
++ lib.optionals (!isTorBrowserLike) [
@@ -141,7 +162,7 @@ stdenv.mkDerivation (rec {
]
# and wants these
- ++ lib.optionals isTorBrowserLike [
+ ++ lib.optionals isTorBrowserLike ([
"--with-tor-browser-version=${version}"
"--enable-signmar"
"--enable-verify-mar"
@@ -151,7 +172,9 @@ stdenv.mkDerivation (rec {
# possibilities on other platforms.
# Lets save some space instead.
"--with-system-nspr"
- ]
+ ] ++ flag geolocationSupport "mozril-geoloc"
+ ++ flag safeBrowsingSupport "safe-browsing"
+ )
++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio"
@@ -159,7 +182,6 @@ stdenv.mkDerivation (rec {
++ flag gssSupport "negotiateauth"
++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
++ flag webrtcSupport "webrtc"
- ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga"
++ flag crashreporterSupport "crashreporter"
++ lib.optional drmSupport "--enable-eme=widevine"
@@ -170,6 +192,16 @@ stdenv.mkDerivation (rec {
++ lib.optional enableOfficialBranding "--enable-official-branding"
++ extraConfigureFlags;
+ # Before 58 we have to run `make -f client.mk configure-files` at
+ # the top level, and then run `./configure` in the obj-* dir (see
+ # above), but in 58 we have to instead run `./mach configure` at the
+ # top level and then run `make` in obj-*. (We can also run the
+ # `make` at the top level in 58, but then we would have to `cd` to
+ # `make install` anyway. This is ugly, but simple.)
+ postConfigure = lib.optionalString (lib.versionAtLeast version "58") ''
+ cd obj-*
+ '';
+
preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) ''
buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser")
'';
@@ -189,7 +221,7 @@ stdenv.mkDerivation (rec {
postInstall = ''
# For grsecurity kernels
- paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container}
+ paxmark m $out/lib/firefox*/{firefox,firefox-bin,plugin-container}
# Remove SDK cruft. FIXME: move to a separate output?
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
@@ -201,8 +233,8 @@ stdenv.mkDerivation (rec {
postFixup = ''
# Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712.
patchelf --set-rpath "${lib.getLib libnotify
- }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \
- "$out"/lib/firefox-*/libxul.so
+ }/lib:$(patchelf --print-rpath "$out"/lib/firefox*/libxul.so)" \
+ "$out"/lib/firefox*/libxul.so
'';
doInstallCheck = true;
diff --git a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch b/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
new file mode 100644
index 000000000000..1c3c32948944
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
@@ -0,0 +1,26 @@
+Yep, it's a "return code was ignored" bug.
+diff --git a/media/libcubeb/src/cubeb_pulse.c b/media/libcubeb/src/cubeb_pulse.c
+index aaaaaaaaaaa..bbbbbbbbbbb 100644
+--- a/media/libcubeb/src/cubeb_pulse.c
++++ b/media/libcubeb/src/cubeb_pulse.c
+@@ -473,6 +473,8 @@
+ static int
+ pulse_context_init(cubeb * ctx)
+ {
++ int r;
++
+ if (ctx->context) {
+ assert(ctx->error == 1);
+ pulse_context_destroy(ctx);
+@@ -486,9 +488,9 @@
+ WRAP(pa_context_set_state_callback)(ctx->context, context_state_callback, ctx);
+
+ WRAP(pa_threaded_mainloop_lock)(ctx->mainloop);
+- WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL);
++ r = WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL);
+
+- if (wait_until_context_ready(ctx) != 0) {
++ if (r < 0 || wait_until_context_ready(ctx) != 0) {
+ WRAP(pa_threaded_mainloop_unlock)(ctx->mainloop);
+ pulse_context_destroy(ctx);
+ ctx->context = NULL;
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 440119358de7..19a16dfe3a22 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,23 +1,32 @@
{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }:
-let common = opts: callPackage (import ./common.nix opts); in
+let
+
+ common = opts: callPackage (import ./common.nix opts);
+
+ nixpkgsPatches = [
+ ./env_var_for_system_dir.patch
+
+ # this one is actually an omnipresent bug
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
+ ./fix-pa-context-connect-retval.patch
+ ];
+
+in
rec {
firefox = common rec {
pname = "firefox";
- version = "57.0";
+ version = "59.0.1";
src = fetchurl {
- url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "bd99ff97a2a6f824e6fbd36fd00193903159e309506b1e6945dcbc43a17a95aaa54a05f32131c56872e8860878ba6063008667955550f03aa8c7084f834d14fc";
+ url = "https://hg.mozilla.org/releases/mozilla-release/archive/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2";
+ sha512 = "3da3gmfv2aalsbsx15csas4mwnvlliy1q081sd2riz3nvxr7qyrdx1qvxj4gdr97wlmvz7mig9djhh5gwx7ddah5hfhj23cvccmw6jw";
};
- patches =
- [ ./no-buildconfig.patch ./env_var_for_system_dir.patch ]
- ++ lib.optional stdenv.isi686 (fetchpatch {
- url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
- sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
- });
+ patches = nixpkgsPatches ++ [
+ ./no-buildconfig.patch
+ ];
meta = {
description = "A web browser built from Firefox source tree";
@@ -32,14 +41,13 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
- version = "52.5.0esr";
+ version = "52.7.2esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "fe724108ba538e590b87a5c1b817471d3cca9b038ba2755642e4d7b8ebb6174322be1fe074f24ef181946f9a027106b50b500d2fa541d8a99ef44905822eda18";
+ sha512 = "e275fd10fd32a0dc237135af3395e3a1ae501844632c973ff3b9bca1456702ee36dbee99fc57300598403c924c0db63bd62a199845c8f4a2e29db5d1e5973395";
};
- patches =
- [ ./env_var_for_system_dir.patch ];
+ patches = nixpkgsPatches;
meta = firefox.meta // {
description = "A web browser built from Firefox Extended Support Release source tree";
@@ -82,15 +90,18 @@ rec {
It will use your default Firefox profile if you're not careful
even! Be careful!
- It will clash with firefox binary if you install both. But its
- not a problem since you should run browsers in separate
- users/VMs anyway.
+ It will clash with firefox binary if you install both. But it
+ should not be a problem because you should run browsers in
+ separate users/VMs anyway.
Create new profile by starting it as
$ firefox -ProfileManager
and then configure it to use your tor instance.
+
+ Or just use `tor-browser-bundle` package that packs this
+ `tor-browser` back into a sanely-built bundle.
'';
homepage = https://www.torproject.org/projects/torbrowser.html;
platforms = lib.platforms.linux;
@@ -99,26 +110,6 @@ rec {
in rec {
- tor-browser-6-5 = common (rec {
- pname = "tor-browser";
- version = "6.5.2";
- isTorBrowserLike = true;
- extraConfigureFlags = [ "--disable-loop" ];
-
- # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
- src = fetchFromGitHub {
- owner = "SLNOS";
- repo = "tor-browser";
- # branch "tor-browser-45.8.0esr-6.5-2"
- rev = "e4140ea01b9906934f0347e95f860cec207ea824";
- sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
- };
- } // commonAttrs) {
- stdenv = overrideCC stdenv gcc5;
- ffmpegSupport = false;
- gssSupport = false;
- };
-
tor-browser-7-0 = common (rec {
pname = "tor-browser";
version = "7.0.1";
@@ -128,14 +119,48 @@ in rec {
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
- rev = "tor-browser-52.3.0esr-7.0-1-slnos";
- sha256 = "0szbf8gjbl4dnrb4igy4mq5858i1y6ki4skhdw63iqqdd8w9v4yv";
+ # branch "tor-browser-52.5.0esr-7.0-1-slnos";
+ rev = "830ff8d622ef20345d83f386174f790b0fc2440d";
+ sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5";
};
- patches =
- [ ./env_var_for_system_dir.patch ];
+ patches = nixpkgsPatches;
} // commonAttrs) {};
- tor-browser = tor-browser-7-0;
+ tor-browser-7-5 = common (rec {
+ pname = "tor-browser";
+ version = "7.5.2";
+ isTorBrowserLike = true;
+
+ # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
+ src = fetchFromGitHub {
+ owner = "SLNOS";
+ repo = "tor-browser";
+ # branch "tor-browser-52.7.0esr-7.5-1-slnos";
+ rev = "211b2be3fea45a450915b0addcd7783aa939e24a";
+ sha256 = "18gv4r8cjf89mamjh93a856a5yfp7dm3jrk8g05w89vxb3lrl74v";
+ };
+
+ patches = nixpkgsPatches;
+ } // commonAttrs) {};
+
+ tor-browser-8-0 = common (rec {
+ pname = "tor-browser";
+ version = "8.0.1";
+ isTorBrowserLike = true;
+
+ # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
+ src = fetchFromGitHub {
+ owner = "SLNOS";
+ repo = "tor-browser";
+ # branch "tor-browser-52.7.0esr-8.0-1-slnos";
+ rev = "58314ccb043882e830ee9a21c37a92d6e0d34e94";
+ sha256 = "09gb7chw2kly53b599xwpi75azj00957rnxly9fqv8zi3n5k2pdb";
+ };
+
+ patches = nixpkgsPatches;
+ } // commonAttrs) {};
+
+ tor-browser = tor-browser-7-5;
})
diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix
index 0f4651228069..997bccbe9a95 100644
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@@ -22,13 +22,15 @@ writeScript "update-${attrPath}" ''
# - removes trailing slash
# - sorts everything with semver in mind
# - picks up latest release
- version=`xidel -q $url --extract "//a" | \
+ version=`xidel -s $url --extract "//a" | \
grep "^[0-9.]*${versionSuffix}/$" | \
sed s/[/]$// | \
sort --version-sort | \
tail -n 1`
+ source_url=`curl --silent $url$version/SOURCE | grep -o 'https://.*\.tar\.bz2'`
+
shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1`
- update-source-version ${attrPath} "$version" "$shasum"
+ update-source-version ${attrPath} "$version" "$shasum" "$source_url"
''
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 4c3647bd4481..8d08eceb1692 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -2,13 +2,13 @@
## various stuff that can be plugged in
, flashplayer, hal-flash
-, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2
-, supportsJDK, jrePlugin, icedtea_web
+, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2
+, jrePlugin, icedtea_web
, trezor-bridge, bluejeans, djview4, adobe-reader
-, google_talk_plugin, fribid, gnome3/*.gnome_shell*/
+, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
, esteidfirefoxplugin
, vlc_npapi
-, browserpass
+, browserpass, chrome-gnome-shell
, libudev
, kerberos
}:
@@ -36,6 +36,11 @@ let
gssSupport = browser.gssSupport or false;
jre = cfg.jre or false;
icedtea = cfg.icedtea or false;
+ supportsJDK =
+ stdenv.system == "i686-linux" ||
+ stdenv.system == "x86_64-linux" ||
+ stdenv.system == "armv7l-linux" ||
+ stdenv.system == "aarch64-linux";
plugins =
assert !(jre && icedtea);
@@ -47,7 +52,7 @@ let
++ lib.optional icedtea icedtea_web
++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
- ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
+ ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell
++ lib.optional (cfg.enableTrezor or false) trezor-bridge
++ lib.optional (cfg.enableBluejeans or false) bluejeans
++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
@@ -58,6 +63,7 @@ let
nativeMessagingHosts =
([ ]
++ lib.optional (cfg.enableBrowserpass or false) browserpass
+ ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
++ extraNativeMessagingHosts
);
libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
@@ -65,9 +71,9 @@ let
++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
- ++ lib.optional (config.pulseaudio or false) libpulseaudio;
+ ++ lib.optional (config.pulseaudio or true) libpulseaudio;
gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
- gtk_modules = [ libcanberra_gtk2 ];
+ gtk_modules = [ libcanberra-gtk2 ];
in stdenv.mkDerivation {
inherit name;
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 9a4d90701b28..d2d26190ce05 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, patchelf, bash
+{ stdenv, fetchurl, patchelf, makeWrapper
# Linked dynamic libraries.
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
-, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped
+, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk
+, kerberos
# command line arguments which are always set e.g "--disable-gpu"
, commandLineArgs ? ""
@@ -32,19 +33,18 @@
# Only needed for getting information about upstream binaries
, chromium
-, gsettings_desktop_schemas
+, gsettings-desktop-schemas
, gnome2, gnome3
}:
with stdenv.lib;
-with chromium.upstream-info;
-
let
opusWithCustomModes = libopus.override {
withCustomModes = true;
};
+ version = chromium.upstream-info.version;
gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
@@ -57,7 +57,8 @@ let
libexif
liberation_ttf curl utillinux xdg_utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
- bzip2 libcap
+ bzip2 libcap at-spi2-atk
+ kerberos
] ++ optional pulseSupport libpulseaudio
++ [ gtk ];
@@ -68,13 +69,13 @@ in stdenv.mkDerivation rec {
name = "google-chrome${suffix}-${version}";
- src = binary;
+ src = chromium.upstream-info.binary;
buildInputs = [
- patchelf
+ patchelf makeWrapper
# needed for GSETTINGS_SCHEMAS_PATH
- gsettings_desktop_schemas glib gtk
+ gsettings-desktop-schemas glib gtk
# needed for XDG_ICON_DIRS
gnome.defaultIconTheme
@@ -119,14 +120,11 @@ in stdenv.mkDerivation rec {
mv "$icon_file" "$logo_output_path/google-$appname.png"
done
- cat > $exe << EOF
- #!${bash}/bin/sh
- export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
- export PATH=$binpath\''${PATH:+:\$PATH}
- export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
- $out/share/google/$appname/google-$appname ${commandLineArgs} "\$@"
- EOF
- chmod +x $exe
+ makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \
+ --prefix LD_LIBRARY_PATH : "$rpath" \
+ --prefix PATH : "$binpath" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+ --add-flags ${escapeShellArg commandLineArgs}
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do
patchelf --set-rpath $rpath $elf
@@ -139,6 +137,6 @@ in stdenv.mkDerivation rec {
homepage = https://www.google.com/chrome/browser/;
license = licenses.unfree;
maintainers = [ maintainers.msteen ];
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix
index e013f54a39ea..26a7e883c60c 100644
--- a/pkgs/applications/networking/browsers/jumanji/default.nix
+++ b/pkgs/applications/networking/browsers/jumanji/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper
-, gsettings_desktop_schemas }:
+{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib-networking, makeWrapper
+, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "jumanji-${version}";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ girara gtk webkitgtk makeWrapper gsettings_desktop_schemas ];
+ buildInputs = [ girara gtk webkitgtk makeWrapper gsettings-desktop-schemas ];
makeFlags = [ "PREFIX=$(out)" ];
preFixup=''
wrapProgram "$out/bin/jumanji" \
- --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 0f6c4ed36d40..9cad2838a39b 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
version = "2.8.9dev.16";
src = fetchurl {
- url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2";
+ urls = [
+ "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2"
+ "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"
+ ];
sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84";
};
@@ -22,9 +25,9 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
- nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig
- ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc
- ++ [ nukeReferences ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ nukeReferences ]
+ ++ stdenv.lib.optional sslSupport pkgconfig;
buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev;
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index ce9ac961c92a..f7d4f1a69417 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_23, wrapGAppsHook
+{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook
, gtk3, webkitgtk, librsvg, libnotify, sqlite
-, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3
-, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core
+, glib-networking, gsettings-desktop-schemas, libsoup, pcre, gnome3
+, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core
, zeitgeistSupport ? false, zeitgeist ? null
}:
@@ -29,13 +29,12 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- pkgconfig wrapGAppsHook cmake intltool
+ pkgconfig wrapGAppsHook cmake intltool vala_0_34
];
buildInputs = [
- vala_0_23
- gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr
- libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core
+ gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr
+ libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core
(libsoup.override {gnomeSupport = true; valaSupport = true;})
] ++ stdenv.lib.optionals zeitgeistSupport [
zeitgeist
@@ -50,6 +49,6 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS="-lX11";
preFixup = ''
- gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules")
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules")
'';
}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index ecd4026821a8..7d69c03ea366 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "27.0.0.187";
+ version = "29.0.0.113";
src = fetchurl {
url =
if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_npapi_linux_debug.${arch}.tar.gz"
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_npapi_linux_debug.${arch}.tar.gz"
else
"https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
sha256 =
if debug then
if arch == "x86_64" then
- "1ii97fa1diyggarh1gkg43ia42ws7x84hpjzvrdhxcf6s47lh2ld"
+ "15nkmnkh4w458n9yp0f54d48vzl8bk6zq3clws8jvd76aa0accl0"
else
- "1gphlgy64ddzn4bbgr2k1kh8xwq9ghf0z0c6zilry0nq33i64xa1"
+ "0v9iwnb00jl6s6a1b9cnmqflh50dhyhmlwckk8qv6vy77b2jdsk7"
else
if arch == "x86_64" then
- "1hfcphcvdam62k983rm6r42mnkih4nfwyrnx0v88z3nw14mjr4c3"
+ "18cbalnyikb8g8fb861b9kbgsqwrin5k7gd5smz2czk73kmfrph4"
else
- "06jb4jd5840w125wd4l35f0b1iqjak07ajy02k9j8srglwi0ffmw";
+ "06djh4scz97r8h4bsd392paimpybd59q1chd86bdsybm1xkgicmy";
};
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 92e73e475581..fead4cb9fad6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,19 +55,19 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
- version = "27.0.0.187";
+ version = "29.0.0.113";
src = fetchurl {
url =
if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux_debug.x86_64.tar.gz"
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux_debug.x86_64.tar.gz"
else
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz";
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "1857g4yy62pj02pnw7p9bpqazp98jf17yv2xdh1fkqiibzahjc6m"
+ "12ackbfyh83f3ggvr8gs88f002glrymh2s2pfb5srbgdajrh0cyc"
else
- "0kywx7c3qb1hfljc14ddzm1cyhvwygbbdfxp1rdhqw8s3b6ns0hw";
+ "17xwsw13bq5s6mq4r22zhw99dx5xswzz83m7lvd9gl9ih78w7348";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 461db272b12e..a320321ea171 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, rpm, cpio, mesa_noglu, xorg, cairo
+{ stdenv, fetchurl, rpm, cpio, libGL, xorg, cairo
, libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl
-, dbus_glib, alsaLib, libpulseaudio, systemd, pango
+, dbus-glib, alsaLib, libpulseaudio, systemd, pango
}:
with stdenv.lib;
@@ -10,7 +10,7 @@ let
baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin";
rpathPlugin = makeLibraryPath
- [ mesa_noglu
+ [ libGL
xorg.libXt
xorg.libX11
xorg.libXrender
@@ -36,7 +36,7 @@ let
stdenv.cc.cc
alsaLib
libpulseaudio
- dbus_glib
+ dbus-glib
systemd
curl
pango
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index 008c35964832..fa455eb0b7a4 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
description = ''A wrapper to run browser plugins out-of-process'';
homepage = http://nspluginwrapper.org/;
license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ platforms = [ "x64_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.raskin ];
inherit (srcData) version;
};
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 0852b5c9d434..b98d1d415c66 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -37,7 +37,7 @@
let
mirror = https://get.geo.opera.com/pub/opera/desktop;
- version = "48.0.2685.52";
+ version = "50.0.2762.45";
rpath = stdenv.lib.makeLibraryPath [
@@ -89,7 +89,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
- sha256 = "027njqh2as4d0xsnvzamqiplghb8cxqnc19y0vqkvjnsw57v828p";
+ sha256 = "1ajdr6yzqc9xkvdcgkps6j5996n60ibjhj518gmminx90da6x5dy";
};
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix
new file mode 100644
index 000000000000..93cf220e4996
--- /dev/null
+++ b/pkgs/applications/networking/browsers/otter/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub
+, qtbase, qtmultimedia, qtwebengine
+, version ? "0.9.94"
+, sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5"
+}:
+stdenv.mkDerivation {
+ name = "otter-browser-${version}";
+
+ src = fetchFromGitHub {
+ owner = "OtterBrowser";
+ repo = "otter-browser";
+ rev = "v${version}";
+ sha256 = sourceSha;
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ qtbase qtmultimedia qtwebengine ];
+
+ meta = with stdenv.lib; {
+ license = licenses.gpl3Plus;
+ description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5";
+ maintainers = with maintainers; [ lheckemann ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index e24c21b535bf..f3eb38422c69 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -1,28 +1,29 @@
{ stdenv, fetchFromGitHub, makeDesktopItem
, pkgconfig, autoconf213, alsaLib, bzip2, cairo
-, dbus, dbus_glib, file, fontconfig, freetype
+, dbus, dbus-glib, file, fontconfig, freetype
, gstreamer, gst-plugins-base, gst_all_1
, gtk2, hunspell, icu, libevent, libjpeg, libnotify
-, libstartup_notification, libvpx, makeWrapper, mesa
+, libstartup_notification, libvpx, makeWrapper, libGLU_combined
, nspr, nss, pango, perl, python, libpulseaudio, sqlite
-, unzip, xlibs, which, yasm, zip, zlib
+, unzip, xorg, which, yasm, zip, zlib
}:
stdenv.mkDerivation rec {
name = "palemoon-${version}";
- version = "27.6.0";
+ version = "27.8.0";
src = fetchFromGitHub {
name = "palemoon-src";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = version + "_Release";
- sha256 = "1v5rbam93fcc7c1l69clr9chi2l0zv0dhjq12v535n8vv9lhahhl";
+ sha256 = "0b08rzn50jg59rnjzx6dvsmj5dikfjipnmvhpkimvr38v8q7wdar";
};
desktopItem = makeDesktopItem {
name = "palemoon";
exec = "palemoon %U";
+ icon = "palemoon";
desktopName = "Pale Moon";
genericName = "Web Browser";
categories = "Application;Network;WebBrowser;";
@@ -38,12 +39,12 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype
+ alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype
gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2
hunspell icu libevent libjpeg libnotify libstartup_notification
- libvpx makeWrapper mesa nspr nss pango perl pkgconfig python
+ libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python
libpulseaudio sqlite unzip which yasm zip zlib
- ] ++ (with xlibs; [
+ ] ++ (with xorg; [
libX11 libXext libXft libXi libXrender libXScrnSaver
libXt pixman scrnsaverproto xextproto
]);
@@ -59,18 +60,23 @@ stdenv.mkDerivation rec {
echo > $MOZ_CONFIG "
. $src/build/mozconfig.common
ac_add_options --prefix=$out
+ ac_add_options --with-pthreads
ac_add_options --enable-application=browser
ac_add_options --enable-official-branding
ac_add_options --enable-optimize="-O2"
+ ac_add_options --enable-release
+ ac_add_options --enable-devtools
ac_add_options --enable-jemalloc
ac_add_options --enable-shared-js
+ ac_add_options --enable-strip
ac_add_options --disable-tests
+ ac_add_options --disable-installer
+ ac_add_options --disable-updaters
"
'';
patchPhase = ''
chmod u+w .
- sed -i /status4evar/d browser/installer/package-manifest.in
'';
buildPhase = ''
@@ -81,16 +87,34 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
+
+ for n in 16 22 24 32 48 256; do
+ size=$n"x"$n
+ mkdir -p $out/share/icons/hicolor/$size/apps
+ cp $src/browser/branding/official/default$n.png \
+ $out/share/icons/hicolor/$size/apps/palemoon.png
+ done
+
cd $builddir
$src/mach install
'';
meta = with stdenv.lib; {
description = "A web browser";
+ longDescription = ''
+ Pale Moon is an Open Source, Goanna-based web browser focusing on
+ efficiency and customization.
+
+ Pale Moon offers you a browsing experience in a browser completely built
+ from its own, independently developed source that has been forked off from
+ Firefox/Mozilla code a number of years ago, with carefully selected
+ features and optimizations to improve the browser's stability and user
+ experience, while offering full customization and a growing collection of
+ extensions and themes to make the browser truly your own.
+ '';
homepage = https://www.palemoon.org/;
license = licenses.mpl20;
- maintainers = with maintainers; [ rnhmjoj ];
+ maintainers = with maintainers; [ rnhmjoj AndersonTorres ];
platforms = platforms.linux;
};
-
}
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 4f0e891dc496..426d91d34556 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,41 +1,41 @@
-{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook
-, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking
-, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
-, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav
-, qtwebkit-plugins ? null
-, attrs
+{ stdenv, lib, fetchurl, fetchzip, python3Packages
+, makeWrapper, wrapGAppsHook, qtbase, glib-networking
+, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
+, libxslt, gst_all_1 ? null
+, withPdfReader ? true
+, withMediaPlayback ? true
, withWebEngineDefault ? true
}:
-assert (! withWebEngineDefault) -> qtwebkit-plugins != null;
+assert withMediaPlayback -> gst_all_1 != null;
let
pdfjs = stdenv.mkDerivation rec {
name = "pdfjs-${version}";
version = "1.7.225";
- src = fetchurl {
+ src = fetchzip {
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
- sha256 = "1n8ylmv60r0qbw2vilp640a87l4lgnrsi15z3iihcs6dj1n1yy67";
+ sha256 = "0bsmbz7bbh0zpd70dlhss4fjdw7zq356091wld9s7kxnb2rixqd8";
+ stripRoot = false;
};
- nativeBuildInputs = [ unzip ];
-
buildCommand = ''
mkdir $out
- unzip -d $out $src
+ cp -r $src $out
'';
};
-in buildPythonApplication rec {
- name = "qutebrowser-${version}${fix_postfix}";
- fix_postfix = "-1";
- version = "1.0.3";
+in python3Packages.buildPythonApplication rec {
+ name = "qutebrowser-${version}${versionPostfix}";
namePrefix = "";
+ version = "1.2.0";
+ versionPostfix = "";
+ # the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
- sha256 = "04d6hg2yf2wjwn0sd05bpx3zngnb93g7rizbdq17bbpmnwxchzap";
+ sha256 = "0za0iiljs86y2n4znwk8cgn948xcv8iv80a9qfm87zl18y3ashly";
};
# Needs tox
@@ -43,21 +43,25 @@ in buildPythonApplication rec {
buildInputs = [
qtbase
- gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
- glib_networking
- ]
- ++ lib.optional (! withWebEngineDefault) qtwebkit-plugins;
+ glib-networking
+ ] ++ lib.optionals withMediaPlayback (with gst_all_1; [
+ gst-plugins-base gst-plugins-good
+ gst-plugins-bad gst-plugins-ugly gst-libav
+ ]) ++ lib.optional (!withWebEngineDefault) python3Packages.qtwebkit-plugins;
nativeBuildInputs = [
- makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
+ makeWrapper wrapGAppsHook asciidoc
+ docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
];
- propagatedBuildInputs = [
- pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs
+ propagatedBuildInputs = with python3Packages; [
+ pyyaml pyqt5 jinja2 pygments
+ pypeg2 cssutils pyopengl attrs
];
postPatch = ''
sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py
+ '' + lib.optionalString withPdfReader ''
sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
'';
@@ -76,6 +80,8 @@ in buildPythonApplication rec {
install -Dm644 icons/qutebrowser.svg \
"$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
+ install -Dm755 -t "$out/share/qutebrowser/scripts/" \
+ scripts/{importer.py,dictcli.py,keytester.py,open_url_in_instance.sh,utils.py}
'';
postFixup = lib.optionalString (! withWebEngineDefault) ''
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 1aa9bf044b05..88680414d1c6 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, pkgconfig, wrapGAppsHook
-, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk
+, glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk
, patches ? null
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ];
+ buildInputs = [ glib glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ];
inherit patches;
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 1b6bf2ac3002..1e1ea74b680f 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -9,7 +9,7 @@
, atk
, cairo
, dbus
-, dbus_glib
+, dbus-glib
, fontconfig
, freetype
, gdk_pixbuf
@@ -42,8 +42,8 @@
# Wrapper runtime
, coreutils
, glibcLocales
-, hicolor_icon_theme
-, shared_mime_info
+, hicolor-icon-theme
+, shared-mime-info
# Whether to disable multiprocess support to work around crashing tabs
# TODO: fix the underlying problem instead of this terrible work-around
@@ -62,7 +62,7 @@ let
atk
cairo
dbus
- dbus_glib
+ dbus-glib
fontconfig
freetype
gdk_pixbuf
@@ -98,7 +98,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "7.0.10";
+ version = "7.5.1";
lang = "en-US";
@@ -108,7 +108,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
- sha256 = "0d1yvb1gmswlzyivr53xxfbd58bvr7nyangd85j36kar4bzbzvhh";
+ sha256 = "1c5mrc10gm5nklirzwflg7lrdr1v36354g9lgxnjk432izhwb1s0";
};
"i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
- sha256 = "0mjw8z76pbm1hshz875shkmjmxqhpan5la52r3y20v6rc0gfd9p5";
+ sha256 = "0d274f3qhbf1cid3fmpk9s482bjvgcig3q7gdklv9va89bpxzsa6";
};
};
in
@@ -261,8 +261,8 @@ stdenv.mkDerivation rec {
EOF
WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
- hicolor_icon_theme
- shared_mime_info
+ hicolor-icon-theme
+ shared-mime-info
]}
# Generate wrapper
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index 508ab6ec432e..65ebaa3f80c5 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -8,8 +8,8 @@
# Wrapper runtime
, coreutils
-, hicolor_icon_theme
-, shared_mime_info
+, hicolor-icon-theme
+, shared-mime-info
, noto-fonts
, noto-fonts-emoji
@@ -197,8 +197,8 @@ stdenv.mkDerivation rec {
# Generate a suitable wrapper
wrapper_PATH=${makeBinPath [ coreutils ]}
wrapper_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
- hicolor_icon_theme
- shared_mime_info
+ hicolor-icon-theme
+ shared-mime-info
]}
${optionalString audioSupport ''
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 6ac8d9f1f6e7..8c9f23996ede 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, python3, makeWrapper
-, webkit, glib_networking, gsettings_desktop_schemas, python2Packages
+, webkit, glib-networking, gsettings-desktop-schemas, python2Packages
}:
# This package needs python3 during buildtime,
# but Python 2 + packages during runtime.
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
preFixup = ''
for f in $out/bin/*; do
wrapProgram $f \
- --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
done
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig python3 makeWrapper ];
- buildInputs = [ gsettings_desktop_schemas webkit ];
+ buildInputs = [ gsettings-desktop-schemas webkit ];
propagatedBuildInputs = with python2Packages; [ pygtk six ];
}
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index c654723f4c2c..251315619cfd 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib_networking
-, gsettings_desktop_schemas, makeWrapper
+{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib-networking
+, gsettings-desktop-schemas, makeWrapper
}:
stdenv.mkDerivation rec {
name = "vimb-${version}";
- version = "2.11";
+ version = "3.1.0";
src = fetchurl {
url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
- sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f";
+ sha256 = "1gws028c2v1zh6r142hmjvi2m447lwqqh65m6z3dzcar2yw35z3f";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings_desktop_schemas ];
+ buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings-desktop-schemas ];
makeFlags = [ "PREFIX=$(out)" ];
preFixup = ''
wrapProgram "$out/bin/vimb" \
- --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
editor and also easily configurable during runtime. Vimb is mostly
keyboard driven and does not detract you from your daily work.
'';
- homepage = http://fanglingsu.github.io/vimb/;
+ homepage = https://fanglingsu.github.io/vimb/;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index e6275b2f9592..54abc7dedff4 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk2, libsoup, libX11, perl,
- pkgconfig, webkit, gsettings_desktop_schemas }:
+{ stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl,
+ pkgconfig, webkit, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
version = "1.4.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings_desktop_schemas ];
+ buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings-desktop-schemas ];
hardeningDisable = [ "format" ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram "$out/bin/vimprobable2" \
- --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 410e88663608..6bd9614e08de 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -4,7 +4,7 @@
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, xz
, gstreamer, gst-plugins-base, libxml2
-, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
+, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3
, nss, nspr
, patchelf, makeWrapper
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi";
- version = "1.12.955.38-1";
+ version = "1.14.1077.45-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
- sha256 = "1bq1ss6vkpr6rw5n0sw9zipxx19vficvxys1lra9symcxk1b4gqw";
+ sha256 = "0b4iviar927jx6xqyrzgzb3p4p617zm4an1np8jnldadq2a0p56d";
};
unpackPhase = ''
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
- atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
+ atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 542bcbc41b0d..11aa0ce706d6 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch
-, dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss
+, dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss
, pciutils, pkgconfig, python2, xdg_utils
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ];
nativeBuildInputs = [
- dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig
+ dbus-glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig
python2 xdg_utils
];
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index f65e2fe1851b..c71ccdf8a0d2 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -53,8 +53,12 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- configureFlags = "--with-ssl=${openssl.dev} --with-gc=${boehmgc.dev}"
- + optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb";
+ configureFlags =
+ [ "--with-ssl=${openssl.dev}" "--with-gc=${boehmgc.dev}" ]
+ ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ "ac_cv_func_setpgrp_void=yes"
+ ]
+ ++ optional graphicsSupport "--enable-image=${optionalString x11Support "x11,"}fb";
preConfigure = ''
substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path
@@ -70,7 +74,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://w3m.sourceforge.net/;
description = "A text-mode web browser";
- maintainers = [ maintainers.mornfall maintainers.cstrahan ];
+ maintainers = [ maintainers.cstrahan ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
index 1caf1ce0bc8e..aac0dd10e15a 100644
--- a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
+++ b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHash = "0mm2sb1p5zz6b0z2s4zhdlix6fafydsxmqjy8zbkwzw4f6lazzyl";
- buildInputs = [ curl ];
+ nativeBuildInputs = [ curl ];
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
}
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index a7205f1bc7af..3ce056c1e11e 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "cni-${version}";
- version = "0.5.2";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "cni";
rev = "v${version}";
- sha256 = "0n2sc5xf1h0i54am80kj7imrvawddn0kxvgi65w0194dpmyrg5al";
+ sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
};
buildInputs = [ go ];
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 95ad83cb3b17..d67d9d5851cf 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -3,7 +3,7 @@
buildGoPackage rec {
name = "machine-${version}";
- version = "0.12.2";
+ version = "0.14.0";
goPackagePath = "github.com/docker/machine";
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "docker";
repo = "machine";
- sha256 = "0ikgjb6x6h7f43vjabxnqgrrlq516zsz7vj945hca1w919jpdwhf";
+ sha256 = "0hd5sklmvkhhpfn318hq9w0f7x14165h1l2mdn9iv4447z1iibff";
};
postInstall = ''
diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
new file mode 100644
index 000000000000..f394df3391ac
--- /dev/null
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, makeWrapper, jre
+, version ? "1.4" }:
+
+let
+ versionMap = {
+ "1.3" = {
+ flinkVersion = "1.3.2";
+ scalaVersion = "2.11";
+ sha256 = "0mf4qz0963bflzidgslvwpdlvj9za9sj20dfybplw9lhd4sf52rp";
+ hadoopBundle = "-hadoop27";
+ };
+ "1.4" = {
+ flinkVersion = "1.4.2";
+ scalaVersion = "2.11";
+ sha256 = "0x3cikys5brin0kx9zr69xfp8k5w6g8141yrrr26ks7gpss2x636";
+ hadoopBundle = "";
+ };
+ };
+in
+
+with versionMap.${version};
+
+stdenv.mkDerivation rec {
+ name = "flink-${flinkVersion}";
+
+ src = fetchurl {
+ url = "mirror://apache/flink/${name}/${name}-bin${hadoopBundle}-scala_${scalaVersion}.tgz";
+ inherit sha256;
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildInputs = [ jre ];
+
+ installPhase = ''
+ rm bin/*.bat
+
+ mkdir -p $out/bin $out/opt/flink
+ mv * $out/opt/flink/
+ makeWrapper $out/opt/flink/bin/flink $out/bin/flink \
+ --prefix PATH : ${jre}/bin
+
+ cat <> $out/opt/flink/conf/flink-conf.yaml
+ env.java.home: ${jre}"
+ env.log.dir: /tmp/flink-logs
+ EOF
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A distributed stream processing framework";
+ homepage = https://flink.apache.org;
+ downloadPage = https://flink.apache.org/downloads.html;
+ license = licenses.asl20;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ mbode ];
+ repositories.git = git://git.apache.org/flink.git;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 6767a0bd7240..a49ff486d961 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, kubernetes }:
+{ stdenv, fetchurl, kubectl }:
let
- arch = if stdenv.isLinux
+ isLinux = stdenv.isLinux;
+ arch = if isLinux
then "linux-amd64"
else "darwin-amd64";
- checksum = if stdenv.isLinux
- then "1i22givr52kgr76dd2azcg9avgh70wiw5dcpmmyychms2ynxi42y"
- else "0phhy3si86ilc6051zfgn8jnniy5lygf1r2gysjpcyfbrc5pw3hj";
+ checksum = if isLinux
+ then "1lr2s66kln6rp3sb156br9nfx51bdy654vdjr4vnncz4kp3mljv1"
+ else "04y4ii0w4s00z831q1wzxz6qkc8qfrhwzdrq3wwvrcl0413cza50";
pname = "helm";
- version = "2.6.1";
+ version = "2.8.2";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
@@ -21,7 +22,7 @@ stdenv.mkDerivation {
buildInputs = [ ];
- propagatedBuildInputs = [ kubernetes ];
+ propagatedBuildInputs = [ kubectl ];
phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
new file mode 100644
index 000000000000..ff0f664154aa
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "kompose-${version}";
+ version = "1.9.0";
+
+ goPackagePath = "github.com/kubernetes/kompose";
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "kubernetes";
+ repo = "kompose";
+ sha256 = "00yvih5gn67sw9v30a0rpaj1zag7k02i4biw1p37agxih0aphc86";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A tool to help users who are familiar with docker-compose move to Kubernetes";
+ homepage = https://github.com/kubernetes/kompose;
+ license = licenses.asl20;
+ maintainers = with maintainers; [thpham];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
new file mode 100644
index 000000000000..56cbef7f0055
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -0,0 +1,35 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "kontemplate-${version}";
+ version = "1.4.0";
+ goPackagePath = "github.com/tazjin/kontemplate";
+ goDeps = ./deps.nix;
+
+ src = fetchFromGitHub {
+ owner = "tazjin";
+ repo = "kontemplate";
+ rev = "v${version}";
+ sha256 = "11aqc9sgyqz3pscx7njnb3xghl7d61vzdgl3bqndady0dxsccrpj";
+ };
+
+ meta = with lib; {
+ description = "Extremely simple Kubernetes resource templates";
+ homepage = "http://kontemplate.works";
+ downloadPage = "https://github.com/tazjin/kontemplate/releases";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ mbode tazjin ];
+ platforms = platforms.unix;
+ repositories.git = git://github.com/tazjin/kontemplate.git;
+
+ longDescription = ''
+ Kontemplate is a simple CLI tool that can take sets of
+ Kubernetes resource files with placeholders and insert values
+ per environment.
+
+ It can be used as a simple way of deploying the same set of
+ resources to different Kubernetes contexts with context-specific
+ configuration.
+ '';
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix
new file mode 100644
index 000000000000..db2692a79e72
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix
@@ -0,0 +1,111 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+ {
+ goPackagePath = "github.com/Masterminds/semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/semver";
+ rev = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd";
+ sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6";
+ };
+ }
+ {
+ goPackagePath = "github.com/Masterminds/sprig";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/sprig";
+ rev = "e039e20e500c2c025d9145be375e27cf42a94174";
+ sha256 = "1yhpyzq6ghwl0242phjpbc9358fcw63pxrcxsyv9n4dm0w15va3m";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/aokoli/goutils";
+ fetch = {
+ type = "git";
+ url = "https://github.com/aokoli/goutils";
+ rev = "3391d3790d23d03408670993e957e8f408993c34";
+ sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n";
+ };
+ }
+ {
+ goPackagePath = "github.com/ghodss/yaml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ghodss/yaml";
+ rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
+ sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+ };
+ }
+ {
+ goPackagePath = "github.com/huandu/xstrings";
+ fetch = {
+ type = "git";
+ url = "https://github.com/huandu/xstrings";
+ rev = "3959339b333561bf62a38b424fd41517c2c90f40";
+ sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1";
+ };
+ }
+ {
+ goPackagePath = "github.com/imdario/mergo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/imdario/mergo";
+ rev = "d806ba8c21777d504a2090a2ca4913c750dd3a33";
+ sha256 = "12n3lfbfxvnag916c6dpxl48j29s482zwsqjc6wk4vb68qbz2nl3";
+ };
+ }
+ {
+ goPackagePath = "github.com/satori/go.uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/satori/go.uuid";
+ rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b";
+ sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "ab89591268e0c8b748cbe4047b00197516011af5";
+ sha256 = "1cbg8wlv1hmdps9ksa4kym5zy0mb2yjykw4ns7yqv7nmz4s5xajr";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "1087e65c9441605df944fb12c33f0fe7072d18ca";
+ sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f";
+ sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6";
+ };
+ }
+]
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index ff7cb245ae2a..ddb8951740cb 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "kops-${version}";
- version = "1.7.1";
+ version = "1.8.1";
goPackagePath = "k8s.io/kops";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = version;
owner = "kubernetes";
repo = "kops";
- sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd";
+ sha256 = "12nyr0iw1xwp60apli3nlq2vyn4jk3qjrb404m2syx2mqbnn47my";
};
buildInputs = [go-bindata];
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index 7f17bd57c194..73a28325f52d 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
-let version = "0.5.0"; in
+let version = "0.6.0"; in
buildGoPackage {
name = "kubecfg-${version}";
@@ -9,7 +9,7 @@ buildGoPackage {
owner = "ksonnet";
repo = "kubecfg";
rev = "v${version}";
- sha256 = "1s8w133p8qkj3dr73jimajm9ddp678lw9k9symj8rjw5p35igr93";
+ sha256 = "12kv1p707kdxjx5l8rcikd1gjwp5xjxdmmyvlpnvyagrphgrwpsf";
};
goPackagePath = "github.com/ksonnet/kubecfg";
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index e8686ade5900..7f03831ff1d4 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
+{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
, iptables, coreutils
, components ? [
"cmd/kubeadm"
@@ -8,8 +8,6 @@
"cmd/kube-controller-manager"
"cmd/kube-proxy"
"plugin/cmd/kube-scheduler"
- "federation/cmd/federation-apiserver"
- "federation/cmd/federation-controller-manager"
"test/e2e/e2e.test"
]
}:
@@ -18,19 +16,35 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.7.9";
+ version = "1.9.1";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "0lxagvv8mysw6n0vp5vsccl87b628dgsjrf298dx2dqx7wn7zjgi";
+ sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk";
};
- buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
+ # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373
+ buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];
outputs = ["out" "man" "pause"];
+ patches = [
+ # patch is from https://github.com/kubernetes/kubernetes/pull/58207
+ (fetchpatch {
+ url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch";
+ sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w";
+ })
+ (fetchpatch {
+ # https://github.com/kubernetes/kubernetes/pull/60978
+ # Fixes critical kube-proxy failure on iptables-restore >= 1.6.2 and
+ # non-critical failures on prior versions.
+ url = "https://github.com/kubernetes/kubernetes/commit/34ce573e9992ecdbc06dff1b4e3d0e9baa8353dd.patch";
+ sha256 = "1sd9qgc28zr6fkk0441f89bw8kq2kadys0qs7bgivy9cmcpw5x5p";
+ })
+ ];
+
postPatch = ''
substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
@@ -63,7 +77,7 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
- find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' +
+ find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_9} '{}' +
'';
meta = {
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 909242273930..68c66d78de1c 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -14,6 +14,8 @@ let
# src/common/command_utils.cpp
# https://github.com/NixOS/nixpkgs/issues/13783
tarWithGzip = lib.overrideDerivation gnutar (oldAttrs: {
+ # Original builder is bash 4.3.42 from bootstrap tools, too old for makeWrapper.
+ builder = "${bash}/bin/bash";
buildInputs = (oldAttrs.buildInputs or []) ++ [ makeWrapper ];
postInstall = (oldAttrs.postInstall or "") + ''
wrapProgram $out/bin/tar --prefix PATH ":" "${gzip}/bin"
@@ -21,7 +23,7 @@ let
});
in stdenv.mkDerivation rec {
- version = "1.4.0";
+ version = "1.4.1";
name = "mesos-${version}";
enableParallelBuilding = true;
@@ -29,7 +31,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://apache/mesos/${version}/${name}.tar.gz";
- sha256 = "0c08kd226nrjwm2z2drpq4vi97h9r8b1xkdvkgh1114fxg7cyvys";
+ sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr";
};
patches = [
diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
index 642c660edb69..1cf819870f4e 100644
--- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
+++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly";
- buildInputs = [ curl ];
+ nativeBuildInputs = [ curl ];
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
}
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index a3b30a5ef405..d27693823a61 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -15,15 +15,15 @@ let
# instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
# currently https://storage.googleapis.com/minikube/k8s_releases.json
- localkube-version = "1.8.0";
+ localkube-version = "1.9.0";
localkube-binary = fetchurl {
url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
- sha256 = "09mv1g9i0d14brvvp2wxgmfqvgp0na5dbm4z76a660q1fxszvgqc";
+ sha256 = "1z5c061mx2flg6hq05d00bvkn722gxv8y9rfpjyk23nk697k31fh";
};
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
- version = "0.23.0";
+ version = "0.25.0";
goPackagePath = "k8s.io/minikube";
@@ -31,7 +31,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h";
+ sha256 = "0nsdi8mr8p69z696ksfb5ahzqqnvjn4a2z6cp0kyby8sakcjhsby";
};
patches = [
@@ -65,6 +65,8 @@ in buildGoPackage rec {
postInstall = ''
mkdir -p $bin/share/bash-completion/completions/
MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube
+ mkdir -p $bin/share/zsh/site-functions/
+ MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube
'';
postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}";
diff --git a/pkgs/applications/networking/cluster/minikube/localkube.patch b/pkgs/applications/networking/cluster/minikube/localkube.patch
index 08ec85813a3e..2d69cded555f 100644
--- a/pkgs/applications/networking/cluster/minikube/localkube.patch
+++ b/pkgs/applications/networking/cluster/minikube/localkube.patch
@@ -14,7 +14,7 @@ index 1c4b5000..c9f120d4 100644
- if err != nil {
- return errors.Wrap(err, "Error updating localkube from uri")
- }
-+ localkubeFile = assets.NewBinDataAsset("out/localkube", "/", "localkube", "0777")
++ localkubeFile = assets.NewBinDataAsset("out/localkube", "/usr/local/bin/", "localkube", "0777")
copyableFiles = append(copyableFiles, localkubeFile)
// user added files
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index e39bc59709e5..8486f0d53067 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "nomad-${version}";
- version = "0.6.2";
+ version = "0.7.1";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "nomad";
inherit rev;
- sha256 = "12bxqn7yldri5cwyxybd1lwg4c66mxd7g9syf54va5788c0hj8ij";
+ sha256 = "0hn80dqzxkwvk1zjk6px725mb2i3c06smqfj0yyjz96vgf7qbqy2";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
index 6a8fe2834912..1c2e2ccac27b 100644
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/api/default.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
+ broken = true; # needs ruby 2.1
homepage = https://github.com/CenturyLinkLabs/panamax-api;
description = "The API behind The Panamax UI";
license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix
index 4a6481e3e5ee..2f60942f014b 100644
--- a/pkgs/applications/networking/cluster/panamax/ui/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
+ broken = true; # needs ruby 2.1
homepage = https://github.com/CenturyLinkLabs/panamax-ui;
description = "The Web GUI for Panamax";
license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix
index 49c57b470289..45dcfb1738c1 100644
--- a/pkgs/applications/networking/cluster/pig/default.nix
+++ b/pkgs/applications/networking/cluster/pig/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "pig-0.14.0";
+ name = "pig-0.16.0";
src = fetchurl {
url = "mirror://apache/pig/${name}/${name}.tar.gz";
- sha256 = "183in34cj93ny3lhqyq76g9pjqgw1qlwakk5v6x847vrlkfndska";
+ sha256 = "0p79grz5islnq195lv7pqdxb5l3v4y0k0w63602827qs70zpr508";
};
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 79500a33bf80..99b7566fc713 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -6,13 +6,9 @@
let
versionMap = {
- "1.6.3" = {
- hadoopVersion = "cdh4";
- sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn";
- };
- "2.2.0" = {
+ "2.2.1" = {
hadoopVersion = "hadoop2.7";
- sparkSha256 = "0wjjn2pgalrcji8avhj5d48kl1mf7rhrdxhzf29dbiszq4fkx0s6";
+ sparkSha256 = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c";
};
};
in
diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
index 313e1af707b8..1510dc575cc9 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, perl , openssh}:
stdenv.mkDerivation rec {
- version = "3.7.5";
+ version = "3.7.7";
name = "taktuk-${version}";
buildInputs = [ perl ];
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz";
- sha256 = "d96ef6c63d77f32339066f143ef7e0bc00041e10724254bf15787746ad1f1070";
+ sha256 = "0w0h3ynlcxvq2nzm8hkj20g0805ww3vkw53g0qwj7wvp7p3gcvnr";
};
preBuild = ''
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile
new file mode 100644
index 000000000000..c4f9a5511de9
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'terraform_landscape'
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
new file mode 100644
index 000000000000..047ddaadad07
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
@@ -0,0 +1,25 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ colorize (0.8.1)
+ commander (4.4.4)
+ highline (~> 1.7.2)
+ diffy (3.2.0)
+ highline (1.7.10)
+ polyglot (0.3.5)
+ terraform_landscape (0.1.17)
+ colorize (~> 0.7)
+ commander (~> 4.4)
+ diffy (~> 3.0)
+ treetop (~> 1.6)
+ treetop (1.6.9)
+ polyglot (~> 0.3)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ terraform_landscape
+
+BUNDLED WITH
+ 1.14.6
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/applications/networking/cluster/terraform-landscape/default.nix
new file mode 100644
index 000000000000..a0dca341ff3e
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-landscape/default.nix
@@ -0,0 +1,19 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv rec {
+ name = "terraform-landscape-${version}";
+
+ version = (import gemset).terraform_landscape.version;
+ inherit ruby;
+ gemfile = ./Gemfile;
+ lockfile = ./Gemfile.lock;
+ gemset = ./gemset.nix;
+
+ meta = with lib; {
+ description = "Improve Terraform's plan output to be easier to read and understand";
+ homepage = https://github.com/coinbase/terraform-landscape;
+ license = with licenses; apsl20;
+ maintainers = with maintainers; [ mbode ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
new file mode 100644
index 000000000000..38321b9d37aa
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
@@ -0,0 +1,61 @@
+{
+ colorize = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
+ type = "gem";
+ };
+ version = "0.8.1";
+ };
+ commander = {
+ dependencies = ["highline"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "165yr8qzan3gnk241mnwxsvdfwp6p1afg13z0mqdily6lh95acl9";
+ type = "gem";
+ };
+ version = "4.4.4";
+ };
+ diffy = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "015nn9zaciqj43mfpjlw619r5dvnfkrjcka8nsa6j260v6qya941";
+ type = "gem";
+ };
+ version = "3.2.0";
+ };
+ highline = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
+ type = "gem";
+ };
+ version = "1.7.10";
+ };
+ polyglot = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+ type = "gem";
+ };
+ version = "0.3.5";
+ };
+ terraform_landscape = {
+ dependencies = ["colorize" "commander" "diffy" "treetop"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bx8nfqbpxb2hnxnnl1m4sq6jlzf451c85m047jfq04b6w9691fl";
+ type = "gem";
+ };
+ version = "0.1.17";
+ };
+ treetop = {
+ dependencies = ["polyglot"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd";
+ type = "gem";
+ };
+ version = "1.6.9";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index e6e3585a4d13..8b3e83ea86fe 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -72,7 +72,7 @@ let
in withPlugins (_: []);
plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; };
-in {
+in rec {
terraform_0_8_5 = generic {
version = "0.8.5";
sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
@@ -91,9 +91,20 @@ in {
};
terraform_0_10 = pluggable (generic {
- version = "0.10.7";
- sha256 = "0gjvrra255m973nzi7rpqp5dn5npnd79cnv8vjcs7wmkdj1hli0l";
+ version = "0.10.8";
+ sha256 = "11hhij0hq99xhwlg5dx5nv7y074x79wkr8hr3wc6ln0kwdk5scdf";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
+
+ terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
+
+ terraform_0_11 = pluggable (generic {
+ version = "0.11.4";
+ sha256 = "1r3x7qv0bfsnmj7l3hmsww26rb9hkg361515gpvjjzafz5b7bz0c";
+ patches = [ ./provider-path.patch ];
+ passthru = { inherit plugins; };
+ });
+
+ terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues;
}
diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index d29bd9648609..ab00cc7772bf 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -4,15 +4,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-alicloud";
- version = "0.1.0";
- sha256 = "199zrpmi1hqy80nrvdhh5pn7vlcvpjcsf0hpwgzb1r9vnydpz7cj";
+ version = "1.8.1";
+ sha256 = "127070zsy536pdvjpcj0028iwwrcm4s5gbhvhzxb70fhjvi9sj6v";
};
archive =
{
owner = "terraform-providers";
repo = "terraform-provider-archive";
- version = "1.0.0";
- sha256 = "0z85fpd70m2w59vxp82d8ipylaazf6l890rkjca4dm14rkq352zn";
+ version = "1.0.2";
+ sha256 = "0n8939qai01lrk4kq3w344a73z6bfqbfq9yl28yh93fvmpkv6jz2";
};
arukas =
{
@@ -32,13 +32,13 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
- version = "1.0.0";
- sha256 = "1x3ldlx2iryxwfaws8ng9n0k06p7n8xqc6sjyxw73jdasxbh8wgi";
+ version = "1.11.0";
+ sha256 = "14r54772qi6c73l50f6gp4j08rd03c2h4v1fwcydfc6kyf23f8k6";
};
- azure =
+ azure-classic =
{
owner = "terraform-providers";
- repo = "terraform-provider-azure";
+ repo = "terraform-provider-azure-classic";
version = "0.1.1";
sha256 = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1";
};
@@ -46,15 +46,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
- version = "0.2.2";
- sha256 = "1jdkj1zylrlcd2qkfkl81i0ybdpmvbvvsk0f4ahafiqp550srf2d";
+ version = "1.3.0";
+ sha256 = "0szw7fmdwy8r99w40z2h7fp5znj8s0ddbcwrgm1g3vdcp757vcg5";
};
bitbucket =
{
owner = "terraform-providers";
repo = "terraform-provider-bitbucket";
- version = "0.1.0";
- sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43";
+ version = "1.0.0";
+ sha256 = "0gi8p1q0y8x5y8lqihijkpqs3v152h0q7icv7ixk33xsdcvb418y";
};
chef =
{
@@ -84,19 +84,26 @@
version = "0.1.0";
sha256 = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq";
};
+ cloudscale =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-cloudscale";
+ version = "1.0.0";
+ sha256 = "0yqiz4xywbd3568hl6va8da81fbc1hnynlz4z0vqxgi3bs8hhdhz";
+ };
cloudstack =
{
owner = "terraform-providers";
repo = "terraform-provider-cloudstack";
- version = "0.1.1";
- sha256 = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb";
+ version = "0.1.4";
+ sha256 = "1dj6zkwv0bix31b8sjad9gil43m8c2c5d1dr10qza40f9z4agaxa";
};
cobbler =
{
owner = "terraform-providers";
repo = "terraform-provider-cobbler";
- version = "0.1.0";
- sha256 = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz";
+ version = "1.0.1";
+ sha256 = "1z0iijfrbbdrgszvc7jlcr4105zragbc0iq8x48vi24yipqgf5a8";
};
consul =
{
@@ -109,15 +116,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-datadog";
- version = "0.1.1";
- sha256 = "0nyqybi3fl9qlhpx2n0vjz7kn3bqhf4wy93zhq3j3853zxpcjpzc";
+ version = "1.0.3";
+ sha256 = "0nh2dww3hx6jrkcd9lq5hpnqr3grp9cmqi4nwmxlrc5azf8x0mii";
};
digitalocean =
{
owner = "terraform-providers";
repo = "terraform-provider-digitalocean";
- version = "0.1.2";
- sha256 = "0wn2bx9zk0fqvrn7a76rffin7f1b70p66h5bs9073szhr3zph7hg";
+ version = "0.1.3";
+ sha256 = "10crxciw7y2gnm8vqp007vw0k7c1a1xk2z2zsjr5rksk6qlnri4k";
};
dme =
{
@@ -144,15 +151,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-docker";
- version = "0.1.0";
- sha256 = "1nacxkyy12w4rj1bdf5ayqmmm47nwh362pcksr227rkwmsjlmg1m";
+ version = "0.1.1";
+ sha256 = "02lhbl34dq7lsby3g32969i4g9l3z6xw1v00shljd3amgyz2l2r2";
};
dyn =
{
owner = "terraform-providers";
repo = "terraform-provider-dyn";
- version = "1.0.0";
- sha256 = "0ph3516syca8f1zxmz66mh6y5kd8sc74kl0n8zixcgd6rvq0dysr";
+ version = "1.1.0";
+ sha256 = "0sx4h3drb230m69lsmafyfd2cfvwnb9gld8s6ky54115kd3nckml";
};
external =
{
@@ -165,50 +172,50 @@
{
owner = "terraform-providers";
repo = "terraform-provider-fastly";
- version = "0.1.2";
- sha256 = "1z7nsgqqzvily9rxr79yjv6jfx56896c9lxb8flmzwjz6b6mvnz7";
+ version = "0.1.4";
+ sha256 = "0x8s11c30k9a95mafyb2zl3wh9hgbdm7jgajzy5y4xnnr96ca13k";
};
github =
{
owner = "terraform-providers";
repo = "terraform-provider-github";
- version = "0.1.1";
- sha256 = "0f6nk9nb8h8247rz7x1w11amp0qdcmy1alr8jgd2chrjv9f8nif0";
+ version = "1.0.0";
+ sha256 = "0nca90s4bangraly1pcn3jfkfksaw0g2chs5ba6m7z6bhkrj2ylb";
};
gitlab =
{
owner = "terraform-providers";
repo = "terraform-provider-gitlab";
- version = "0.1.0";
- sha256 = "1xjhpaq2agdshrl5jbq9ak2nxdy86iay5bw16zww2qc5ah21sdg2";
+ version = "1.0.0";
+ sha256 = "1kxmzdzdb6fc64i2bzch6020zfk0ygms9gh5mm1bypsyqmj4qc6r";
};
google =
{
owner = "terraform-providers";
repo = "terraform-provider-google";
- version = "1.0.1";
- sha256 = "0l0bpcfjnzlgf3g60iyfr3axw0244w99cf04z7y3bcszk5njipri";
+ version = "1.7.0";
+ sha256 = "1q38z3gihsbxlra1vzgsg1ss8q24f5vkj6k8pvvqjb2rzqpkk5cm";
};
grafana =
{
owner = "terraform-providers";
repo = "terraform-provider-grafana";
- version = "0.1.0";
- sha256 = "1m2anc5cyn2p3yh4zn0y6wvzb0s2fz3sfdqm9psvx53266c2c81q";
+ version = "1.0.1";
+ sha256 = "1dvd7dy039ranlkvnbililk2lzr6cffwc4jsgs6lk3hfxhrq8bns";
};
heroku =
{
owner = "terraform-providers";
repo = "terraform-provider-heroku";
- version = "0.1.0";
- sha256 = "1f72lm95bnkhaf2accypdn7xsxcgkqri5fq5mriya4n34c61z3l6";
+ version = "0.1.2";
+ sha256 = "0dmq5v4bwzndy6l6vx29m5ykn2zhnnbmnla00ad8i7djm1sj1fbg";
};
http =
{
owner = "terraform-providers";
repo = "terraform-provider-http";
- version = "1.0.0";
- sha256 = "1lks997sxfydm6a9s6vfyljs3j1r7qpg1k1s5ilpg5ckv77nad6g";
+ version = "1.0.1";
+ sha256 = "1bnqrx4xya3lm5wp4byy6npazll6w1g6bv4rawgncswsgx08zqng";
};
icinga2 =
{
@@ -228,15 +235,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-influxdb";
- version = "0.1.0";
- sha256 = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5";
+ version = "1.0.0";
+ sha256 = "1w1izzs22b2w2qmpdxbhaj9kvnfyw0wlq3nigrigwwvqav43knh9";
};
kubernetes =
{
owner = "terraform-providers";
repo = "terraform-provider-kubernetes";
- version = "1.0.0";
- sha256 = "1kh7a83f98v6b4v3zj84ddhrg2hya4nmvrw0mjc26q12g4z2d5g6";
+ version = "1.0.1";
+ sha256 = "0s8h8nxsl07bhvynmgps07giqr2xmxizk1rcx4xivfc3q5mkvnhb";
};
librato =
{
@@ -249,8 +256,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-local";
- version = "1.0.0";
- sha256 = "1dxdpmai8f0g1gj6khgv769lhg6ssfmgqskg4c5qf1jnv8yn8mkd";
+ version = "1.1.0";
+ sha256 = "1qxfyyg8k43rw0gny4dadamc2a9hk3x6ybdivifjc17m7il0janc";
};
logentries =
{
@@ -259,6 +266,13 @@
version = "0.1.0";
sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa";
};
+ logicmonitor =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-logicmonitor";
+ version = "1.0.0";
+ sha256 = "106y74w9nhqs65h26ipyjg636zcrnpn5s8r49sg4kh4ynvnrkv8v";
+ };
mailgun =
{
owner = "terraform-providers";
@@ -270,29 +284,29 @@
{
owner = "terraform-providers";
repo = "terraform-provider-mysql";
- version = "0.1.0";
- sha256 = "0vjr97xf15va9qypjb9318h1nxr0sd6ydcy7ijnqb8538v3581mv";
+ version = "1.0.1";
+ sha256 = "07lm1la9llp52gfs5wf6kq5rjys9lmd3hl7x5821vz54rakzic6n";
};
newrelic =
{
owner = "terraform-providers";
repo = "terraform-provider-newrelic";
- version = "0.1.1";
- sha256 = "1fqgxcspkgm3ncsqbvw79h5n09agba7q80nz0mrq09x0pyk8y051";
+ version = "1.0.0";
+ sha256 = "1bcxq4f50qci54gckx4yax2v2qpazp10n5vcci4cba0bf5l8zx62";
};
nomad =
{
owner = "terraform-providers";
repo = "terraform-provider-nomad";
- version = "1.0.0";
- sha256 = "01fvw7yw8dhjclipnn9h1blagbp2849ahmnqj3ysh13i0x1qbq4r";
+ version = "1.1.0";
+ sha256 = "0n3bd9fiablhb2zxmlqnidahdqlpj3i7701vi62zds04kcgdkxw8";
};
ns1 =
{
owner = "terraform-providers";
repo = "terraform-provider-ns1";
- version = "0.1.0";
- sha256 = "1in9ggrvxfb3maxhgiv997hndkpnqpgx1c1365lfizhp7km5ncvj";
+ version = "1.0.0";
+ sha256 = "0zjdhz6miwlg3b68pbd99c6nw7hhyzxy736734xz8g3w89xn18f5";
};
null =
{
@@ -305,22 +319,29 @@
{
owner = "terraform-providers";
repo = "terraform-provider-oneandone";
- version = "0.1.0";
- sha256 = "18bbpcprjib4d4skjdr76xjxi9091h5b3dls68y6bxkk6sh6av1i";
+ version = "1.0.0";
+ sha256 = "0q14r36iyn1c1wfky42imkzvkys5znj1yzq27iaxnrsqp4hh7pl2";
};
opc =
{
owner = "terraform-providers";
repo = "terraform-provider-opc";
- version = "0.1.3";
- sha256 = "00h531pikjrmra2sr24lnx2z0dvycshd0qpz3wa733mkvvm47p07";
+ version = "1.1.0";
+ sha256 = "19yip5v00b57j3h7870hw51nsxcwib7mlhdzzn276z74af6zirsr";
};
openstack =
{
owner = "terraform-providers";
repo = "terraform-provider-openstack";
- version = "0.2.2";
- sha256 = "1027pqv1cvyvakn4kgivd720g9na38nam5bb5fjyd4d04xpq9v90";
+ version = "1.3.0";
+ sha256 = "0pyp95i6z6il2kl28cvilqi81wqs076d6f0zacjyvmn1d0blqrnx";
+ };
+ opentelekomcloud =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-opentelekomcloud";
+ version = "1.0.0";
+ sha256 = "1wra9a6cjgsyvbfldvi2xnjk6y9zqv3y06pbq8c8dyjzssd5j591";
};
opsgenie =
{
@@ -333,29 +354,36 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ovh";
- version = "0.1.0";
- sha256 = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr";
+ version = "0.2.0";
+ sha256 = "12dpgx0fpmqw64v5a70fihbgixyw71bdjbdi17gal7s2pj1xw159";
};
packet =
{
owner = "terraform-providers";
repo = "terraform-provider-packet";
- version = "1.0.0";
- sha256 = "0ibz9k1yfqkfsmqmv1pl2jwzbld0l6f7zd8y80iw0v5wswclswya";
+ version = "1.2.0";
+ sha256 = "0jk8wwm7srjxc3mspqd9szlq8fd63bhdgkzwdjr2fvv4ivj17xp4";
};
pagerduty =
{
owner = "terraform-providers";
repo = "terraform-provider-pagerduty";
- version = "0.1.2";
- sha256 = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm";
+ version = "1.0.0";
+ sha256 = "113anbcpp8ab111jm19h7d9i5sds76msgnk8xvwk8qf6500ivfqa";
+ };
+ panos =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-panos";
+ version = "1.0.0";
+ sha256 = "1pslp8pas1p90bmxp1yqmackqkbxrw2sgcm88ibz8l4k43vwks76";
};
postgresql =
{
owner = "terraform-providers";
repo = "terraform-provider-postgresql";
- version = "0.1.0";
- sha256 = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j";
+ version = "0.1.1";
+ sha256 = "0ls5z02vaalcrbaq375qnk0267pb17rpsx4s3plfnr7qclv21pwn";
};
powerdns =
{
@@ -368,8 +396,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-profitbricks";
- version = "0.1.2";
- sha256 = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp";
+ version = "1.1.1";
+ sha256 = "0sn48adgpjw20a6jwagarnh5jasq0v36zsbd204j0vx4iam3vm9m";
};
rabbitmq =
{
@@ -382,15 +410,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-rancher";
- version = "1.0.0";
- sha256 = "1fs8p0l8f79b1s2g0p5zlq1has9i7w3bmv76vrm79076v7w2v0d6";
+ version = "1.2.0";
+ sha256 = "0xxff4mh4cv27mignvanhsz5sf5476ljk7q4h67fy4y0gzyxwpzw";
};
random =
{
owner = "terraform-providers";
repo = "terraform-provider-random";
- version = "1.0.0";
- sha256 = "0im4dsnbpbc9qln92lxcrygm9d705bvlhigpx492172cq1fqnw61";
+ version = "1.1.0";
+ sha256 = "1mal0pg37a99q0sjqbccwc2ipwvxm8lqp93lg8i96f868hiv4yzl";
};
rundeck =
{
@@ -403,8 +431,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-scaleway";
- version = "0.1.1";
- sha256 = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6";
+ version = "1.2.0";
+ sha256 = "123rjvslq7gy2m96rikm0i2298jjpsnyh9civbyvbxj3h47z9h4v";
};
softlayer =
{
@@ -438,22 +466,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-terraform";
- version = "1.0.0";
- sha256 = "0icyyi4h48yh5235p5svm4p0jzbqqm1f3846dqy37czhjfcrn3gh";
+ version = "1.0.2";
+ sha256 = "1aj6g6l68n9kqmxfjlkwwxnac7fhha6wrmvsw4yylf0qyssww75v";
};
tls =
{
owner = "terraform-providers";
repo = "terraform-provider-tls";
- version = "1.0.0";
- sha256 = "063ai5zipmkwq0nr5c25gqsr970r8aba12ynxg9x8cnay0zn9s95";
+ version = "1.1.0";
+ sha256 = "1kzq6al9rzpmk98bmxcf5gjx5s28gfjp1xvdsnd4a113pljn0ddb";
};
triton =
{
owner = "terraform-providers";
repo = "terraform-provider-triton";
- version = "0.2.1";
- sha256 = "0ds2anr65xx9kdjv6x68lcxgl3js6l0m2cbx3kwx5465m01m3gxz";
+ version = "0.4.2";
+ sha256 = "0nid5sp8xskw5wmc0dbkw6m87bmyb37p9ck9xm74nrvdzqjxz5ml";
};
ultradns =
{
@@ -466,8 +494,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vault";
- version = "0.1.0";
- sha256 = "1rr4gaqfr6panjjdb5xx9vbq7701zjps0l75zi526kij1pph98p1";
+ version = "1.0.0";
+ sha256 = "1v4b8zs0s48gqgsh719hwi69i4h8i5vvp2g5m881z5yzv7n7haqw";
};
vcd =
{
@@ -480,7 +508,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vsphere";
- version = "0.4.1";
- sha256 = "0afxvjx9zb9ym0cs8j15s6nfp20rmmifjdc098wcfjmgnw6p7f01";
+ version = "1.3.3";
+ sha256 = "1z6v8hagpjm8573d36v3nak5h7hn3jyq2f4m93k1adygvs3n9yx7";
};
}
diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix
index 8d41df24d8ce..40117b458550 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix
@@ -11,11 +11,15 @@ let
inherit owner repo sha256;
rev = "v${version}";
};
+
+ # Terraform allow checking the provider versions, but this breaks
+ # if the versions are not provided via file paths.
+ postBuild = "mv go/bin/${repo}{,_v${version}}";
};
maybeDrv = name: data:
- # vsphere is currently broken
- if name == "vsphere" then null
+ # azure-classic is an archived repo
+ if name == "azure-classic" then null
else toDrv data;
in
lib.mapAttrs maybeDrv list
diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all
index d857e4f18700..16eb6004e3ee 100755
--- a/pkgs/applications/networking/cluster/terraform/providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform/providers/update-all
@@ -71,7 +71,7 @@ fi
org=terraform-providers
-repos=$(get_org_repos "$org" | grep terraform-provider- | sort)
+repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | sort)
# Get all the providers with index
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index adbe2ab5a54f..899c73b9f7b1 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform-full, makeWrapper }:
buildGoPackage rec {
name = "terragrunt-${version}";
- version = "0.13.0";
+ version = "0.14.2";
goPackagePath = "github.com/gruntwork-io/terragrunt";
src = fetchFromGitHub {
- rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
- sha256 = "18jbz3vchdp5f3f4grl968k706fdcvj71syf7qmriwdyw4ns83wv";
+ rev = "v${version}";
+ sha256 = "0bnscp0sjnzhnqbm7m5ip6g2608yfvsnr60f03y2qqld8m9wmj32";
};
goDeps = ./deps.nix;
@@ -23,7 +23,7 @@ buildGoPackage rec {
postInstall = ''
wrapProgram $bin/bin/terragrunt \
- --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
+ --set TERRAGRUNT_TFPATH ${lib.getBin terraform-full}/bin/terraform
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index ac6bae693952..68d2cb48048a 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
- rev = "df374c20d53ed082b8cf0d0da52b1a181abf387b";
- sha256 = "0my26kjx1inh0ajh85n34wrl18mizx627cl0xhxlhcyw01p24792";
+ rev = "628f99e2cda77dd323992ede8b05961b41f4352f";
+ sha256 = "0dbr4czbjpnkira9bhackq01s9b13yvw5dscnxi3mr9adb89y9pm";
};
}
{
@@ -23,8 +23,17 @@
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
- rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105";
- sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa";
+ rev = "a6af135bd4e28680facf08a3d206b454abc877a4";
+ sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-cleanhttp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-cleanhttp";
+ rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d";
+ sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8";
};
}
{
@@ -32,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-getter";
- rev = "6aae8e4e2dee8131187c6a54b52664796e5a02b0";
- sha256 = "0hxjwph0ghx0732xq62bszk18wb18hdq6vzb6b6bdn3rsdva1d68";
+ rev = "64040d90d4ab861e7e833d689dc76a0f176d8dec";
+ sha256 = "0g25nx42z6ykd7jqzlrxf161h8lqrpxpddmbspl4w3a84wphhgms";
};
}
{
@@ -41,8 +50,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-version";
- rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77";
- sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik";
+ rev = "4fe82ae3040f80a03d04d2cccb5606a626b8e1ee";
+ sha256 = "0gq4207s1yf2nq4c2ir3bsai29svzz4830g1vbvzdrpis58r1x4m";
};
}
{
@@ -50,8 +59,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
- rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
- sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
+ rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
+ sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
};
}
{
@@ -59,8 +68,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-zglob";
- rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab";
- sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx";
+ rev = "4959821b481786922ac53e7ef25c61ae19fb7c36";
+ sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449";
};
}
{
@@ -77,8 +86,8 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-testing-interface";
- rev = "9a441910b16872f7b8283682619b3761a9aa2222";
- sha256 = "0gfi97m6sadrwbq56as3d368c3ipcn3wz8pxqkk7kkba0h5wjc7v";
+ rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28";
+ sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx";
};
}
{
@@ -86,8 +95,8 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
- rev = "d0303fe809921458f417bcf828397a65db30a7e4";
- sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
+ rev = "00c29f56e2386353d58c599509e8dc3801b0d716";
+ sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
};
}
{
@@ -95,8 +104,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "05e8a0eda380579888eb53c394909df027f06991";
- sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv";
+ rev = "b89eecf5ca5db6d3ba60b237ffe3df7bafb7662f";
+ sha256 = "0g946ii8qjaynvidj648z8izl91i6yhy0ir6g3qsrn136im3r8wk";
};
}
{
@@ -113,8 +122,8 @@
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
- rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2";
- sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr";
+ rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff";
+ sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i";
};
}
]
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index affcbcc4b3c0..216569cc8210 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -1,32 +1,36 @@
-{ stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32
-, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook
-, glib_networking }:
+{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40
+, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobjectIntrospection
+, glib-networking }:
stdenv.mkDerivation rec {
- version = "1.7.3";
+ version = "1.7.4";
name = "corebird-${version}";
src = fetchFromGitHub {
owner = "baedert";
repo = "corebird";
rev = version;
- sha256 = "1xay22v5j239ppl6ydbj842zpm5v2mg5mcgpy5cjrhhmnbg79fgk";
+ sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n";
};
- preConfigure = ''
- ./autogen.sh
- '';
-
- nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
+ nativeBuildInputs = [
+ meson ninja vala_0_40 pkgconfig wrapGAppsHook
+ gobjectIntrospection # for setup hook
+ ];
buildInputs = [
- gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib_networking
+ glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]);
+ postPatch = ''
+ chmod +x data/meson_post_install.py # patchShebangs requires executable file
+ patchShebangs data/meson_post_install.py
+ '';
+
meta = {
description = "Native Gtk+ Twitter client for the Linux desktop";
longDescription = "Corebird is a modern, easy and fun Twitter client.";
- homepage = http://corebird.baedert.org;
+ homepage = https://corebird.baedert.org/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.jonafato ];
diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
index 93ff39bde64f..62fe4e2e662e 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Mini Web server that let others upload files to your computer";
homepage = http://stackp.online.fr/droopy;
license = licenses.bsd3;
- maintainers = [ maintainers.profpatsch ];
+ maintainers = [ maintainers.Profpatsch ];
};
}
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index e9d6c5f306f0..2d364450677a 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -7,7 +7,7 @@ assert lib.elem stdenv.system platforms;
# Dropbox client to bootstrap installation.
# The client is self-updating, so the actual version may be newer.
let
- version = "38.4.27";
+ version = "40.4.46";
arch = {
"x86_64-linux" = "x86_64";
@@ -32,7 +32,7 @@ in
buildFHSUserEnv {
name = "dropbox";
- targetPkgs = pkgs: with pkgs; with xlibs; [
+ targetPkgs = pkgs: with pkgs; with xorg; [
libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender
libXxf86vm libxcb xkeyboardconfig
curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt
@@ -54,7 +54,7 @@ buildFHSUserEnv {
do_install=1
else
installed_version=$(cat "$HOME/.dropbox-dist/VERSION")
- latest_version=$(printf "${version}\n$installed_version\n" | sort -V | head -n 1)
+ latest_version=$(printf "${version}\n$installed_version\n" | sort -rV | head -n 1)
if [ "x$installed_version" != "x$latest_version" ]; then
do_install=1
fi
diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index 7d815c8fad08..feb6a0ab1265 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
name = "errbot-${version}";
- version = "5.1.2";
+ version = "5.1.3";
src = fetchurl {
url = "mirror://pypi/e/errbot/${name}.tar.gz";
- sha256 = "1r9w7pmdw77h1hwxns6d0sdg8cndsq1lwkq0y5qiiqr91jz93ajm";
+ sha256 = "0nkfq6fx87g7kvxrb5lp8gkb75658cmyffnacpy8jq3a16py3jrr";
};
disabled = !pythonPackages.isPy3k;
@@ -15,7 +15,9 @@ pythonPackages.buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
- --replace dnspython3 dnspython
+ --replace dnspython3 dnspython \
+ --replace 'cryptography<2.1.0' cryptography \
+ --replace 'pyOpenSSL<17.3.0' pyOpenSSL
'';
# tests folder is not included in release
@@ -24,7 +26,7 @@ pythonPackages.buildPythonApplication rec {
buildInputs = [ glibcLocales ];
propagatedBuildInputs = with pythonPackages; [
webtest bottle threadpool rocket-errbot requests jinja2
- pyopenssl colorlog Yapsy markdown ansi pygments dns pep8
+ pyopenssl colorlog Yapsy markdown ansi pygments dnspython pep8
daemonize pygments-markdown-lexer telegram irc slackclient
sleekxmpp hypchat pytest
];
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index b7bc2c6c67a0..80984208460b 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
+{ stdenv, fetchFromGitHub, openssl, curl, coreutils, gawk, bash, which }:
stdenv.mkDerivation rec {
- name = "esniper-2.33.0";
+ name = "esniper-2.33.0.2017-11-06";
- src = fetchurl {
- url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz";
- sha256 = "1pck2x7mp7ip0b21v2sjvq86fz12gzw6kig4vvbrghz5xw5b3f69";
+ src = fetchFromGitHub {
+ owner = "yhfudev";
+ repo = "esniper";
+ rev = "c95140d376db3c991300a7462e6c172b0ccf3eb5";
+ sha256 = "1dfb5hmcrvm3yg9ask362c6s5ylxs21szw23dm737a94br37j890";
};
buildInputs = [ openssl curl ];
diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
deleted file mode 100644
index b681f74ed222..000000000000
--- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses
-, gettext, libiconv, makeWrapper, perl, fetchpatch }:
-
-stdenv.mkDerivation rec {
- name = "newsbeuter-2.9";
-
- src = fetchurl {
- url = "http://www.newsbeuter.org/downloads/${name}.tar.gz";
- sha256 = "1j1x0hgwxz11dckk81ncalgylj5y5fgw5bcmp9qb5hq9kc0vza3l";
-
- };
-
- buildInputs
- # use gettext instead of libintlOrEmpty so we have access to the msgfmt
- # command
- = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl libiconv ]
- ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
-
- preBuild = ''
- sed -i -e 110,114d config.sh
- sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl
- export LDFLAGS=-lncursesw
- '';
-
- patches = [
- (fetchpatch {
- url = "https://github.com/akrennmair/newsbeuter/commit/cdacfbde9fe3ae2489fc96d35dfb7d263ab03f50.patch";
- sha256 = "1lhvn63cqjpikwsr6zzndb1p5y140vvphlg85fazwx4xpzd856d9";
- })
- (fetchpatch {
- url = "https://github.com/akrennmair/newsbeuter/commit/33577f842d9b74c119f3cebda95ef8652304db81.patch";
- sha256 = "1kwhp6k14gk1hclgsr9w47qg7hs60p23zsl6f6vw13mczp2naqlb";
- })
- # https://github.com/akrennmair/newsbeuter/issues/598 / CVE-2017-14500
- (fetchpatch {
- url = "https://github.com/akrennmair/newsbeuter/commit/26f5a4350f3ab5507bb8727051c87bb04660f333.patch";
- sha256 = "1jjxj4z3s4f1n8rfpwyd42a40gjnziykqas6a26s1lsdkklnbp6q";
- })
- # https://github.com/akrennmair/newsbeuter/issues/591 / CVE-2017-12904
- (fetchpatch {
- url = "https://github.com/akrennmair/newsbeuter/commit/d1460189f6f810ca9a3687af7bc43feb7f2af2d9.patch";
- sha256 = "1a8k73ckziszsbdwdhcmkfvlmgy955gssg9v4sqvg20v91l5rmai";
- })
- ];
-
- installFlags = [ "DESTDIR=$(out)" "prefix=" ];
-
- postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
- for prog in $out/bin/*; do
- wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
- done
- '';
-
- meta = {
- homepage = http://www.newsbeuter.org;
- description = "An open-source RSS/Atom feed reader for text terminals";
- maintainers = with stdenv.lib.maintainers; [ lovek323 ];
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
new file mode 100644
index 000000000000..8546c5b0a3e8
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
+, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "newsboat-${version}";
+ version = "2.10.2";
+
+ src = fetchurl {
+ url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
+ sha256 = "1x4nxx1kvmrcm8jy73dvg56h4z15y3sach2vr13cw8rsbi7v99px";
+ };
+
+ prePatch = ''
+ substituteInPlace Makefile --replace "|| true" ""
+ # Allow other ncurses versions on Darwin
+ substituteInPlace config.sh \
+ --replace "ncurses5.4" "ncurses"
+ '';
+
+ nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ]
+ ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ];
+
+ buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ];
+
+ makeFlags = [ "prefix=$(out)" ];
+
+ doCheck = true;
+ checkTarget = "test";
+
+ NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
+
+ postInstall = ''
+ cp -r contrib $out
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ for prog in $out/bin/*; do
+ wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://newsboat.org/;
+ description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console.";
+ maintainers = with maintainers; [ dotlambda nicknovitski ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 72a98a996046..3a5983c2e276 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -18,6 +18,5 @@ python2Packages.buildPythonApplication rec {
description = "RSS Aggregator Without Delusions Of Grandeur";
license = licenses.gpl2;
platforms = platforms.unix;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
index 99517b478c32..4152c2772e10 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -14,16 +14,34 @@ buildPythonApplication rec {
sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5";
};
- postInstall = ''
- install -Dm 644 r2e.1 $out/share/man/man1/r2e.1
- # an alias for better finding the manpage
- ln -s -T r2e.1 $out/share/man/man1/rss2email.1
+ outputs = [ "out" "man" "doc" ];
+
+ postPatch = ''
+ # sendmail executable is called from PATH instead of sbin by default
+ sed -e 's|/usr/sbin/sendmail|sendmail|' \
+ -i rss2email/config.py
'';
+ postInstall = ''
+ install -Dm 644 r2e.1 $man/share/man/man1/r2e.1
+ # an alias for better finding the manpage
+ ln -s -T r2e.1 $man/share/man/man1/rss2email.1
+
+ # copy documentation
+ mkdir -p $doc/share/doc/rss2email
+ cp AUTHORS COPYING CHANGELOG README $doc/share/doc/rss2email/
+ '';
+
+ # The tests currently fail, see
+ # https://github.com/rss2email/rss2email/issues/14
+ # postCheck = ''
+ # env PYTHONPATH=.:$PYTHONPATH python ./test/test.py
+ # '';
+
meta = with lib; {
description = "A tool that converts RSS/Atom newsfeeds to email.";
homepage = https://pypi.python.org/pypi/rss2email;
license = licenses.gpl2;
- maintainers = with maintainers; [ jb55 profpatsch ];
+ maintainers = with maintainers; [ jb55 Profpatsch ];
};
}
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index b25d4e109ebc..297703cde696 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "rssguard-${version}";
- version = "3.4.2";
+ name = "${pname}-${version}";
+ pname = "rssguard";
+ version = "3.5.6";
- src = fetchgit {
- url = https://github.com/martinrotter/rssguard;
- rev = "refs/tags/${version}";
- sha256 = "0iy0fd3qr2dm0pc6xr7sin6cjfxfa0pxhxiwzs55dhsdk9zir62s";
- # Submodules are required only for Windows (and one of them is a huge binary
- # package ~400MB). See project wiki for more details.
- fetchSubmodules = false;
+ src = fetchFromGitHub {
+ owner = "martinrotter";
+ repo = pname;
+ rev = version;
+ sha256 = "1pdas7hg3nzykm3qi951fk25c9s6gjb7my82b9xzjn2yd7ks71by";
};
buildInputs = [ qtwebengine qttools ];
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index fd349b320d28..a7fd31cac2ff 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
homepage = http://www.vanheusden.com/rsstail/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 105239aca024..9a71f8911c25 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -1,79 +1,72 @@
-{ lib
-, fetchFromGitHub
-, python
-, transmission
-, deluge
-, config
+{ lib, python
+, delugeSupport ? true, deluge ? null
}:
-with python.pkgs;
+assert delugeSupport -> deluge != null;
+
+# Flexget have been a trouble maker in the past,
+# if you see flexget breaking when updating packages, don't worry.
+# The current state is that we have no active maintainers for this package.
+# -- Mic92
+
+let
+ python' = python.override { inherit packageOverrides; };
+
+ packageOverrides = self: super: {
+ sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
+ version = "1.1.10";
+ src = old.src.override {
+ inherit version;
+ sha256 = "1lvb14qclrx0qf6qqx8a8hkx5akk5lk3dvcqz8760v9hya52pnfv";
+ };
+ });
+ };
+
+in
+
+with python'.pkgs;
buildPythonApplication rec {
- version = "2.10.82";
- name = "FlexGet-${version}";
+ pname = "FlexGet";
+ version = "2.13.5";
- src = fetchFromGitHub {
- owner = "Flexget";
- repo = "Flexget";
- rev = version;
- sha256 = "15508ihswfjbkzhf1f0qhn2ar1aiibz2ggp5d6r33icy8xwhpv09";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1lkmxwy7k4zlcqpigwk8skc2zi8a70vrw21pz80wvmf9yg0wc9z9";
};
- doCheck = true;
- # test_regexp requires that HOME exist, test_filesystem requires a
- # unicode-capable filesystem (and setting LC_ALL doesn't work).
- # setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
postPatch = ''
- substituteInPlace requirements.txt \
- --replace "chardet==3.0.3" "chardet" \
- --replace "rebulk==0.8.2" "rebulk" \
- --replace "cherrypy==10.2.2" "cherrypy" \
- --replace "portend==1.8" "portend" \
- --replace "sqlalchemy==1.1.10" "sqlalchemy" \
- --replace "zxcvbn-python==4.4.15" "zxcvbn-python" \
- --replace "flask-cors==3.0.2" "flask-cors" \
- --replace "certifi==2017.4.17" "certifi" \
- --replace "apscheduler==3.3.1" "apscheduler" \
- --replace "path.py==10.3.1" "path.py" \
- --replace "tempora==1.8" "tempora" \
- --replace "cheroot==5.5.0" "cheroot" \
- --replace "six==1.10.0" "six" \
- --replace "aniso8601==1.2.1" "aniso8601"
+ # remove dependency constraints
+ sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt
'';
- checkPhase = ''
- export HOME=.
- py.test --disable-pytest-warnings -k "not test_quality_failures \
- and not test_group_quality \
- and not crash_report \
- and not test_multi_episode \
- and not test_double_episodes \
- and not test_inject_force \
- and not test_double_prefered \
- and not test_double \
- and not test_non_ascii"
- '';
+ # ~400 failures
+ doCheck = false;
- buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ];
propagatedBuildInputs = [
- feedparser sqlalchemy pyyaml chardet
- beautifulsoup4 html5lib PyRSS2Gen pynzb
- rpyc jinja2 jsonschema requests dateutil jsonschema
+ feedparser sqlalchemy pyyaml
+ chardet beautifulsoup4 html5lib
+ PyRSS2Gen pynzb rpyc jinja2
+ jsonschema requests dateutil
pathpy guessit_2_0 APScheduler
terminaltables colorclass
- cherrypy flask flask-restful flask-restplus
- flask-compress flask_login flask-cors
- pyparsing safe future zxcvbn-python
- werkzeug tempora cheroot rebulk portend
+ cherrypy flask flask-restful
+ flask-restplus flask-compress
+ flask_login flask-cors safe
+ pyparsing future zxcvbn-python
+ werkzeug tempora cheroot rebulk
+ portend transmissionrpc aniso8601
+ babelfish certifi click futures
+ idna itsdangerous markupsafe
+ plumbum pytz six tzlocal urllib3
+ webencodings werkzeug zxcvbn-python
] ++ lib.optional (pythonOlder "3.4") pathlib
- # enable deluge and transmission plugin support, if they're installed
- ++ lib.optional (config.deluge or false) deluge
- ++ lib.optional (transmission != null) transmissionrpc;
+ ++ lib.optional delugeSupport deluge;
- meta = {
- homepage = https://flexget.com/;
+ meta = with lib; {
+ homepage = https://flexget.com/;
description = "Multipurpose automation tool for content like torrents";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ domenkozar tari ];
+ license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 210d78369da6..49ac1d26dda6 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
-let version = "3.29.0"; in
+let version = "3.31.0"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
- sha256 = "0najf2w6p5j4qc8jmglx6j63mph749s5p90lz2nkmwwwy5sfvlga";
+ sha256 = "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l";
};
configureFlags = [
diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix
index 26a05151d1cf..c3085519ec4c 100644
--- a/pkgs/applications/networking/gmailieer/default.nix
+++ b/pkgs/applications/networking/gmailieer/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "gmailieer";
- version = "0.4";
+ version = "0.6";
src = fetchFromGitHub {
owner = "gauteh";
repo = "gmailieer";
rev = "v${version}";
- sha256 = "0vpc8nrh3cx91pcw45jjr2jllkqbx6w2khq7nyqv59gc4q5mz0p2";
+ sha256 = "1z7r78ck81l8xdpjynjv8dfm4j0p6a1cbzgdckp41id27sq1vc76";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 72ffbb6e6d3a..66bf843865e6 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,30 +1,33 @@
{ callPackage, stdenv }:
let
- stableVersion = "2.1.0";
- previewVersion = "2.1.0rc4"; # == 2.1.0
+ stableVersion = "2.1.4";
+ # Currently there is no preview version.
+ previewVersion = stableVersion;
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
+ guiSrcHash = "03x9qgqs4y9swyipigviyscvlcfkb2v6iasc54nv07ks8srqwf93";
+ serverSrcHash = "0qzx0y4mqxpn5xhzgr2865lvszhi6szdli1jq64gihwdy3bhli4f";
in {
guiStable = mkGui {
stable = true;
- sha256Hash = "0fms8469daa8jhmsdqnadm18gc27g18q4m974wjfpz9n1rn78sjk";
+ sha256Hash = guiSrcHash;
};
guiPreview = mkGui {
stable = false;
- sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s";
+ sha256Hash = guiSrcHash;
};
serverStable = mkServer {
stable = true;
- sha256Hash = "1s66qnkhd9rqak13m57i266bgrk8f1ky2wxdha1jj0q9gxdsqa39";
+ sha256Hash = serverSrcHash;
};
serverPreview = mkServer {
stable = false;
- sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd";
+ sha256Hash = serverSrcHash;
};
}
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 59380cf6965e..24050314c413 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -4,39 +4,31 @@
let
pythonPackages = python3Packages;
- # TODO: Not sure if all these overwrites are really required...
- # Upstream seems to have some reasons (bugs, incompatibilities) though.
- multidict_3_1_3 =
- (stdenv.lib.overrideDerivation pythonPackages.multidict (oldAttrs:
- rec {
- pname = "multidict";
- version = "3.1.3";
- name = "${pname}-${version}";
- src = pythonPackages.fetchPypi {
- inherit pname version;
- sha256 = "04kdxh19m41c6vbshwk8jfbidsfsqn7mn0abvx09nyg78sh80pw7";
- };
- doInstallCheck = false;
- }));
- yarl = (stdenv.lib.overrideDerivation pythonPackages.yarl
- (oldAttrs:
- { propagatedBuildInputs = [ multidict_3_1_3 ]; }));
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
(oldAttrs:
rec {
pname = "aiohttp";
- version = "2.2.5";
- name = "${pname}-${version}";
+ version = "2.3.10";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "1g6kzkf5in0briyscwxsihgps833dq2ggcq6lfh1hq95ck8zsnxg";
+ sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
};
- propagatedBuildInputs = [ yarl multidict_3_1_3 ]
- ++ (with pythonPackages; [ async-timeout chardet ]);
}));
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
(oldAttrs:
- { propagatedBuildInputs = [ aiohttp ]; }));
+ rec {
+ pname = "aiohttp-cors";
+ version = "0.5.3";
+ name = "${pname}-${version}";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
+ };
+ propagatedBuildInputs = [ aiohttp ]
+ ++ stdenv.lib.optional
+ (pythonPackages.pythonOlder "3.5")
+ pythonPackages.typing;
+ }));
in pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "gns3-server";
@@ -48,21 +40,18 @@ in pythonPackages.buildPythonPackage rec {
sha256 = sha256Hash;
};
- propagatedBuildInputs = [ yarl aiohttp aiohttp-cors ]
+ propagatedBuildInputs = [ aiohttp-cors ]
++ (with pythonPackages; [
+ yarl aiohttp multidict
jinja2 psutil zipstream raven jsonschema typing
prompt_toolkit
]);
- postPatch = ''
- sed -i 's/yarl>=0.11,<0.12/yarl/g' requirements.txt
- '';
-
# Requires network access
doCheck = false;
postInstall = ''
- rm $out/bin/gns3loopback # For windows only
+ rm $out/bin/gns3loopback # For Windows only
'';
meta = with stdenv.lib; {
description = "Graphical Network Simulator 3 server (${branch} release)";
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index ddc9df759996..87ef5f2a41a2 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -1,24 +1,23 @@
{ stdenv, fetchFromGitHub, zlib
-, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
+, ocaml, jbuilder, opam, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
stdenv.mkDerivation rec {
name = "google-drive-ocamlfuse-${version}";
- version = "0.6.21";
+ version = "0.6.25";
src = fetchFromGitHub {
owner = "astrada";
repo = "google-drive-ocamlfuse";
rev = "v${version}";
- sha256 = "14qvhz18pzxdgxk5vcs024ajbkxccfwc9p3z5r6vfkc9mm851v59";
+ sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp";
};
- nativeBuildInputs = [ ocamlbuild ];
+ nativeBuildInputs = [ jbuilder opam ];
buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ];
- configurePhase = "ocaml setup.ml -configure --prefix \"$out\"";
- buildPhase = "ocaml setup.ml -build";
- installPhase = "ocaml setup.ml -install";
+ buildPhase = "jbuilder build @install";
+ installPhase = "mkdir $out && jbuilder install --prefix $out";
meta = {
homepage = http://gdfuse.forge.ocamlcore.org/;
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 7ae3e8c73611..577252bc69e0 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -2,11 +2,11 @@
, geoip, gperftools, python, swig }:
stdenv.mkDerivation rec {
- name = "bro-2.5.2";
+ name = "bro-2.5.3";
src = fetchurl {
url = "http://www.bro.org/downloads/${name}.tar.gz";
- sha256 = "0w5rynw278nl6pdl5s7gsmxjwkl6z1g5pcm6byg930k26yyb35db";
+ sha256 = "09b227j1c0ggihbhbyphd7lnh26mpz07z1s0h148dg6fwqagm13k";
};
nativeBuildInputs = [ cmake flex bison file ];
diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix
index 5261bd451e0b..8f4b54cec86a 100644
--- a/pkgs/applications/networking/ids/daq/default.nix
+++ b/pkgs/applications/networking/ids/daq/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}:
stdenv.mkDerivation rec {
- name = "daq-2.0.6";
+ name = "daq-2.2.2";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://snort.org/downloads/archive/snort/${name}.tar.gz";
- sha256 = "1jz7gc9n6sr677ssv61qvcxybdrmsll4z7g6hsmax2p0fc91s3ml";
+ sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w";
};
buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue];
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index 434ae803f0ac..e3a917a12eb3 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -1,13 +1,13 @@
{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}:
stdenv.mkDerivation rec {
- version = "2.9.8.2";
+ version = "2.9.11.1";
name = "snort-${version}";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://snort.org/downloads/archive/snort/${name}.tar.gz";
- sha256 = "0cwk02jan0vw6r3jl3vrf31vfp7i4c1r4yhb42h4gyhd6lnh2xa0";
+ sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz";
};
buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ];
diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
new file mode 100644
index 000000000000..9ec9a3451bef
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, boost }:
+
+stdenv.mkDerivation rec {
+ name = "SkypeExport-${version}";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "Temptin";
+ repo = "SkypeExport";
+ rev = "v${version}";
+ sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ boost ];
+
+ preConfigure = "cd src/SkypeExport/_gccbuild/linux";
+ installPhase = "install -Dt $out/bin SkypeExport";
+
+ meta = with stdenv.lib; {
+ description = "Export Skype history to HTML";
+ homepage = https://github.com/Temptin/SkypeExport;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ yegortimoshenko ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 10f246957d7a..225d622c69f9 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
}:
stdenv.mkDerivation rec {
- version = "0.5.6";
+ version = "0.5.8";
name = "baresip-${version}";
src=fetchurl {
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
- sha256 = "036hvl652zndqj3kmkv8z9pv7r4d1jxq8b7rg8jf0hh82vpyz38l";
+ sha256 = "0qk6y83mm7cz4j66d7zy72l7890k7ifqnqbqnjd3bjfn1yjivwfr";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [zlib openssl libre librem
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
new file mode 100644
index 000000000000..00636c7c1e9a
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
@@ -0,0 +1,30 @@
+{ fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+ name = "bitlbee-discord-2017-12-27";
+
+ src = fetchFromGitHub {
+ rev = "6a03db169ad44fee55609ecd16e19f3c0f99a182";
+ owner = "sm00th";
+ repo = "bitlbee-discord";
+ sha256 = "1ci9a12c6zg8d6i9f95pq6dal79cp4klmmsyj8ag2gin90kl3x95";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ bitlbee glib ];
+
+ preConfigure = ''
+ export BITLBEE_PLUGINDIR=$out/lib/bitlbee
+ ./autogen.sh
+ '';
+
+ meta = {
+ description = "Bitlbee plugin for Discord";
+
+ homepage = https://github.com/sm00th/bitlbee-discord;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.lassulus ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index 94490d9f0341..9793fd234a18 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json_glib }:
+{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
- buildInputs = [ bitlbee glib json_glib ];
+ buildInputs = [ bitlbee glib json-glib ];
preConfigure = ''
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index fd05948864c0..1477d0674642 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -2,13 +2,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "bitlbee-steam-2015-09-10";
+ version = "1.4.2";
+ name = "bitlbee-steam-${version}";
src = fetchFromGitHub {
- rev = "011375b2d3c67c15d51ca203de0ecaab3b4b7587";
- owner = "jgeboski";
+ rev = "v${version}";
+ owner = "bitlbee";
repo = "bitlbee-steam";
- sha256 = "1m91x3208z9zxppz998i6060alcalfly9ix9jxismj45xyp6mdx7";
+ sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index 5f868fc98584..5b70d7479269 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -16,9 +16,10 @@ buildGoPackage rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ];
- meta = {
+ meta = with stdenv.lib; {
description = "a safe and secure chat client";
homepage = https://coy.im/;
- license = stdenv.lib.licenses.gpl3;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 80e6af9c1ef5..fd253c389a27 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub
-, vala, cmake, wrapGAppsHook, pkgconfig, gettext
-, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking
+, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
+, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
, xorg, libXdmcp, libxkbcommon
, libnotify, libsoup
, libgcrypt
, epoxy
-, at_spi2_core
+, at-spi2-core
, sqlite
, dbus
, gpgme
@@ -13,26 +13,27 @@
}:
stdenv.mkDerivation rec {
- name = "dino-unstable-2017-09-26";
+ name = "dino-unstable-2018-03-10";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
- rev = "9d8e1e88ec61403659a8cc410d5c4414e3bd3a96";
- sha256 = "1p8sda99n8zsb49qd6wzwb8hddlgrzr2hp7il5v7yqxjjm2vgqfl";
+ rev = "4ccdc1d0920a93b313d81b4014b6f45efb49b1fe";
+ sha256 = "0d9698zi09s107zva6cgip7xxmdby0zfmqvka4n0khxrsnii5awq";
fetchSubmodules = true;
};
nativeBuildInputs = [
vala
cmake
+ ninja
pkgconfig
wrapGAppsHook
];
buildInputs = [
gobjectIntrospection
- glib_networking
+ glib-networking
glib
gnome3.libgee
gnome3.defaultIconTheme
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
libXdmcp
libxkbcommon
epoxy
- at_spi2_core
+ at-spi2-core
dbus
gettext
];
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 853a6c96a7a4..76d688802636 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,17 +7,18 @@
stdenv.mkDerivation rec {
pname = "discord";
- version = "0.0.2";
+ version = "0.0.4";
name = "${pname}-${version}";
src = fetchurl {
url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz";
- sha256 = "0sb7l0rrpqxzn4fndjr50r5xfiid1f81p22gda4mz943yv37mhfz";
+ sha256 = "1alw9rkv1vv0s1w33hd9ab1cgj7iqd7ad9kvn1d55gyki28f8qlb";
};
nativeBuildInputs = [ makeWrapper ];
libPath = stdenv.lib.makeLibraryPath [
+ libcxx systemd libpulseaudio
stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype
gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
@@ -28,15 +29,12 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,opt/discord,share/pixmaps}
mv * $out/opt/discord
- # Copying how adobe-reader does it,
- # see pkgs/applications/misc/adobe-reader/builder.sh
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "$out/opt/discord:$libPath" \
+ patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
$out/opt/discord/Discord
paxmark m $out/opt/discord/Discord
- wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib:${libpulseaudio}/lib"
+ wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : ${libPath}
ln -s $out/opt/discord/Discord $out/bin/
ln -s $out/opt/discord/discord.png $out/share/pixmaps
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 283d38ef5c74..003ffbfc7d1e 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -1,7 +1,7 @@
{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
-, perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook
-, libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret
-, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme
+, perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
+, libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret
+, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme
, libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
stdenv.mkDerivation rec {
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
- perl perlXMLParser evolution_data_server gnome_doc_utils avahi
- libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite
+ perl perlXMLParser evolution-data-server gnome-doc-utils avahi
+ libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite
gnome3.libsoup glib gnome3.defaultIconTheme boost
autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr
nss zlib libsecret libXrandr randrproto which libxslt libtasn1
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index b01c6497fb23..a60df1ead534 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,133 +1,60 @@
-{ stdenv, fetchurl, autoreconfHook, python, intltool, pkgconfig, libX11
-, ldns, pythonPackages
-
-# Test requirements
-, xvfb_run
-
-, enableJingle ? true, farstream ? null, gst-plugins-bad ? null
-, libnice ? null
-, enableE2E ? true
-, enableRST ? true
-, enableSpelling ? true, gtkspell2 ? null
-, enableNotifications ? false
-, enableOmemoPluginDependencies ? true
-, extraPythonPackages ? pkgs: []
+{ buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
+, python, gtk3, gobjectIntrospection
+, nbxmpp, pyasn1, pygobject3, dbus-python, pillow
+, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
+, enableE2E ? true, pycrypto, python-gnupg
+, enableSecrets ? true, libsecret
+, enableRST ? true, docutils
+, enableSpelling ? true, gspell
+, enableUPnP ? true, gupnp-igd
+, enableOmemoPluginDependencies ? true, python-axolotl, qrcode
+, extraPythonPackages ? pkgs: [], pythonPackages
}:
-assert enableJingle -> farstream != null && gst-plugins-bad != null
- && libnice != null;
-assert enableE2E -> pythonPackages.pycrypto != null;
-assert enableRST -> pythonPackages.docutils != null;
-assert enableSpelling -> gtkspell2 != null;
-assert enableNotifications -> pythonPackages.notify != null;
+with lib;
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
+buildPythonApplication rec {
name = "gajim-${version}";
- version = "0.16.8";
+ majorVersion = "1.0";
+ version = "${majorVersion}.0";
src = fetchurl {
- name = "${name}.tar.bz2";
- url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?"
- + "ref=${name}";
- sha256 = "009cpzqh4zy7hc9pq3r5m4lgagwawhjab13rjzavb0n9ggijcscb";
+ url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
+ sha256 = "10da4imfldj04917h54vrmg70a1d832jd8p6386paa5jqzf5qk20";
};
- patches = let
- # An attribute set of revisions to apply from the upstream repository.
- cherries = {
- #example-fix = {
- # rev = "";
- # sha256 = "";
- #};
- };
- in (mapAttrsToList (name: { rev, sha256 }: fetchurl {
- name = "gajim-${name}.patch";
- url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff";
- inherit sha256;
- }) cherries)
- ++ [./fix-tests.patch]; # https://dev.gajim.org/gajim/gajim/issues/8660
-
- postPatch = ''
- sed -i -e '0,/^[^#]/ {
- /^[^#]/i export \\\
- GST_PLUGIN_PATH="'"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}${""
- }$GST_PLUGIN_PATH"'"
- }' scripts/gajim.in
-
- # requires network access
- echo "" > test/integration/test_resolver.py
-
- # We want to run tests in installCheckPhase rather than checkPhase to test
- # whether the *installed* version of Gajim works rather than just whether it
- # works in the unpacked source tree.
- sed -i -e '/sys\.path\.insert.*gajim_root.*\/src/d' test/lib/__init__.py
- '' + optionalString enableSpelling ''
- sed -i -e 's|=.*find_lib.*|= "${gtkspell2}/lib/libgtkspell.so"|' \
- src/gtkspell.py
- '';
-
buildInputs = [
- python libX11
- ] ++ optionals enableJingle [ farstream gst-plugins-bad libnice ];
+ gobjectIntrospection gtk3
+ ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
+ ++ optional enableSecrets libsecret
+ ++ optional enableSpelling gspell
+ ++ optional enableUPnP gupnp-igd;
nativeBuildInputs = [
- autoreconfHook pythonPackages.wrapPython intltool pkgconfig
- # Test dependencies
- xvfb_run
+ gettext wrapGAppsHook
];
- autoreconfPhase = ''
- sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash
+ propagatedBuildInputs = [
+ nbxmpp pyasn1 pygobject3 dbus-python pillow
+ ] ++ optionals enableE2E [ pycrypto python-gnupg ]
+ ++ optional enableRST docutils
+ ++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
+ ++ extraPythonPackages pythonPackages;
+
+ checkPhase = ''
+ ${python.interpreter} test/runtests.py
'';
- propagatedBuildInputs = with pythonPackages; [
- libasyncns
- pygobject2 pyGtkGlade
- pyasn1
- pyxdg
- nbxmpp
- pyopenssl dbus-python
- ] ++ optional enableE2E pythonPackages.pycrypto
- ++ optional enableRST pythonPackages.docutils
- ++ optional enableNotifications pythonPackages.notify
- ++ optionals enableOmemoPluginDependencies (with pythonPackages; [
- cryptography python-axolotl python-axolotl-curve25519 qrcode
- ]) ++ extraPythonPackages pythonPackages;
-
- postFixup = ''
- install -m 644 -t "$out/share/gajim/icons/hicolor" \
- "icons/hicolor/index.theme"
-
- buildPythonPath "$out"
-
- for i in $out/bin/*; do
- name="$(basename "$i")"
- if [ "$name" = "gajim-history-manager" ]; then
- name="history_manager"
- fi
-
- patchPythonScript "$out/share/gajim/src/$name.py"
- done
- '';
-
- doInstallCheck = true;
- installCheckPhase = ''
- XDG_DATA_DIRS="$out/share/gajim''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" \
- PYTHONPATH="test:$out/share/gajim/src:''${PYTHONPATH:+:}$PYTHONPATH" \
- xvfb-run make test
- '';
-
- enableParallelBuilding = true;
+ # Tests try to use GTK+ which fails.
+ doCheck = false;
meta = {
homepage = http://gajim.org/;
description = "Jabber client written in PyGTK";
license = licenses.gpl3Plus;
- maintainers = [ maintainers.raskin maintainers.aszlig ];
+ maintainers = with maintainers; [ raskin aszlig abbradar ];
downloadPage = "http://gajim.org/downloads.php";
updateWalker = true;
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch
deleted file mode 100644
index cb866bb2d739..000000000000
--- a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/common/gajim.py b/src/common/gajim.py
-index 4a5d884b6..95d401b67 100644
---- a/src/common/gajim.py
-+++ b/src/common/gajim.py
-@@ -415,7 +415,7 @@ def get_jid_from_account(account_name, full=False):
- jid = name + '@' + hostname
- if full:
- resource = connections[account_name].server_resource
-- jid += '/' + resource
-+ jid += '/' + str(resource)
- return jid
-
- def get_our_jids():
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index 4e116e685c60..e24ea5e6fb37 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat
, alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd
-, mesa_noglu, xcbutilkeysyms, xdg_utils, libtool }:
+, libGL, xcbutilkeysyms, xdg_utils, libtool }:
let
- version = "4.30.0.1663";
+ version = "4.30.3.1670";
rpath = stdenv.lib.makeLibraryPath [
xdg_utils
@@ -37,14 +37,14 @@ let
expat
xcbutilkeysyms
systemd
- mesa_noglu
+ libGL
] + ":${stdenv.cc.cc.lib}/lib64";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
- sha256 = "13mh49nx75pvaygzi70sg96iad3mn9ym0p4p3ja46amkxbdkq7h7";
+ sha256 = "0alqzay6bvi7ybrrdk5r0xkg4sx6qjsqbgmr16bkqxncxhb215ay";
}
else
throw "HipChat is not supported on ${stdenv.system}";
@@ -78,8 +78,8 @@ stdenv.mkDerivation {
--replace /opt/HipChat4/bin/HipChat4 $out/bin/hipchat
makeWrapper $d/HipChat.bin $out/bin/hipchat \
- --set HIPCHAT_LD_LIBRARY_PATH '"$LD_LIBRARY_PATH"' \
- --set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"' \
+ --run 'export HIPCHAT_LD_LIBRARY_PATH=$LD_LIBRARY_PATH' \
+ --run 'export HIPCHAT_QT_PLUGIN_PATH=$QT_PLUGIN_PATH' \
--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \
--set QTWEBENGINEPROCESS_PATH $d/QtWebEngineProcess
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index 6545b90980e3..9f85c940c1bc 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -1,28 +1,29 @@
-{stdenv, fetchFromGitHub, ocamlPackages, opam}:
+{ stdenv, fetchFromGitHub, ocamlPackages }:
assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
stdenv.mkDerivation rec {
- version = "2017-08-17";
+ version = "2017-12-24";
name = "jackline-${version}";
src = fetchFromGitHub {
owner = "hannesm";
repo = "jackline";
- rev = "26688f07c3edc3b83e7aa0b9136cd1e9dcb58ed5";
- sha256 = "0yspgjhp7zy9rzvwl4pxppf5wkpa07y0122s7n09kvr0fzsh6aqf";
+ rev = "8678e8a1a06e641218a31ae25150040202f89289";
+ sha256 = "05z9kvd7gwr59ic7hnmbayhwyyqd41xxz01cvdlcgplk3z7zlwg5";
};
+ patches = [ ./tls-0.9.0.patch ];
+
buildInputs = with ocamlPackages; [
ocaml ocamlbuild findlib topkg ppx_sexp_conv
erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring
- ptime notty sexplib_p4 hex uutf opam
+ ptime notty sexplib hex uutf
];
- buildPhase = with ocamlPackages;
- "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build --pinned true";
+ buildPhase = "${ocamlPackages.topkg.run} build --pinned true";
- installPhase = "opam-installer --prefix=$out --script | sh";
+ inherit (ocamlPackages.topkg) installPhase;
meta = with stdenv.lib; {
homepage = https://github.com/hannesm/jackline;
diff --git a/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch b/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch
new file mode 100644
index 000000000000..38f38a03a802
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch
@@ -0,0 +1,29 @@
+diff --git a/cli/cli_config.ml b/cli/cli_config.ml
+index 991ee77..59a0edb 100644
+--- a/cli/cli_config.ml
++++ b/cli/cli_config.ml
+@@ -207,7 +207,9 @@ let configure term () =
+ ask above "CA file: " (fun x -> x) (fun x -> if Sys.file_exists x then `Ok x else `Invalid) term >>= fun trust_anchor ->
+ Lwt_unix.access trust_anchor [ Unix.F_OK ; Unix.R_OK ] >>= fun () ->
+ X509_lwt.certs_of_pem trust_anchor >>= fun tas ->
+- (match X509.Validation.valid_cas ~time:(Unix.time ()) tas with
++ let time = match Ptime.of_float_s (Unix.time ())
++ with Some time -> time | None -> assert false in
++ (match X509.Validation.valid_cas ~time tas with
+ | [] -> Lwt.fail (Invalid_argument "trust anchor file is empty!")
+ | _ -> Lwt.return (`Trust_anchor trust_anchor))
+ | Some fp -> Lwt.return (`Fingerprint fp) ) >>= fun authenticator ->
+diff --git a/cli/cli_state.ml b/cli/cli_state.ml
+index d5db502..91540c9 100644
+--- a/cli/cli_state.ml
++++ b/cli/cli_state.ml
+@@ -262,7 +262,8 @@ module Connect = struct
+ (match config.Xconfig.authenticator with
+ | `Trust_anchor x -> X509_lwt.authenticator (`Ca_file x)
+ | `Fingerprint fp ->
+- let time = Unix.gettimeofday () in
++ let time = match Ptime.of_float_s (Unix.gettimeofday ())
++ with Some time -> time | None -> assert false in
+ let fp =
+ Nocrypto.Uncommon.Cs.of_hex
+ (String.map (function ':' -> ' ' | x -> x) fp)
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index c4cb25dfe987..1d03c2f47c89 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -70,6 +70,6 @@ stdenv.mkDerivation rec {
description = "Open Source Video Calls and Chat";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ khumba ndowens ];
+ maintainers = with maintainers; [ ndowens ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
deleted file mode 100644
index bb2d2d39d25a..000000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt
---- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2012-08-30 16:13:17.000000000 +0200
-+++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2014-02-15 10:20:33.368716013 +0100
-@@ -26,7 +26,7 @@
- get_filename_component (_basename ${_current_MOC} NAME_WE)
- set (_header ${_abs_FILE})
- set (_moc ${_abs_PATH}/${_current_MOC})
-- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
-+ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "")
- MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
- endforeach (_current_MOC_INC)
- endif (_match)
-Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
deleted file mode 100644
index d5595fc85aff..000000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11,
- alsaLib, aspell, libidn, qca2, phonon, pkgconfig }:
-
-stdenv.mkDerivation {
-
- name = "kadu-0.12.3";
-
- src = fetchurl {
- url = http://download.kadu.im/stable/kadu-0.12.3.tar.bz2;
- sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
- ];
-
- configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
-
- preConfigure = ''
- export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig"
- '';
-
- cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'";
-
- prePatch = ''
- patchShebangs .
- '';
-
- # Disable the kadu plugins I wasn't able to get to work
- patchPhase = ''
- sed -i -e '/mpd_mediaplayer/d' \
- -e '/encryption_ng/d' \
- -e '/encryption_ng_simlite/d' Plugins.cmake
- patch -p1 < ${./cmake.patch}
- '';
-
- NIX_LDFLAGS="-lX11";
-
- meta = {
- description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)";
- homepage = http://www.kadu.net/w/English:Main_Page;
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.piotr ];
- };
-}
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index 55187f335981..e0aecd2c8102 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -1,29 +1,33 @@
{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev
-, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip
+, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp
, mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
, libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl
+, python, graphviz, belcard
}:
stdenv.mkDerivation rec {
baseName = "linphone";
- version = "3.10.2";
+ version = "3.12.0";
name = "${baseName}-${version}";
src = fetchFromGitHub {
owner = "BelledonneCommunications";
repo = "${baseName}";
rev = "${version}";
- sha256 = "053gad4amdbq5za8f2n9j5q59nkky0w098zbsa3dvpcqvv7ar16p";
+ sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j";
};
buildInputs = [
readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
- bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango
+ bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango bzrtp belcard
];
- nativeBuildInputs = [ intltool pkgconfig makeWrapper cmake doxygen ];
+ nativeBuildInputs = [
+ intltool pkgconfig makeWrapper cmake doxygen graphviz
+ (python.withPackages (ps: [ ps.pystache ps.six ]))
+ ];
NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0
-I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/
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 fbfd36a59282..457e76d0a82c 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,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } :
+{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json-glib, nss, nspr, libgnome-keyring } :
stdenv.mkDerivation rec {
name = "pidgin-opensteamworks-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/
'';
- buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ];
+ buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ];
meta = with stdenv.lib; {
homepage = https://github.com/EionRobb/pidgin-opensteamworks;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index 7ab9b1947915..6e589febe6d9 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }:
+{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
stdenv.mkDerivation rec {
name = "pidgin-skypeweb-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ pidgin json_glib ];
+ buildInputs = [ pidgin json-glib ];
makeFlags = [
"PLUGIN_DIR_PURPLE=/lib/pidgin/"
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
index c69de60c6cf5..f482e12a4bc9 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pidgin } :
let
- version = "0.7";
+ version = "0.8";
in
stdenv.mkDerivation rec {
name = "pidgin-xmpp-receipts-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "noonien-d";
repo = "pidgin-xmpp-receipts";
rev = "release_${version}";
- sha256 = "1ackqwsqgy1nfggl9na4jicv7hd542aazkg629y2jmbyj1dl3kjm";
+ sha256 = "13kwaymzkymjsdv8q95byd173i4vanj211vgx9cm0y8ag2r3cjsb";
};
buildInputs = [ pidgin ];
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
index 632f2543f57c..37b490304c4f 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json_glib, mercurial, autoreconfHook } :
+{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, mercurial, autoreconfHook } :
let
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [pidgin glib json_glib mercurial];
+ buildInputs = [pidgin glib json-glib mercurial];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
index 07cf66e572a7..460143e35494 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, pidgin, glib, json_glib, protobuf, protobufc }:
+{ stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }:
stdenv.mkDerivation rec {
name = "purple-hangouts-hg-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1";
};
- buildInputs = [ pidgin glib json_glib protobuf protobufc ];
+ buildInputs = [ pidgin glib json-glib protobuf protobufc ];
installPhase = ''
install -Dm755 -t $out/lib/pidgin/ libhangouts.so
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 2bf67f44c948..a6d893fd95a4 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,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, pidgin, json_glib, glib, http-parser } :
+{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } :
let
version = "2016-07-11";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ pidgin json_glib glib http-parser ];
+ buildInputs = [ pidgin json-glib glib http-parser ];
installPhase = ''
install -Dm755 -t $out/lib/pidgin/ libmatrix.so
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 75251b21aea1..73346888a335 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
-let version = "1.23.0"; in
+let version = "1.23.2"; in
stdenv.mkDerivation {
name = "pidgin-sipe-${version}";
src = fetchurl {
url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
- sha256 = "795811ced33fcc5affae259828f6452bfc0e0b02737ea68483e1bd9ec0459013";
+ sha256 = "1xj4nn5h103q4agar167xwcp98qf8knrgs918nl07qaxp9g4558w";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
index d02c437945e0..ddb9217d5e22 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus
-, dbus_glib }:
+, dbus-glib }:
stdenv.mkDerivation rec {
name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus_glib ];
+ buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus-glib ];
meta = {
homepage = https://github.com/novas0x2a/skype4pidgin;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index cf1893b198e5..3ec45702b175 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -1,8 +1,9 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell
, gst_all_1, startupnotification, gettext
, perl, perlXMLParser, libxml2, nss, nspr, farstream
-, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
+, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn
, lib, python, libICE, libXext, libSM
+, cyrus_sasl ? null
, openssl ? null
, gnutls ? null
, libgcrypt ? null
@@ -32,8 +33,8 @@ let unwrapped = stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
libxml2 nss nspr farstream
libXScrnSaver ncurses python
- avahi dbus dbus_glib intltool libidn
- libICE libXext libSM
+ avahi dbus dbus-glib intltool libidn
+ libICE libXext libSM cyrus_sasl
]
++ (lib.optional (openssl != null) openssl)
++ (lib.optional (gnutls != null) gnutls)
@@ -55,6 +56,7 @@ let unwrapped = stdenv.mkDerivation rec {
"--disable-nm"
"--disable-tcl"
]
+ ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ])
++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]);
enableParallelBuilding = true;
@@ -78,4 +80,3 @@ in if plugins == [] then unwrapped
inherit stdenv makeWrapper symlinkJoin plugins;
pidgin = unwrapped;
}
-
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
index 002d0345a000..5d463648bd8b 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -2,7 +2,6 @@
fetchgit, fetchhg, fetchbzr, fetchsvn }:
let
- isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64;
gui = true; # Might be implemented with nixpkgs config.
in
buildGoPackage rec {
@@ -22,11 +21,11 @@ buildGoPackage rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ trousers gtk3 gtkspell3 ]
- ++ stdenv.lib.optional isx86_64 dclxvi
+ ++ stdenv.lib.optional stdenv.hostPlatform.isx86_64 dclxvi
++ stdenv.lib.optionals gui [ wrapGAppsHook ];
buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui";
excludedPackages = "\\(appengine\\|bn256cgo\\)";
- postPatch = stdenv.lib.optionalString isx86_64 ''
+ postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isx86_64 ''
grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \
-e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \
-e "s,bn256\.,bn256cgo.,g"
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 74dc36bc7ac0..327b02b23526 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode
-, ncurses, libotr, curl, readline, libuuid
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl
+, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid
+, cmocka, libmicrohttpd, stabber, expat, libmesode
, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null
@@ -20,18 +21,22 @@ stdenv.mkDerivation rec {
name = "profanity-${version}";
version = "0.5.1";
- src = fetchurl {
- url = "http://www.profanity.im/profanity-${version}.tar.gz";
- sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3";
+ src = fetchFromGitHub {
+ owner = "boothj5";
+ repo = "profanity";
+ rev = "${version}";
+ sha256 = "1ppr02wivhlrqr62r901clnycna8zpn6kr7n5rw8y3zfw21ny17z";
};
+ patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ];
+
enableParallelBuilding = true;
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook glibcLocales pkgconfig ];
buildInputs = [
- readline libuuid libmesode
- glib openssl expat ncurses libotr curl
+ expect readline libuuid glib openssl expat ncurses libotr
+ curl libmesode cmocka libmicrohttpd stabber
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk_pixbuf ]
++ optionals traySupport [ gnome2.gtk ]
@@ -45,6 +50,20 @@ stdenv.mkDerivation rec {
++ optionals pgpSupport [ "--enable-pgp" ]
++ optionals pythonPluginSupport [ "--enable-python-plugins" ];
+ preAutoreconf = ''
+ mkdir m4
+ '';
+
+ doCheck = true;
+
+ LC_ALL = "en_US.utf8";
+
+ NIX_CFLAGS_COMPILE = [ ]
+ ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ];
+
+ LDFLAGS = [ ]
+ ++ optionals pythonPluginSupport [ "-L${python}/lib" "-lpython${python.majorVersion}m" ];
+
meta = {
description = "A console based XMPP client";
longDescription = ''
diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
new file mode 100644
index 000000000000..77bfc5e78bd0
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
@@ -0,0 +1,11 @@
+diff --git a/configure.ac b/configure.ac
+index 1e55b1cc..0832a387 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,6 @@ AC_CANONICAL_HOST
+ PLATFORM="unknown"
+ AS_CASE([$host_os],
+ [freebsd*], [PLATFORM="freebsd"],
+- [darwin*], [PLATFORM="osx"],
+ [cygwin], [PLATFORM="cygwin"],
+ [PLATFORM="nix"])
diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
new file mode 100644
index 000000000000..9ef4e7bebe54
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
@@ -0,0 +1,40 @@
+diff --git a/configure.ac b/configure.ac
+index 1e55b1cc..0832a387 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,12 +81,12 @@ elif test "x$enable_python_plugins" != xno; then
+ AM_CONDITIONAL([BUILD_PYTHON_API], [true])
+ AC_DEFINE([HAVE_PYTHON], [1], [Python support])
+ else
+- if test "x$enable_python_plugins" = xyes; then
+- AC_MSG_ERROR([Python not found, cannot enable Python plugins.])
+- else
+- AM_CONDITIONAL([BUILD_PYTHON_API], [false])
+- AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])
+- fi
++ AS_IF(
++ [test "x$enable_python_plugins" = xyes],
++ [],
++ [AM_CONDITIONAL([BUILD_PYTHON_API], [false])
++ AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])]
++ )
+ fi
+ AS_IF([test "x$PLATFORM" = xosx], [rm -f Python.framework])
+ else
+@@ -107,7 +105,7 @@ else
+ [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])],
+ [AS_IF(
+ [test "x$enable_c_plugins" = xyes],
+- [AC_MSG_ERROR([dl library needed to run C plugins])],
++ [],
+ [AM_CONDITIONAL([BUILD_C_API], [false])])
+ ])
+ else
+@@ -116,7 +114,6 @@ else
+ fi
+
+ # threading
+-ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])])
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ])
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index c4d13ac7643d..7c6f33935dc0 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "psi-plus-${version}";
- version = "0.16.575.639";
+ version = "1.2.235";
src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
rev = "${version}";
- sha256 = "0mn24y3y4qybw81rjy0hr46y7y96dvwdl6kk61kizwj32z1in8cg";
+ sha256 = "0rc65gs6m3jxg407r99kikdylvrar5mq7x5m66ma604yk5igwg47";
};
resources = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index 0e052e847ccb..654c343caa8b 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8";
};
- propagatedBuildInputs = with pythonPackages; [ msgpack pyqt4 numpy pyopencl ] ++ [ openssl ];
+ propagatedBuildInputs = with pythonPackages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ];
preConfigure = ''
# Remove interaction and misleading output
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 9cf6f4f2a408..bbad5a681807 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -3,17 +3,17 @@
libpthreadstubs, libXdmcp, libXScrnSaver,
qtbase, qtsvg, qttools, qttranslations,
ffmpeg, filter-audio, libexif, libsodium, libopus,
- libvpx, openal, opencv, pcre, qrencode, sqlcipher }:
+ libvpx, openal, pcre, qrencode, sqlcipher }:
mkDerivation rec {
name = "qtox-${version}";
- version = "1.12.1";
+ version = "1.13.0";
src = fetchFromGitHub {
owner = "qTox";
repo = "qTox";
rev = "v${version}";
- sha256 = "1l1k8s10jj6nm9i33m8xhjwdhikvp7csdp6x1gxjxdj526aak8q9";
+ sha256 = "08x71p23d0sp0w11k8z3wf3k56iclmdq9x652n8ggidgyrdi9f6y";
};
buildInputs = [
@@ -21,7 +21,7 @@ mkDerivation rec {
libpthreadstubs libXdmcp libXScrnSaver
qtbase qtsvg qttranslations
ffmpeg filter-audio libexif libopus libsodium
- libvpx openal opencv pcre qrencode sqlcipher
+ libvpx openal pcre qrencode sqlcipher
];
nativeBuildInputs = [ cmake pkgconfig qttools ];
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 08625d321235..768ab24c2f39 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,29 +1,29 @@
-{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, cmake }:
+{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake, libqmatrixclient }:
-mkDerivation rec {
- name = "quaternion-git-${version}";
- version = "2017-10-07";
+stdenv.mkDerivation rec {
+ name = "quaternion-${version}";
+ version = "0.0.5";
- # quaternion and tensor share the same libqmatrixclient library as a git submodule
- #
- # As all 3 projects are in very early stages, we simply load the submodule.
- #
- # At some point in the future, we should separate out libqmatrixclient into its own
- # derivation.
+ # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source
- src = fetchgit {
- url = "https://github.com/QMatrixClient/Quaternion.git";
- rev = "1007f2ca4ad5e8cc5dba437d6a0cdea07d1f1332";
- sha256 = "0hvc81ld7fcwyrxsr2q3yvzh0rzhgmflby4nmyzcbjds7b7pv0xq";
- fetchSubmodules = true;
+ src = fetchFromGitHub {
+ owner = "QMatrixClient";
+ repo = "Quaternion";
+ rev = "v${version}";
+ sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd";
};
- buildInputs = [ qtbase qtquickcontrols ];
+ buildInputs = [ qtbase qtquickcontrols libqmatrixclient ];
+
nativeBuildInputs = [ cmake ];
- cmakeFlags = [
- "-Wno-dev"
- ];
+ enableParallelBuilding = true;
+
+ # take the source from libqmatrixclient
+ postPatch = ''
+ rm -rf lib
+ ln -s ${libqmatrixclient.src} lib
+ '';
postInstall = ''
substituteInPlace $out/share/applications/quaternion.desktop \
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 543bf6425250..594004fd2949 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha, auth0ClientID, auth0Domain }:
+{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha
+, auth0ClientID, auth0Domain, disableTooltips }:
stdenv.mkDerivation rec {
name = "rambox-bare-${version}";
@@ -20,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4";
};
- patches = [ ./hide-check-for-updates.patch ./isDev.patch ];
+ patches = [ ./hide-check-for-updates.patch ./isDev.patch ]
+ ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ];
configurePhase = ''
echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 05e1d902dd7b..a601db8c8da5 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,16 +1,14 @@
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
-# These credentials are only for this derivation. If you want to get credentials
-# for another distribution, go to https://auth0.com. If you want to reuse the same
-# domain, drop a line at yegortimoshenko@gmail.com!
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
-, auth0Domain ? "nixpkgs.auth0.com" }:
+, auth0Domain ? "nixpkgs.auth0.com"
+, disableTooltips ? false }:
let
callPackage = newScope self;
self = {
fetchNodeModules = callPackage ./fetchNodeModules.nix {};
rambox-bare = callPackage ./bare.nix {
- inherit auth0ClientID auth0Domain;
+ inherit auth0ClientID auth0Domain disableTooltips;
};
sencha = callPackage ./sencha {};
};
diff --git a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch
new file mode 100644
index 000000000000..5ddaa9d51771
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch
@@ -0,0 +1,19 @@
+--- index.html.orig 2017-12-16 20:06:03.401298402 +0300
++++ ./index.html 2017-12-16 20:06:21.474484436 +0300
+@@ -43,14 +43,14 @@
+
+
+
+- -->
+
+
+
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix
index 053e8a9c9739..5d004db60e3a 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@@ -1,28 +1,34 @@
-{ stdenv, fetchurl, libtoxcore
+{ stdenv, fetchgit, libtoxcore
, conf ? null }:
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "ratox-0.2.1";
+let
+ configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
+in
- src = fetchurl {
- url = "http://git.2f30.org/ratox/snapshot/${name}.tar.gz";
- sha256 = "0xnw3zcz9frmcxqhwg38hhnsy1g5xl9yc19nl0vwi5awz8wqqy19";
+stdenv.mkDerivation rec {
+ name = "ratox-0.4";
+
+ src = fetchgit {
+ url = "git://git.2f30.org/ratox.git";
+ rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c";
+ sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5";
};
+ patches = [ ./ldlibs.patch ];
+
buildInputs = [ libtoxcore ];
- configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h";
- preBuild = "makeFlags=PREFIX=$out";
+ makeFlags = [ "PREFIX=$(out)" ];
- meta =
- { description = "FIFO based tox client";
- homepage = http://ratox.2f30.org/;
- license = licenses.isc;
- maintainers = with maintainers; [ ehmry ];
- platforms = platforms.linux;
- };
+ meta = {
+ description = "FIFO based tox client";
+ homepage = http://ratox.2f30.org/;
+ license = licenses.isc;
+ maintainers = with maintainers; [ ehmry ];
+ platforms = platforms.linux;
+ };
}
diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
new file mode 100644
index 000000000000..1406e7143107
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
@@ -0,0 +1,5 @@
+--- a/config.mk
++++ b/config.mk
+@@ -13 +13 @@ LDFLAGS = -L/usr/local/lib
+-LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread
++LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index 050eb7765906..c99130f28a39 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -46,6 +46,9 @@ stdenv.mkDerivation rec {
cp icons/ricochet.png $out/share/pixmaps/ricochet.png
'';
+ # RCC: Error in 'translation/embedded.qrc': Cannot find file 'ricochet_en.qm'
+ enableParallelBuilding = false;
+
meta = with stdenv.lib; {
description = "Anonymous peer-to-peer instant messaging";
homepage = https://ricochet.im;
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 0632e787c700..024902a9c486 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -24,7 +24,7 @@
, gnutls
, zlib
, jsoncpp
-, xlibs
+, xorg
, libargon2
, cryptopp
, openssl
@@ -77,7 +77,7 @@ let
"${patchdir}/pjproject/add_dtls_transport.patch"
];
CFLAGS = "-g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000";
- });
+ });
in
stdenv.mkDerivation rec {
name = "ring-daemon-${version}";
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
zlib
jsoncpp
restbed
- xlibs.libX11
+ xorg.libX11
libargon2
cryptopp
openssl
@@ -145,5 +145,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ taeer olynch ];
platforms = platforms.linux;
+ # pjsip' fails to compile with the supplied patch set, see: https://hydra.nixos.org/build/68667921/nixlog/4
+ broken = true;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index db0d874c5897..b47280d3b156 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch, writeText, conf ? null }:
+let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
- version = "0.12.6";
+ version = "0.13.5";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "00hxjhnsm4622hv46xm7lc81kbnzi2iz77qppwma14cbh63jbilv";
+ sha256 = "1ap62ksi3dg7qijxxysjpnlmngzgh2jdldvb8s1jx14avanccch6";
};
installPhase = ''
mkdir -p $out/
cp -R . $out/
+ ${lib.optionalString (conf != null) "ln -s ${configFile} $out/config.json"}
'';
meta = {
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix
new file mode 100644
index 000000000000..f627479a3c04
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix
@@ -0,0 +1,87 @@
+{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype,
+fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr,
+libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
+nspr, alsaLib, cups, expat, udev
+}:
+let
+ rpath = lib.makeLibraryPath [
+ alsaLib
+ atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ gnome2.GConf
+ gnome2.gtk
+ gnome2.pango
+ libX11
+ libXScrnSaver
+ libXcomposite
+ libXcursor
+ libXdamage
+ libXext
+ libXfixes
+ libXi
+ libXrandr
+ libXrender
+ libXtst
+ nspr
+ nss
+ stdenv.cc.cc
+ udev
+ xorg.libxcb
+ ];
+
+in
+ stdenv.mkDerivation rec {
+ name = "signal-desktop-${version}";
+
+ version = "1.1.0-beta.5";
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
+ sha256 = "1kllym2iazp9i5afrh0vmsqqlh5b8i6f929p5yhl8bl4zd17zwpx";
+ }
+ else
+ throw "Signal for Desktop is not currently supported on ${stdenv.system}";
+
+ phases = [ "unpackPhase" "installPhase" ];
+ nativeBuildInputs = [ dpkg ];
+ unpackPhase = "dpkg-deb -x $src .";
+ installPhase = ''
+ mkdir -p $out
+ cp -R opt $out
+ cp -R usr/share $out/share
+
+ chmod -R g-w $out
+
+ # Patch signal
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${rpath}:$out/opt/Signal Beta" \
+ "$out/opt/Signal Beta/signal-desktop-beta"
+
+ # Symlink to bin
+ mkdir -p $out/bin
+ ln -s "$out/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta
+
+ # Fix the desktop link
+ substituteInPlace $out/share/applications/signal-desktop-beta.desktop \
+ --replace "/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta
+ '';
+
+ meta = {
+ description = "Signal Private Messenger for the Desktop (Beta version)";
+ homepage = https://signal.org/;
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [ ixmatus benley ];
+ platforms = [
+ "x86_64-linux"
+ ];
+ };
+ }
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 0376fb79c9be..8dbf0e774e47 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype,
-fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr,
+fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr,
libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
nspr, alsaLib, cups, expat, udev
}:
@@ -33,20 +33,20 @@ let
nss
stdenv.cc.cc
udev
- xlibs.libxcb
+ xorg.libxcb
];
in
stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
- version = "1.0.35";
+ version = "1.5.2";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "d9f9d4d54f4121efc8eadf1cf0ff957828088b313e53b66dc540b851c44c1860";
+ sha256 = "1h4qa5i7axkmsai854yvlyh5r038mmjl4pj2rd27mz11if7yf067";
}
else
throw "Signal for Desktop is not currently supported on ${stdenv.system}";
@@ -79,9 +79,10 @@ in
meta = {
description = "Signal Private Messenger for the Desktop.";
- homepage = https://signal.org/;
- license = lib.licenses.gpl3;
- platforms = [
+ homepage = https://signal.org/;
+ license = lib.licenses.gpl3;
+ maintainers = [ lib.maintainers.ixmatus ];
+ 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 bfccc4bfcb6c..8cd9eb84b835 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,10 +1,12 @@
{ stdenv, fetchurl, dpkg, makeWrapper
-, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2, libsecret
-, libnotify, nspr, nss, systemd, xorg, libv4l, libstdcxx5 }:
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2
+, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, systemd, xorg }:
let
- version = "5.5.0.1";
+ # 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.17.0.2";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -17,22 +19,23 @@ let
fontconfig
freetype
glib
- libsecret
glibc
- libstdcxx5
+ libsecret
gnome2.GConf
gnome2.gdk_pixbuf
gnome2.gtk
gnome2.pango
- gnome2.gnome_keyring
+ gnome2.gnome-keyring
libnotify
+ libpulseaudio
nspr
nss
stdenv.cc.cc
systemd
+ libstdcxx5
libv4l
xorg.libxkbfile
@@ -54,7 +57,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
- sha256 = "1r65qlsjwp0n0fmlhvbp71h03b3x73r26jk9f4q687sjqnzmkvcr";
+ sha256 = "0lv8sb49ws8yjh4kkppzqy7sap2b1fw0y13lsc9s45w8mw3l16rp";
}
else
throw "Skype for linux is not supported on ${stdenv.system}";
@@ -82,8 +85,8 @@ in stdenv.mkDerivation {
postFixup = ''
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
- patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+ patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
done
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
@@ -92,15 +95,13 @@ in stdenv.mkDerivation {
substituteInPlace $out/share/applications/skypeforlinux.desktop \
--replace /usr/bin/ $out/bin/ \
--replace /usr/share/ $out/share/
-
'';
meta = with stdenv.lib; {
description = "Linux client for skype";
homepage = https://www.skype.com;
license = licenses.unfree;
- maintainers = with stdenv.lib.maintainers; [ panaeon ];
+ maintainers = with stdenv.lib.maintainers; [ panaeon jraygauthier ];
platforms = [ "x86_64-linux" ];
};
}
-
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 8f107c4f3c37..b6f731ee6513 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -4,7 +4,7 @@
let
- version = "2.8.2";
+ version = "3.0.5";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -46,7 +46,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
- sha256 = "019gzij6m1y9bv561nhbhgf2njp2svjqi5hs907pdjf7xwciwrkm";
+ sha256 = "13im5m119cp5v0gvr1vpxjqskr8rvl6pii91b5x522wm7plfhj8s";
}
else
throw "Slack is not supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix
new file mode 100644
index 000000000000..0bcf3493d29e
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/stride/default.nix
@@ -0,0 +1,68 @@
+{ stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
+, freetype, gdk_pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
+let
+ fullPath = stdenv.lib.makeLibraryPath [
+ alsaLib
+ atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ gnome2.GConf
+ gnome2.gtk
+ nspr
+ nss
+ pango
+ udev
+ xorg.libX11
+ xorg.libXScrnSaver
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXtst
+ xorg.libxcb
+ ] + ":${stdenv.cc.cc.lib}/lib64";
+in
+stdenv.mkDerivation rec {
+ version = "1.8.18";
+ name = "stride-${version}";
+
+ src = fetchurl {
+ url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb";
+ sha256 = "0hpj3i3xbvckxm7fphqqb3scb31w2cg4riwp593y0gnbivpc0hym";
+ };
+
+ dontBuild = true;
+ dontFixup = true;
+
+ buildInputs = [ dpkg ];
+
+ unpackPhase = ''
+ dpkg-deb -x ${src} ./
+ '';
+
+ installPhase =''
+ mkdir "$out"
+ mv usr/* "$out/"
+ patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${fullPath}:\$ORIGIN" \
+ "$out/bin/stride"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Desktop client for Atlassian Stride";
+ homepage = https://www.stride.com/;
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ puffnfresh ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index c14c9ade2dda..ea2030e964b9 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -31,7 +31,7 @@ in
stdenv.mkDerivation rec {
name = "teamspeak-client-${version}";
- version = "3.1.6";
+ version = "3.1.8";
src = fetchurl {
urls = [
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
"http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
];
sha256 = if stdenv.is64bit
- then "0ncqs5ykk1zsn2lqarf7pr39rbp4h54vaqq1sgqi5irpj6yagzak"
- else "222e8abb24de9e3ea00fca10be32340ad88859a4d811afa644c5096aada4996d";
+ then "0yav71sfklqg2k3ayd0bllsixd486l0587s5ygjlc9gnchw3zg6z"
+ else "1agf6jf5hkyxazxqcnvcjfb263p5532ahi7h4rkifnnvqay36v5i";
};
# grab the plugin sdk for the desktop icon
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
free = false;
};
maintainers = [ stdenv.lib.maintainers.lhvwb ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index 29026ccdc5ad..77a8d57f8b6f 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
description = "Telegram client forked from sigram";
homepage = http://aseman.co/en/products/cutegram/;
license = licenses.gpl3;
- maintainers = with maintainers; [ profpatsch AndersonTorres ];
+ maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};
}
-#TODO: appindicator, for system tray plugin (by @profpatsch)
+#TODO: appindicator, for system tray plugin
diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
index ec2e65dc4997..49368da708e9 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "A fork of libqtelegram by Aseman, using qmake";
homepage = src.meta.homepage;
license = licenses.gpl3;
- maintainers = [ maintainers.profpatsch ];
+ maintainers = [ maintainers.Profpatsch ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 3f438c625088..afba9ab022ad 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,110 +1,18 @@
-{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake
-, qtbase, qtimageformats
-, gtk3, libappindicator-gtk3, dee
-, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio
-, gcc
-}:
+{ qt5, stdenv }:
-mkDerivation rec {
- name = "telegram-desktop-${version}";
- version = "1.1.23";
-
- # Submodules
- src = fetchgit {
- url = "git://github.com/telegramdesktop/tdesktop";
- rev = "v${version}";
- sha256 = "0pdjrypjg015zvg8iydrja8kzvq0jsi1wz77r2cxvyyb4rkgyv7x";
- fetchSubmodules = true;
- };
-
- tgaur = fetchgit {
- url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
- rev = "885d0594d8dfa0a17c14140579a3d27ef2b9bdd0";
- sha256 = "0cdci8d8j3czhznp7gqn16w32j428njmzxr34pdsv40gggh0lbpn";
- };
-
- buildInputs = [
- gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip
- libopus alsaLib libpulseaudio
- ];
-
- nativeBuildInputs = [ pkgconfig gyp cmake gcc ];
-
- patches = [ "${tgaur}/tdesktop.patch" ];
-
- enableParallelBuilding = true;
-
- GYP_DEFINES = lib.concatStringsSep "," [
- "TDESKTOP_DISABLE_CRASH_REPORTS"
- "TDESKTOP_DISABLE_AUTOUPDATE"
- "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
- ];
-
- NIX_CFLAGS_COMPILE = [
- "-DTDESKTOP_DISABLE_AUTOUPDATE"
- "-DTDESKTOP_DISABLE_CRASH_REPORTS"
- "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
- "-I${minizip}/include/minizip"
- # See Telegram/gyp/qt.gypi
- "-I${qtbase.dev}/mkspecs/linux-g++"
- ] ++ lib.concatMap (x: [
- "-I${qtbase.dev}/include/${x}"
- "-I${qtbase.dev}/include/${x}/${qtbase.version}"
- "-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}"
- "-I${libopus.dev}/include/opus"
- "-I${alsaLib.dev}/include/alsa"
- "-I${libpulseaudio.dev}/include/pulse"
- ]) [ "QtCore" "QtGui" ];
- CPPFLAGS = NIX_CFLAGS_COMPILE;
-
- preConfigure = ''
-
- pushd "Telegram/ThirdParty/libtgvoip"
- patch -Np1 -i "${tgaur}/libtgvoip.patch"
- popd
-
- sed -i Telegram/gyp/telegram_linux.gypi \
- -e 's,/usr,/does-not-exist,g' \
- -e 's,appindicator-0.1,appindicator3-0.1,g' \
- -e 's,-flto,,g'
-
- sed -i Telegram/gyp/qt.gypi \
- -e "s,/usr/bin/moc,moc,g"
- sed -i Telegram/gyp/qt_rcc.gypi \
- -e "s,/usr/bin/rcc,rcc,g"
-
- gyp \
- -Dbuild_defines=${GYP_DEFINES} \
- -Gconfig=Release \
- --depth=Telegram/gyp \
- --generator-output=../.. \
- -Goutput_dir=out \
- --format=cmake \
- Telegram/gyp/Telegram.gyp
-
- cd out/Release
-
- NUM=$((`wc -l < CMakeLists.txt` - 2))
- sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt
-
- export ASM=$(type -p gcc)
- '';
-
- installPhase = ''
- install -Dm755 Telegram $out/bin/telegram-desktop
- mkdir -p $out/share/applications $out/share/kde4/services
- sed "s,/usr/bin,$out/bin,g" $tgaur/telegram-desktop.desktop > $out/share/applications/telegram-desktop.desktop
- sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
- for icon_size in 16 32 48 64 128 256 512; do
- install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
- done
- '';
-
- meta = with lib; {
- description = "Telegram Desktop messaging app";
- license = licenses.gpl3;
- platforms = platforms.linux;
- homepage = https://desktop.telegram.org/;
- maintainers = with maintainers; [ abbradar garbas ];
+let
+ mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
+ stableVersion = {
+ stable = true;
+ version = "1.2.14";
+ sha256Hash = "1412bls4qmfsa4nlqrxrc1j1jslhj6rhg8k69blhks9grrz36s1l";
+ # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
+ archPatchesRevision = "310557";
+ archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk";
};
+in {
+ stable = mkTelegram stableVersion;
+ preview = mkTelegram (stableVersion // {
+ stable = false;
+ });
}
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
new file mode 100644
index 000000000000..a49ef87f5408
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -0,0 +1,133 @@
+{ stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
+
+{ mkDerivation, lib, fetchgit, fetchsvn
+, pkgconfig, pythonPackages, cmake, makeWrapper
+, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
+, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
+}:
+
+with lib;
+
+mkDerivation rec {
+ name = "telegram-desktop-${version}";
+ inherit version;
+
+ # Telegram-Desktop with submodules
+ src = fetchgit {
+ url = "git://github.com/telegramdesktop/tdesktop";
+ rev = "v${version}";
+ sha256 = sha256Hash;
+ fetchSubmodules = true;
+ };
+
+ # Arch patches (svn export telegram-desktop/trunk)
+ archPatches = fetchsvn {
+ url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
+ rev = archPatchesRevision;
+ sha256 = archPatchesHash;
+ };
+
+ # TODO: libtgvoip.patch no-gtk2.patch
+ patches = [ "${archPatches}/tdesktop.patch" ];
+
+ postPatch = ''
+ substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
+ --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
+ substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \
+ --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
+ '';
+
+ nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake makeWrapper ];
+
+ buildInputs = [
+ qtbase qtimageformats gtk3 libappindicator-gtk3
+ dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
+ ];
+
+ enableParallelBuilding = true;
+
+ GYP_DEFINES = concatStringsSep "," [
+ "TDESKTOP_DISABLE_CRASH_REPORTS"
+ "TDESKTOP_DISABLE_AUTOUPDATE"
+ "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+ ];
+
+ NIX_CFLAGS_COMPILE = [
+ "-DTDESKTOP_DISABLE_CRASH_REPORTS"
+ "-DTDESKTOP_DISABLE_AUTOUPDATE"
+ "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+ "-I${minizip}/include/minizip"
+ # See Telegram/gyp/qt.gypi
+ "-I${getDev qtbase}/mkspecs/linux-g++"
+ ] ++ concatMap (x: [
+ "-I${getDev qtbase}/include/${x}"
+ "-I${getDev qtbase}/include/${x}/${qtbase.version}"
+ "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}"
+ "-I${getDev libopus}/include/opus"
+ "-I${getDev alsaLib}/include/alsa"
+ "-I${getDev libpulseaudio}/include/pulse"
+ ]) [ "QtCore" "QtGui" "QtDBus" ];
+ CPPFLAGS = NIX_CFLAGS_COMPILE;
+
+ preConfigure = ''
+ pushd "Telegram/ThirdParty/libtgvoip"
+ patch -Np1 -i "${archPatches}/libtgvoip.patch"
+ popd
+
+ sed -i Telegram/gyp/telegram_linux.gypi \
+ -e 's,/usr,/does-not-exist,g' \
+ -e 's,appindicator-0.1,appindicator3-0.1,g' \
+ -e 's,-flto,,g'
+
+ sed -i Telegram/gyp/qt.gypi \
+ -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
+ -e 's,\d+",\d+" | head -n1,g'
+ sed -i Telegram/gyp/qt_moc.gypi \
+ -e "s,/usr/bin/moc,moc,g"
+ sed -i Telegram/gyp/qt_rcc.gypi \
+ -e "s,/usr/bin/rcc,rcc,g"
+
+ gyp \
+ -Dbuild_defines=${GYP_DEFINES} \
+ -Gconfig=Release \
+ --depth=Telegram/gyp \
+ --generator-output=../.. \
+ -Goutput_dir=out \
+ --format=cmake \
+ Telegram/gyp/Telegram.gyp
+
+ cd out/Release
+
+ NUM=$((`wc -l < CMakeLists.txt` - 2))
+ sed -i "$NUM r $archPatches/CMakeLists.inj" CMakeLists.txt
+
+ export ASM=$(type -p gcc)
+ '';
+
+ installPhase = ''
+ install -Dm755 Telegram $out/bin/telegram-desktop
+
+ mkdir -p $out/share/applications $out/share/kde4/services
+ install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop"
+ sed "s,/usr/bin,$out/bin,g" $archPatches/tg.protocol > $out/share/kde4/services/tg.protocol
+ for icon_size in 16 32 48 64 128 256 512; do
+ install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
+ done
+
+ # This is necessary to run Telegram in a pure environment.
+ wrapProgram $out/bin/telegram-desktop \
+ --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \
+ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
+ sed -i $out/bin/telegram-desktop \
+ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
+ '';
+
+ meta = {
+ description = "Telegram Desktop messaging app "
+ + (if stable then "(stable version)" else "(pre-release)");
+ license = licenses.gpl3;
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ homepage = https://desktop.telegram.org/;
+ maintainers = with maintainers; [ primeos abbradar garbas ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
index c8d24c9b28c1..0efa7bee1d0b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
description = "Telegram API tools for QtQml and Qml";
homepage = src.meta.homepage;
license = licenses.gpl3;
- maintainers = [ maintainers.profpatsch ];
+ maintainers = [ maintainers.Profpatsch ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 32266d7b42d5..1b9ccb98d0fa 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon
+{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon
, sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec {
- name = "telepathy-gabble-0.18.2";
+ name = "telepathy-gabble-0.18.3";
src = fetchurl {
url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
- sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9";
+ sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf";
};
nativeBuildInputs = [ pkgconfig libxslt ];
- buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls telepathy_glib.python ]
+ buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]
++ stdenv.lib.optional doCheck dbus_daemon;
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
@@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
- homepage = http://telepathy.freedesktop.org;
+ homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/;
description = "Jabber/XMPP connection manager for the Telepathy framework";
+ license = licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.gnu;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
index 4e4a2a9b6a96..a1669183bb3b 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }:
+{ stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }:
stdenv.mkDerivation rec {
pname = "telepathy-haze";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
};
- buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ];
+ buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ];
nativeBuildInputs = [ pkgconfig libxslt ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index b4fd71b01d44..7894554eee4f 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, gnome3, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
stdenv.mkDerivation rec {
pname = "telepathy-idle";
@@ -11,7 +11,7 @@ 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 gnome3.dconf) makeWrapper ];
preFixup = ''
wrapProgram "$out/libexec/telepathy-idle" \
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 0bd6c2e5f2b5..111970ab7112 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig
+{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }:
stdenv.mkDerivation rec {
project = "telepathy-logger";
- name = "${project}-0.8.0";
+ name = "${project}-0.8.2";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
};
- NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
-
- nativeBuildInputs = [ makeWrapper pkgconfig ];
- buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt
- gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ];
+ nativeBuildInputs = [
+ makeWrapper pkgconfig intltool libxslt gobjectIntrospection
+ ];
+ buildInputs = [
+ dbus-glib libxml2 sqlite telepathy-glib
+ dbus_libs telepathy-glib.python
+ ];
configureFlags = "--enable-call";
@@ -24,10 +26,11 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Logger service for Telepathy framework";
- homepage = http://telepathy.freedesktop.org/wiki/Logger ;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.gnu; # Arbitrary choice
+ homepage = https://telepathy.freedesktop.org/components/telepathy-logger/;
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ jtojnar ];
+ platforms = platforms.gnu; # Arbitrary choice
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index 87ae0210bdae..18b3bb06e98f 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper, upower }:
+{ stdenv, fetchurl, pkgconfig, gnome3, telepathy-glib, libxslt, makeWrapper }:
stdenv.mkDerivation rec {
- name = "${pname}-5.16.3";
+ name = "${pname}-5.16.4";
pname = "telepathy-mission-control";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
- sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi";
+ sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp";
};
- buildInputs = [ telepathy_glib telepathy_glib.python makeWrapper /*upower*/ ]; # ToDo: optional stuff missing
- # 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it
+ buildInputs = [ telepathy-glib telepathy-glib.python ]; # ToDo: optional stuff missing
- nativeBuildInputs = [ pkgconfig libxslt ];
+ nativeBuildInputs = [ pkgconfig libxslt makeWrapper ];
doCheck = true;
@@ -24,8 +23,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An account manager and channel dispatcher for the Telepathy framework";
- homepage = http://telepathy.freedesktop.org/wiki/;
+ homepage = https://telepathy.freedesktop.org/components/telepathy-mission-control/;
license = licenses.lgpl21;
+ maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index cbae6af97b85..e060eaabf281 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup
+{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup
, libuuid, openssl, pcre, sqlite, pkgconfigUpstream }:
stdenv.mkDerivation rec {
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
};
# pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
- buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl
- sqlite pcre telepathy_glib.python ];
+ buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl
+ sqlite pcre telepathy-glib.python ];
nativeBuildInputs = [ libxslt pkgconfigUpstream ];
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index 0571946061bc..c6b930fc590f 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -1,5 +1,8 @@
{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
+# we now have libqmatrixclient so a future version of tensor that supports it
+# should use that
+
stdenv.mkDerivation rec {
name = "tensor-git-${version}";
version = "2017-02-21";
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 700fab061164..06bcd7a0400e 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -33,6 +33,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.phreedom ];
platforms = platforms.unix;
- broken = true;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index d7e960d2329e..3c164820019b 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, mesa, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
+ libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
}:
assert stdenv.system == "x86_64-linux";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
libpulseaudio
libxml2
libxslt
- mesa
+ libGLU_combined
nspr
nss
openssl
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index b6a4e7944d3c..03b4b980929c 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, system, makeWrapper,
+{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem,
alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
- libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:
+ libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:
let
@@ -59,7 +59,7 @@ in stdenv.mkDerivation {
];
installPhase = ''
- $preInstallHooks
+ runHook preInstall
packagePath=$out/share/zoom-us
mkdir -p $packagePath
@@ -88,9 +88,19 @@ in stdenv.mkDerivation {
Prefix = $packagePath
EOF
- $postInstallHooks
+ runHook postInstall
'';
+ postInstall = (makeDesktopItem {
+ name = "zoom-us";
+ exec = "$out/bin/zoom-us %U";
+ icon = "$out/share/zoom-us/application-x-zoom.png";
+ desktopName = "Zoom";
+ genericName = "Video Conference";
+ categories = "Network;Application;";
+ mimeType = "x-scheme-handler/zoommtg;";
+ }).buildCommand;
+
meta = {
homepage = https://zoom.us/;
description = "zoom.us video conferencing application";
diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index 93efdb74c083..cf3725c35e3d 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "insync-${version}";
- version = "1.3.17.36167";
+ version = "1.3.22.36179";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
- sha256 = "0mvg22psiy4x9g7k1fm9pigz2a70jmin7zg2nfzapfnqjlnrbw3n";
+ sha256 = "0jmycpbmfvvpilcycyg6zgpjz6449bs17d2w4jx7m1rvzmpkk140";
}
else
throw "${name} is not supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix
index a79df085e6bb..7c40a4e12a66 100644
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/pkgs/applications/networking/irc/bip/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
})
];
- NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ];
meta = {
description = "An IRC proxy (bouncer)";
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index baa0b10fd756..b9860fa42273 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2
-, libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy
+, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy
, libsexy, enchant, libnotify, openssl, intltool
-, desktop_file_utils, hicolor_icon_theme
+, desktop-file-utils, hicolor-icon-theme
, autoconf, automake, autoconf-archive
}:
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gtk2 lua perl python2 pciutils dbus_glib libcanberra_gtk2 libproxy
- libsexy libnotify openssl desktop_file_utils hicolor_icon_theme
+ gtk2 lua perl python2 pciutils dbus-glib libcanberra-gtk2 libproxy
+ libsexy libnotify openssl desktop-file-utils hicolor-icon-theme
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix
index c6bb2479bfc1..b4532c5470b8 100644
--- a/pkgs/applications/networking/irc/ii/default.nix
+++ b/pkgs/applications/networking/irc/ii/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "ii-1.7";
-
+ name = "ii-1.8";
+
src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
- sha256 = "176cqwnn6h7w4kbfd66hzqa243l26pqp2b06bii0nmnm0rkaqwis";
+ sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
};
installPhase = ''
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = http://tools.suckless.org/ii/;
+ homepage = https://tools.suckless.org/ii/;
license = stdenv.lib.licenses.mit;
description = "Irc it, simple FIFO based irc client";
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 75c4f9ac5c93..97838312fd0b 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
stdenv.mkDerivation rec {
- version = "1.0.5";
+ version = "1.1.1";
name = "irssi-${version}";
src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
- sha256 = "1lasb8flic4qc1sd3pvfg9aig5skcxlyx6iy9bk73147r8vzaq75";
+ sha256 = "09a9p1yfg0m3w7n2a4axvn8874002ly8x0b543sxihzqk29radpa";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 5b86e79e99a1..96218ef87b5f 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -29,13 +29,13 @@
let
pname = "konversation";
- version = "1.7.2";
+ version = "1.7.4";
in mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "0616h59bsw5c3y8lij56v3fhv9by0rwdfcaa83yfxqg4rs26xyaz";
+ sha256 = "0y4rj4fcl1wsi3y1fhnzad9nf4llwrnipfm9mfm55kqnx1zmpvqp";
};
buildInputs = [
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 78646f7a8b2f..7c685b9df6b9 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -74,7 +74,7 @@ in with stdenv; mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://quassel-irc.org/;
+ homepage = https://quassel-irc.org/;
description = "Qt/KDE distributed IRC client suppporting a remote daemon";
longDescription = ''
Quassel IRC is a cross-platform, distributed IRC client,
diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix
index 6f48f44214cc..975715ed7fcd 100644
--- a/pkgs/applications/networking/irc/sic/default.nix
+++ b/pkgs/applications/networking/irc/sic/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Simple IRC client";
- homepage = http://tools.suckless.org/sic/;
+ homepage = https://tools.suckless.org/sic/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 1b730af54fea..cfed44c997ae 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -11,7 +11,7 @@
, rubySupport ? true, ruby
, tclSupport ? true, tcl
, extraBuildInputs ? []
-, configure ? null
+, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
, runCommand }:
let
@@ -29,23 +29,14 @@ let
weechat =
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "1.9.1";
+ version = "2.0";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1";
+ sha256 = "0jd1l67k2k44xmfv0a71im3j4v0gss3a6bd5s84nj3f7lqnfmqdn";
};
- patches = [
- # TODO: Remove this patch when weechat is updated to a release that
- # incorporates weechat/weechat#971
- (fetchpatch {
- url = https://github.com/lheckemann/weechat/commit/45a4f0565cc745b9c6e943f20199015185696df0.patch;
- sha256 = "0x7vv7g0k3b2hj444x2cinyv1mq5bkr6m18grfnyy6swbymzc9bj";
- })
- ];
-
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
enableParallelBuilding = true;
@@ -121,9 +112,9 @@ in if configure == null then weechat else
ln -s $plugin $out/plugins
done
'';
- in writeScriptBin "weechat" ''
+ in (writeScriptBin "weechat" ''
#!${stdenv.shell}
export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
exec ${weechat}/bin/weechat "$@"
- ''
+ '') // { unwrapped = weechat; }
diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index db36c8dca617..ec67321400dc 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -1,18 +1,50 @@
-{ fetchurl, stdenv, ant }:
+{ fetchurl, stdenv, jre, makeWrapper, coreutils }:
stdenv.mkDerivation rec {
- name = "jmeter-2.11";
+ name = "jmeter-${version}";
+ version = "4.0";
src = fetchurl {
url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
- sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944";
+ sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4";
};
+ nativeBuildInputs = [ makeWrapper ];
+
installPhase = ''
mkdir $out
- cp ./* $out/ -R
+
+ rm bin/*.bat bin/*.cmd
+
+ cp -R * $out/
+
+ substituteInPlace $out/bin/create-rmi-keystore.sh --replace \
+ "keytool -genkey" \
+ "${jre}/lib/openjdk/jre/bin/keytool -genkey"
+
+ # Prefix some scripts with jmeter to avoid clobbering the namespace
+ for i in heapdump.sh mirror-server mirror-server.sh shutdown.sh stoptest.sh create-rmi-keystore.sh; do
+ mv $out/bin/$i $out/bin/jmeter-$i
+ wrapProgram $out/bin/jmeter-$i \
+ --prefix PATH : "${jre}/bin"
+ done
+
+ wrapProgram $out/bin/jmeter --set JAVA_HOME "${jre}"
+ wrapProgram $out/bin/jmeter.sh --set JAVA_HOME "${jre}"
'';
- meta = {
+ doInstallCheck = true;
+
+ checkInputs = [ coreutils ];
+
+ installCheckPhase = ''
+ $out/bin/jmeter --version 2>&1 | grep -q "${version}"
+ $out/bin/jmeter-heapdump.sh > /dev/null
+ $out/bin/jmeter-shutdown.sh > /dev/null
+ $out/bin/jmeter-stoptest.sh > /dev/null
+ timeout --kill=1s 1s $out/bin/jmeter-mirror-server.sh || test "$?" = "124"
+ '';
+
+ meta = with stdenv.lib; {
description = "A 100% pure Java desktop application designed to load test functional behavior and measure performance";
longDescription = ''
The Apache JMeter desktop application is open source software, a 100%
@@ -20,9 +52,9 @@ stdenv.mkDerivation rec {
measure performance. It was originally designed for testing Web
Applications but has since expanded to other test functions.
'';
- license = stdenv.lib.licenses.asl20;
- maintainers = [ stdenv.lib.maintainers.garbas ];
+ license = licenses.asl20;
+ maintainers = [ maintainers.garbas ];
priority = 1;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/kget/default.nix b/pkgs/applications/networking/kget/default.nix
deleted file mode 100644
index 0dc37d10d1ae..000000000000
--- a/pkgs/applications/networking/kget/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- mkDerivation, lib, fetchFromGitHub,
- extra-cmake-modules, kdoctools, makeWrapper,
- kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme,
- kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui
-}:
-
-let
- pname = "kget";
- version = "20170903";
-
-in mkDerivation {
- name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "KDE";
- repo = pname;
- rev = "739c0b399faf5a393c7436c0771662596b840fdc";
- sha256 = "0rn6a4xd9zmf9sdjd5b4rh8yky6qm6ffjgjpn4snkdjsn6vm6y43";
- };
- nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
-
- buildInputs = [
- kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme
- kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui
- ];
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- license = licenses.gpl2;
- maintainers = with maintainers; [ peterhoeg ];
- };
-}
diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix
new file mode 100644
index 000000000000..e2b3d073dd33
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/afew/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pythonPackages, notmuch }:
+
+pythonPackages.buildPythonApplication rec {
+ pname = "afew";
+ version = "1.3.0";
+
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz";
+ };
+
+ buildInputs = with pythonPackages; [ setuptools_scm ];
+
+ propagatedBuildInputs = with pythonPackages; [
+ pythonPackages.notmuch chardet dkimpy
+ ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
+
+ makeWrapperArgs = [
+ ''--prefix PATH ':' "${notmuch}/bin"''
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/afewmail/afew;
+ description = "An initial tagging script for notmuch mail";
+ license = licenses.isc;
+ maintainers = with maintainers; [ garbas andir flokli ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 0324012b278b..610b16dab5bc 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas
- notmuch boost gnome3.gsettings_desktop_schemas ];
+ notmuch boost gnome3.gsettings-desktop-schemas ];
buildPhase = "scons --propagate-environment --prefix=$out build";
installPhase = "scons --propagate-environment --prefix=$out install";
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index cccfdbc75608..10daeeab8e13 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -1,8 +1,8 @@
{ fetchurl, stdenv, wrapGAppsHook
-, curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme
-, libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
-, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk24x-gtk2
-, glib_networking, gsettings_desktop_schemas, libSM, libytnef
+, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme
+, libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
+, openldap , perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2
+, glib-networking, gsettings-desktop-schemas, libSM, libytnef
# Build options
# TODO: A flag to build the manual.
@@ -32,34 +32,32 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "claws-mail-${version}";
- version = "3.15.1";
+ version = "3.16.0";
src = fetchurl {
url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
- sha256 = "0hlm2jipyr4z6izlrpvabpz4ivh49i13avnm848kr1nv68pkq2cd";
+ sha256 = "1awpr3s7n8bq8p3w10a4j6lg5bizjxyiqp4rqzc2j8cn7lyi64n2";
};
outputs = [ "out" "dev" ];
patches = [ ./mime.patch ];
- hardeningDisable = [ "format" ];
-
postPatch = ''
substituteInPlace src/procmime.c \
- --subst-var-by MIMEROOTDIR ${shared_mime_info}/share
+ --subst-var-by MIMEROOTDIR ${shared-mime-info}/share
'';
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs =
- [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme
- libetpan perl python glib_networking libSM libytnef
+ [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas hicolor-icon-theme
+ libetpan perl python glib-networking libSM libytnef
]
++ optional enableSpellcheck enchant
++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ]
++ optional enablePluginArchive libarchive
- ++ optional enablePluginNotificationSounds libcanberra_gtk2
+ ++ optional enablePluginNotificationSounds libcanberra-gtk2
++ optional enablePluginNotificationDialogs libnotify
++ optional enablePluginFancy libsoup
++ optional enablePluginRssyl libxml2
@@ -90,7 +88,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preFixup = ''
- gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
'';
postInstall = ''
@@ -103,6 +101,6 @@ stdenv.mkDerivation rec {
homepage = http://www.claws-mail.org/;
license = licenses.gpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ khumba fpletz globin ];
+ maintainers = with maintainers; [ fpletz globin ];
};
}
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 0aa95ee9532d..4d0c09c2dcc2 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "imapfilter-${version}";
- version = "2.6.10";
+ version = "2.6.11";
src = fetchFromGitHub {
owner = "lefcha";
repo = "imapfilter";
rev = "v${version}";
- sha256 = "1011pbgbaz43kmxcc5alv06jly9wqmqgr0b64cm5i1md727v3rzc";
+ sha256 = "0cjnp7vqmgqym2zswabkmwlbj21r063vw7wkwxglj08z5qyjl5ps";
};
makeFlagsArray = "PREFIX=$(out)";
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
new file mode 100644
index 000000000000..cd4de0ecd560
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -0,0 +1,84 @@
+{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }:
+
+stdenv.mkDerivation rec {
+ name = "inboxer-${version}";
+ version = "1.0.3";
+
+ meta = with stdenv.lib; {
+ description = "Unofficial, free and open-source Google Inbox Desktop App";
+ homepage = "https://denysdovhan.com/inboxer";
+ maintainers = [ maintainers.mgttlinger ];
+ license = licenses.mit;
+ platforms = [ "x86_64-linux" ];
+ };
+
+ src = fetchurl {
+ url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
+ sha256 = "1k2wgvs17lfxqmk0v7g8cf34h5ahr41vaibgb4a6ixay41hfx06d";
+ };
+
+ unpackPhase = ''
+ ar p $src data.tar.xz | tar xJ
+ '';
+ buildInputs = [ binutils patchelf makeWrapper ];
+
+ preFixup = with stdenv.lib; let
+ lpath = makeLibraryPath [
+ alsaLib
+ atk
+ cairo
+ cups
+ dbus
+ nss
+ nspr
+ freetype
+ fontconfig
+ gtk2-x11
+ xorg.libX11
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXi
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXcomposite
+ xorg.libXtst
+ xorg.libXScrnSaver
+ xorg.libxcb
+ gdk_pixbuf
+ glib
+ gnome2.pango
+ gnome2.GConf
+ expat
+ stdenv.cc.cc.lib
+ libpulseaudio
+ libudev
+ ];
+ in ''
+ patchelf \
+ --set-rpath "$out/opt/Inboxer:${lpath}" \
+ $out/opt/Inboxer/libnode.so
+ patchelf \
+ --set-rpath "$out/opt/Inboxer:${lpath}" \
+ $out/opt/Inboxer/libffmpeg.so
+
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "$out/opt/Inboxer:${lpath}" \
+ $out/opt/Inboxer/inboxer
+
+ wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}"
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp -R usr/share opt $out/
+ # fix the path in the desktop file
+ substituteInPlace \
+ $out/share/applications/inboxer.desktop \
+ --replace /opt/ $out/opt/
+ # symlink the binary to bin/
+ ln -s $out/opt/Inboxer/inboxer $out/bin/inboxer
+ '';
+}
diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix
index 2c1678e994fb..79deab46912b 100644
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@@ -1,20 +1,42 @@
-{ stdenv, fetchurl, pkgconfig, lua5_2, file, ncurses, gmime, pcre-cpp
-, perl, perlPackages }:
+{ stdenv, fetchurl, pkgconfig, lua, file, ncurses, gmime, pcre-cpp
+, perl, perlPackages, makeWrapper
+, debugBuild ? false
+, alternativeGlobalConfigFilePath ? null
+}:
let
- version = "2.9";
+ version = "3.1";
+ binaryName = if debugBuild then "lumail2-debug" else "lumail2";
+ alternativeConfig = builtins.toFile "lumail2.lua"
+ (builtins.readFile alternativeGlobalConfigFilePath);
+
+ globalConfig = if isNull alternativeGlobalConfigFilePath then ''
+ mkdir -p $out/etc/lumail2
+ cp global.config.lua $out/etc/lumail2.lua
+ for n in ./lib/*.lua; do
+ cp "$n" $out/etc/lumail2/
+ done
+ '' else ''
+ ln -s ${alternativeConfig} $out/etc/lumail2.lua
+ '';
+
+ getPath = type : "${lua}/lib/?.${type};";
+ luaPath = getPath "lua";
+ luaCPath = getPath "so";
in
stdenv.mkDerivation {
name = "lumail-${version}";
src = fetchurl {
url = "https://lumail.org/download/lumail-${version}.tar.gz";
- sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc";
+ sha256 = "0vj7p7f02m3w8wb74ilajcwznc4ai4h2ikkz9ildy0c00aqsi5w4";
};
- nativeBuildInputs = [ pkgconfig ];
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [
- lua5_2 file ncurses gmime pcre-cpp
+ lua file ncurses gmime pcre-cpp
perl perlPackages.JSON perlPackages.NetIMAPClient
];
@@ -29,16 +51,26 @@ stdenv.mkDerivation {
sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy
'';
+ buildFlags = if debugBuild then "lumail2-debug" else "";
+
+ installPhase = ''
+ mkdir -p $out/bin || true
+ install -m755 ${binaryName} $out/bin/
+ ''
+ + globalConfig
+ + ''
+ wrapProgram $out/bin/${binaryName} \
+ --prefix LUA_PATH : "${luaPath}" \
+ --prefix LUA_CPATH : "${luaCPath}"
+ '';
+
makeFlags = [
"LVER=lua"
"PREFIX=$(out)"
"SYSCONFDIR=$(out)/etc"
+ "LUMAIL_LIBS=$(out)/etc/lumail2"
];
- postInstall = ''
- cp lumail2.user.lua $out/etc/lumail2/
- '';
-
meta = with stdenv.lib; {
description = "Console-based email client";
homepage = https://lumail.org/;
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index b1ca80fc7e47..75f34952394e 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gettext, gtk3, pythonPackages
, gdk_pixbuf, libnotify, gst_all_1
-, libgnome_keyring3, networkmanager
+, libgnome-keyring3, networkmanager
, wrapGAppsHook, gnome3
# otherwise passwords are stored unencrypted
, withGnomeKeyring ? true
@@ -22,7 +22,7 @@ in pythonPackages.buildPythonApplication rec {
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gnome3.defaultIconTheme
- ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3;
+ ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;
nativeBuildInputs = [
wrapGAppsHook
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 9c2ab08babcf..36dc94951d5c 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -1,27 +1,39 @@
-{ stdenv, fetchgit, python2Packages, gnupg1orig, makeWrapper, openssl }:
+{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, makeWrapper, openssl, git }:
python2Packages.buildPythonApplication rec {
name = "mailpile-${version}";
- version = "0.4.1";
+ version = "1.0.0rc2";
- src = fetchgit {
- url = "git://github.com/pagekite/Mailpile";
- rev = "refs/tags/${version}";
- sha256 = "118b5zwfwmzj38p0mkj3r1s09jxg8x38y0a42b21imzpmli5vpb5";
+ src = fetchFromGitHub {
+ owner = "mailpile";
+ repo = "Mailpile";
+ rev = "${version}";
+ sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj";
};
- patchPhase = ''
- substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${python2Packages.python.libPrefix}/site-packages/' + dir"
+ postPatch = ''
+ patchShebangs scripts
'';
+ nativeBuildInputs = with python2Packages; [ pbr git ];
+ PBR_VERSION=version;
+
propagatedBuildInputs = with python2Packages; [
- makeWrapper pillow jinja2 spambayes python2Packages.lxml
- pgpdump gnupg1orig
+ appdirs
+ cryptography
+ fasteners
+ gnupg1orig
+ jinja2
+ pgpdump
+ pillow
+ python2Packages.lxml
+ spambayes
];
postInstall = ''
wrapProgram $out/bin/mailpile \
- --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}"
+ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" \
+ --set-default MAILPILE_SHARED "$out/share/mailpile"
'';
# No tests were found
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix
new file mode 100644
index 000000000000..ff4507991e40
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, libiconv }:
+
+stdenv.mkDerivation rec {
+ name = "mblaze-${version}";
+ version = "0.3.2";
+
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+
+ src = fetchFromGitHub {
+ owner = "chneukirchen";
+ repo = "mblaze";
+ rev = "v${version}";
+ sha256 = "0sgzcf7lpgdix7x4p6wp1jjv9h62rrkca6325c7a9j8r0dbg1fdg";
+ };
+
+ makeFlags = "PREFIX=$(out)";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/chneukirchen/mblaze;
+ description = "Unix utilities to deal with Maildir";
+ license = licenses.cc0;
+ platforms = platforms.all;
+ maintainers = [ maintainers.ajgrf ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index b3a68a7fcb98..03bfc711c430 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl, ncurses, which, perl
+{ stdenv, fetchurl, fetchpatch, ncurses, which, perl
, gdbm ? null
, openssl ? null
, cyrus_sasl ? null
+, gnupg ? null
, gpgme ? null
, kerberos ? null
, headerCache ? true
, sslSupport ? true
, saslSupport ? true
+, smimeSupport ? false
+, gpgSupport ? false
, gpgmeSupport ? true
, imapSupport ? true
, withSidebar ? true
@@ -16,22 +19,25 @@
assert headerCache -> gdbm != null;
assert sslSupport -> openssl != null;
assert saslSupport -> cyrus_sasl != null;
-assert gpgmeSupport -> gpgme != null;
+assert smimeSupport -> openssl != null;
+assert gpgSupport -> gnupg != null;
+assert gpgmeSupport -> gpgme != null && openssl != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "mutt-${version}";
- version = "1.9.1";
+ version = "1.9.4";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
- sha256 = "1c8vv4anl555a03pbnwf8wnf0d8pcnd4p35y3q8f5ikkcflq76vl";
+ sha256 = "1pxmw5yyizb9bqbai6lihv6zxmw0znjfb60zaldwh6hc6lkbzlgl";
};
- patchPhase = optionalString (openssl != null) ''
- sed -i 's#/usr/bin/openssl#${openssl}/bin/openssl#' smime_keys.pl
- '';
+ patches = optional smimeSupport (fetchpatch {
+ url = "https://sources.debian.net/src/mutt/1.7.2-1/debian/patches/misc/smime.rc.patch";
+ sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+ });
buildInputs =
[ ncurses which perl ]
@@ -64,6 +70,22 @@ stdenv.mkDerivation rec {
++ optional gssSupport "--with-gss"
++ optional saslSupport "--with-sasl";
+ postPatch = optionalString (smimeSupport || gpgmeSupport) ''
+ sed -i 's#/usr/bin/openssl#${openssl}/bin/openssl#' smime_keys.pl
+ '';
+
+ postInstall = optionalString smimeSupport ''
+ # S/MIME setup
+ cp contrib/smime.rc $out/etc/smime.rc
+ sed -i 's#openssl#${openssl}/bin/openssl#' $out/etc/smime.rc
+ echo "source $out/etc/smime.rc" >> $out/etc/Muttrc
+ '' + optionalString gpgSupport ''
+ # GnuPG setup
+ cp contrib/gpg.rc $out/etc/gpg.rc
+ sed -i 's#\(command="\)gpg #\1${gnupg}/bin/gpg #' $out/etc/gpg.rc
+ echo "source $out/etc/gpg.rc" >> $out/etc/Muttrc
+ '';
+
meta = {
description = "A small but very powerful text-based mail client";
homepage = http://www.mutt.org;
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index f72fdba52f8b..ea7e7ee282d1 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, which, autoreconfHook, makeWrapper, writeScript,
-ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl,
-lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }:
+{ 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, mime-types }:
let
muttWrapper = writeScript "mutt" ''
@@ -15,14 +15,14 @@ let
'';
in stdenv.mkDerivation rec {
- version = "20171027";
+ version = "20180223";
name = "neomutt-${version}";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = "neomutt-${version}";
- sha256 = "0pwc5zdxc9h23658dfkzndfj1ld3ijyvcxmsiv793y3i4dig0s3n";
+ sha256 = "1q0zwm8p2mk85icrbq42z4235mpqfra38pigd064kharx54k36sb";
};
buildInputs = [
@@ -32,12 +32,15 @@ in stdenv.mkDerivation rec {
];
nativeBuildInputs = [
- autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which makeWrapper
+ docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which
];
enableParallelBuilding = true;
postPatch = ''
+ substituteInPlace contrib/smime_keys \
+ --replace /usr/bin/openssl ${openssl}/bin/openssl
+
for f in doc/*.{xml,xsl}* ; do
substituteInPlace $f \
--replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl \
@@ -48,21 +51,23 @@ in stdenv.mkDerivation rec {
# and use a far more comprehensive list than the one shipped with neomutt
substituteInPlace sendlib.c \
--replace /etc/mime.types ${mime-types}/etc/mime.types
+
+ # The string conversion tests all fail with the first version of neomutt
+ # that has tests (20180223) so we disable them for now.
+ # I don't know if that is related to the tests or our build environment.
+ # Try again with a later release.
+ sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c
'';
configureFlags = [
- "--enable-debug"
- "--enable-gpgme"
- "--enable-notmuch"
- "--with-curses"
- "--with-gss"
+ "--gpgme"
+ "--gss"
+ "--lmdb"
+ "--notmuch"
+ "--ssl"
+ "--sasl"
"--with-homespool=mailbox"
- "--with-idn"
- "--with-lmdb"
"--with-mailpath="
- "--with-sasl"
- "--with-ssl"
-
# Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
"ac_cv_path_SENDMAIL=sendmail"
];
@@ -77,6 +82,10 @@ in stdenv.mkDerivation rec {
wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt"
'';
+ doCheck = true;
+
+ checkTarget = "test";
+
meta = with stdenv.lib; {
description = "A small but very powerful text-based mail client";
homepage = http://www.neomutt.org;
diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix
new file mode 100644
index 000000000000..3e235400498f
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/notbit/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig,
+ gettext, openssl
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "notbit-${version}";
+ version = "2018-01-09";
+
+ src = fetchFromGitHub {
+ owner = "bpeel";
+ repo = "notbit";
+ rev = "8b5d3d2da8ce54abae2536b4d97641d2c798cff3";
+ sha256 = "1623n0lvx42mamvb2vwin5i38hh0nxpxzmkr5188ss2x7m20lmii";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+ buildInputs = [ openssl gettext ];
+
+ meta = {
+ description = "A minimal Bitmessage client";
+ homepage = https://github.com/bpeel/notbit;
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ mog ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch
deleted file mode 100644
index be094c9a397f..000000000000
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a736c0dfd22cd4ab0da86c30a664c91843df1b98 Mon Sep 17 00:00:00 2001
-From: Adam Ruzicka
-Date: Sat, 29 Jul 2017 12:16:29 +0200
-Subject: [PATCH] notmuch-0.25 compatibility fix
-
----
- notmuch-addrlookup.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/notmuch-addrlookup.c b/notmuch-addrlookup.c
-index c5cf5b4..a95ded0 100644
---- a/notmuch-addrlookup.c
-+++ b/notmuch-addrlookup.c
-@@ -171,6 +171,13 @@ create_queries (notmuch_database_t *db,
- count += tmp;
- if (notmuch_query_count_messages_st (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
- count += tmp;
-+#elif LIBNOTMUCH_MAJOR_VERSION >= 5
-+ unsigned int count = 0;
-+ unsigned int tmp;
-+ if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+ count += tmp;
-+ if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+ count += tmp;
- #else
- unsigned int count = notmuch_query_count_messages (queries[0])
- + notmuch_query_count_messages (queries[1]);
-@@ -233,6 +240,13 @@ run_queries (notmuch_database_t *db,
- #if LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3
- if (notmuch_query_search_messages_st (queries[i], &messages) != NOTMUCH_STATUS_SUCCESS)
- continue;
-+#elif LIBNOTMUCH_MAJOR_VERSION >= 5
-+ unsigned int count = 0;
-+ unsigned int tmp;
-+ if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+ count += tmp;
-+ if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+ count += tmp;
- #else
- if (!(messages = notmuch_query_search_messages (queries[i])))
- continue;
---
-2.13.3
-
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index f5d48d03c96a..c2cce227576a 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -1,32 +1,28 @@
{ stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }:
+let
+ version = "9";
+in
stdenv.mkDerivation rec {
name = "notmuch-addrlookup-${version}";
- version = "7";
src = fetchFromGitHub {
owner = "aperezdc";
repo = "notmuch-addrlookup-c";
rev ="v${version}";
- sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk";
+ sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib notmuch ];
- # Required until notmuch-addrlookup can be compiled against notmuch >= 0.25
- patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ];
-
- installPhase = ''
- mkdir -p "$out/bin"
- cp notmuch-addrlookup "$out/bin"
- '';
+ installPhase = "install -D notmuch-addrlookup $out/bin/notmuch-addrlookup";
meta = with stdenv.lib; {
description = "Address lookup tool for Notmuch in C";
homepage = https://github.com/aperezdc/notmuch-addrlookup-c;
maintainers = with maintainers; [ mog garbas ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
license = licenses.mit;
};
}
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 6d268f69a7ce..a3de728ce415 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "0.25.2";
+ version = "0.26";
name = "notmuch-${version}";
passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
- sha256 = "0ai6vbs9wzwfz7jcphgqsqpcbq137l34xhmcli4h5c8n82fvmdp4";
+ sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k";
};
nativeBuildInputs = [ pkgconfig ];
@@ -40,26 +40,24 @@ stdenv.mkDerivation rec {
++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies
postPatch = ''
- find test -type f -exec \
+ find test/ -type f -exec \
sed -i \
-e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \
- -e "s|gpg |${gnupg}/bin/gpg |" \
- -e "s| gpg| ${gnupg}/bin/gpg|" \
- -e "s|gpgsm |${gnupg}/bin/gpgsm |" \
- -e "s| gpgsm| ${gnupg}/bin/gpgsm|" \
- -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg|" \
"{}" ";"
for src in \
- crypto.c \
- notmuch-config.c \
- emacs/notmuch-crypto.el
+ util/crypto.c \
+ notmuch-config.c
do
substituteInPlace "$src" \
--replace \"gpg\" \"${gnupg}/bin/gpg\"
done
'';
+ # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
+ # friends
+ setOutputFlags = false;
+ enableParallelBuilding = true;
makeFlags = "V=1";
preFixup = optionalString stdenv.isDarwin ''
@@ -77,7 +75,7 @@ stdenv.mkDerivation rec {
[[ -s "$lib" ]] || die "couldn't find libnotmuch"
badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')"
- goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')"
+ goodname="$(find "${talloc}/lib" -name 'libtalloc.*.*.*.dylib')"
[[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary"
[[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store"
@@ -102,7 +100,7 @@ stdenv.mkDerivation rec {
description = "Mail indexer";
homepage = https://notmuchmail.org/;
license = licenses.gpl3;
- maintainers = with maintainers; [ chaoflow garbas ];
+ maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index b865622efe42..e25dfe834f65 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -2,19 +2,20 @@
, notmuch, openssl, pkgconfig, sqlite, xapian, zlib
}:
stdenv.mkDerivation rec {
- version = "2";
+ version = "5";
name = "muchsync-${version}";
passthru = {
inherit version;
};
src = fetchurl {
url = "http://www.muchsync.org/src/${name}.tar.gz";
- sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1";
+ sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ notmuch openssl sqlite xapian zlib ];
meta = {
description = "Synchronize maildirs and notmuch databases";
+ homepage = "http://www.muchsync.org/";
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ ocharles ];
license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
index 4c768325fee9..766aab39ce30 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
@@ -5,7 +5,7 @@
, coreutils
, cups
, dbus
-, desktop_file_utils
+, desktop-file-utils
, expat
, fontconfig
, freetype
@@ -14,7 +14,7 @@
, glib
, gnome2
, libgcrypt
-, libgnome_keyring
+, libgnome-keyring
, libnotify
, makeWrapper
, nodejs
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
- url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb";
+ url = "https://edgehill.s3.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb";
sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada";
}
else
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
coreutils
cups
dbus
- desktop_file_utils
+ desktop-file-utils
expat
fontconfig
freetype
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
glib
gnome2.GConf
gnome2.gtk
- libgnome_keyring
+ libgnome-keyring
libnotify
nodejs
nspr
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
];
- buildInputs = [ gnome2.gnome_keyring ];
+ buildInputs = [ gnome2.gnome-keyring ];
nativeBuildInputs = [ makeWrapper ];
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
--set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
$out/share/nylas-mail/nylas
- wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome_keyring}/lib";
+ wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome-keyring}/lib";
# Fix path to bash so apm can install plugins.
substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index a63bedfb29d2..d58680d15d5a 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -1,38 +1,36 @@
-{ stdenv, fetchurl, pkgconfig, gtk2
-, openssl ? null
-, gpgme ? null
-, sslSupport ? true
-, gpgSupport ? true
-}:
+{ stdenv, fetchurl, pkgconfig, gtk2, openssl ? null, gpgme ? null
+, gpgSupport ? true, sslSupport ? true }:
+
+assert gpgSupport -> gpgme != null;
+assert sslSupport -> openssl != null;
with stdenv.lib;
-assert sslSupport -> openssl != null;
-assert gpgSupport -> gpgme != null;
-
stdenv.mkDerivation rec {
name = "sylpheed-${version}";
- version = "3.5.1";
+ version = "3.6.0";
src = fetchurl {
- url = "http://sylpheed.sraoss.jp/sylpheed/v3.5/${name}.tar.bz2";
- sha256 = "11qhbfyvi5hxv1f448zgbzgrdjj3a4mxj2bfpk6k4bqf7ahh8nis";
+ url = "http://sylpheed.sraoss.jp/sylpheed/v3.6/${name}.tar.bz2";
+ sha256 = "0idk9nz3d200l2bxc38vnxlx0wcslrvncy9lk50vz7dl8c5sg97b";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs =
- [ gtk2 ]
- ++ optional sslSupport openssl
- ++ optional gpgSupport gpgme;
- configureFlags = optional sslSupport "--enable-ssl"
- ++ optional gpgSupport "--enable-gpgme";
+ buildInputs = [ gtk2 ]
+ ++ optionals gpgSupport [ gpgme ]
+ ++ optionals sslSupport [ openssl ];
+
+ configureFlags = [
+ (optional gpgSupport "--enable-gpgme")
+ (optional sslSupport "--enable-ssl")
+ ];
meta = {
homepage = http://sylpheed.sraoss.jp/en/;
- description = "A lightweight and user-friendly e-mail client";
- maintainers = [ maintainers.eelco ];
+ description = "Lightweight and user-friendly e-mail client";
+ maintainers = with maintainers; [ eelco ];
platforms = platforms.linux ++ platforms.darwin;
- license = "GPL";
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 4f714cabf79b..9dbc99cac7d0 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, config, makeWrapper
, gconf
, alsaLib
-, at_spi2_atk
+, at-spi2-atk
, atk
, cairo
, cups
, curl
-, dbus_glib
+, dbus-glib
, dbus_libs
, fontconfig
, freetype
@@ -27,11 +27,11 @@
, libXinerama
, libXrender
, libXt
-, libcanberra_gtk2
+, libcanberra-gtk2
, libgnome
, libgnomeui
, defaultIconTheme
-, mesa
+, libGLU_combined
, nspr
, nss
, pango
@@ -82,12 +82,12 @@ stdenv.mkDerivation {
[ stdenv.cc.cc
gconf
alsaLib
- at_spi2_atk
+ at-spi2-atk
atk
cairo
cups
curl
- dbus_glib
+ dbus-glib
dbus_libs
fontconfig
freetype
@@ -108,10 +108,10 @@ stdenv.mkDerivation {
libXinerama
libXrender
libXt
- libcanberra_gtk2
+ libcanberra-gtk2
libgnome
libgnomeui
- mesa
+ libGLU_combined
nspr
nss
pango
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 7ac8091e1c11..0ae1777a839c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,595 +1,595 @@
{
- version = "52.4.0";
+ version = "52.6.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ar/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ar/thunderbird-52.6.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "28a0114c665250f419d77f1f3898af6533e1b8b82b546ecd3ca9baf801751fd189239093eaecdabab9a9318fd47020b647086a31676158a21656ff7c477dbbf8";
+ sha512 = "fa4cc97701d7a44e2256149497a72a7057f3b677163b85029a9721fa03b4b518fa8c3564ad727824faf3c81242bc7dfe673f7fbbe1bb2b92aea16b779df8d6f5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ast/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ast/thunderbird-52.6.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "f7b9d53202597ef666ca87eb1f8cbb439af386eb78460558e8bef33502a7eac591d43751beb52319d046d780fb38a78e685fa8cb3baaa6abfef439bed6ab3d1a";
+ sha512 = "f40ae6c5f72ad797b42c6ada1302eebf63b649bfa2d5838cea7371ad92de8e1eaaa79cd115993d96dd873bca996b12fb20c8f4f40ee4db144cc2bbd5a27ef182";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/be/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/be/thunderbird-52.6.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "a9a39cf4477e469774f2ce7b7012948911009ff2ab26948a177f3efa9e8ccbcb7d7f3d3ab609742fe1d177253dcdeacb78f7b4a9874f3156f6f54203d0ed42ef";
+ sha512 = "768453738bda8b0040d3b4cb21b1695dacaa54cacac5ec3130d5e4ebeea4e0ad8303ff2860fe5cfe5915df951aabe2f8a069b979abdc8ab8eb161811d93a8558";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bg/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/bg/thunderbird-52.6.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "38fc89a687344467f98cb2e31967aa53f3c502a8f288b5d65e6aa91a578b250c17750ea998d32d58511920a0a5a1224e77e2691a381b7526585e341712d82cbd";
+ sha512 = "dbe67671831f90f739a7af794578270f1177ce7e54727c78e6b74d6bc400ca3cff2ed4174b5b38b73ad1ebab0d9d0df34fd6e3ee769cf96e99f4fd84ff69d018";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bn-BD/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/bn-BD/thunderbird-52.6.0.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "437d943339c4955b5264f95bdd4aaa2a91d448a393e6561bbb41c078a960100962c1d51bad73172c5f5cd691f713ab34c218ff5c3e3cde3641d8a6ad604f6d75";
+ sha512 = "4d7aa1a03c1ec122150611270502fc209406703f0081e4e6ed212d07b327adc67c49db2891b1b62799c48218935200c5f671615a159a900f4d838250ab578798";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/br/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/br/thunderbird-52.6.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "5c43e3cc4366792b7c7a44ae36fe2bd9e6b459f540868dcee767193826648b03a4e4a447f83f5787036e48c96e75639a305304e050a91f0925d9ee4db97e5b75";
+ sha512 = "9e229670bb1a4263a1922b5c4d6329209d95aed8f92264977c8c9d1de81c89440666602fad19b686fe214e8847e305d531046fc00a77347393d3d38be31f7f1e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ca/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ca/thunderbird-52.6.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "c2243ee5f160f786ebced364432b4a3b489699a3f024a8da327cfaa3c5e2d0d58884870311416fcb019723d5bfec8294440c701c6c453c15346f5f765c4449c0";
+ sha512 = "0a905562d18452535a6cc05b945467e40c4ab8dd80d13ea07de293e02477cf5ac1c49546213e236f8266aaccc923ed261f1702b38289f2e165d818bb7e55b218";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cs/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/cs/thunderbird-52.6.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "332faf549d1d988defdce1531fb4cc81e5f1565423f3e24ebfe16581275224539ed50857dec04c8aa66cc55372a76b676816831d08842bbafd227ca3058f9b5b";
+ sha512 = "3a2417f8b8396e0bd9c1b900f1547ea631683d35cf1e089698641dfd62672824a5594c8bae1ceed6d9fa4adb646da1b027a3c0378687b86ecd2351e4db227d22";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cy/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/cy/thunderbird-52.6.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "bfe220ed1e1d8d156f0c1cf7ea11b0778bc0b23f7335b90c65bf581c9e2cd22db9a7f5d48d7a6a95f1d21693714a216d2a24249f36aed7ce097f205d4d05d6f3";
+ sha512 = "6f705e71057c5f4016ffc60ffd0dc114f462785eb139da474412fd6164c761d89f7faf08ffdc93cc746b0d3df1b57024d69c20303d867bb3ffdd2739869bc075";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/da/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/da/thunderbird-52.6.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "dcff4359821cb6b24ba129671a1716394afd642a5c4b887a1905baf82cf5d2a94512a547780cd42b1478f443f59db5a3363a52d719824af050dd69af54f97a02";
+ sha512 = "4f981281b63ed48e58bee4b7702389dca2bf5497cc74e8603945b25c7ce18e73b7b0ec006df8e48ea5ca8d57c6b874e7cbdeb2f43e214cbb0b99cc7983556790";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/de/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/de/thunderbird-52.6.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "f5071c052814eab801f3d2c98751c05486b211f23b511b27a1ad5810634b763ada3bd890288e4934c16a28742ef023ef089de9d84a188f6e19d07f471b289583";
+ sha512 = "4553f9b771e4ee907e2e379eb87ac62143df34cd3777e8dadd74b46839c6cb79f8fec87b4bd48fefdd21a4837611637897232895278ef3bb0337f816c37ce685";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/dsb/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/dsb/thunderbird-52.6.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "522d365f32b28620a7936cf5a8fb230db6fee8c1ae055a27e6649cff8559811684168eacf019ec16d6268e405607a576d46e1d5ba4759c1e3fd10736d7560370";
+ sha512 = "cfb64b6eddcbe54a701c5bca339225bec63e96dc2b1d3d2e358b32820239a970913415e8248ed8852be77d1e64741ab4746476e51a1fb9e9d6510cd6eabcfcb4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/el/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/el/thunderbird-52.6.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "ecf3dcadb1a82310494063cc317ee248b91c30594ba89a9c58a71349a423cf9e66c5bd06be4d1488ee6cd5027187bae1364144037b9ac3cd4bc8af7cd4396810";
+ sha512 = "4761f016a202abfafd3d249ccca8d05b8697645eb820cb45b1567476cd806c49e9a13d9c5ff28df5c226e1f787abd698cbc610df28e03b5f0d70ad43b90a0ae4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-GB/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/en-GB/thunderbird-52.6.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "8ddde6cd0270cffc26cdb4c4513213405b71ea4315d69a3b1bef602bbd58eca30bc09d0ddd41996cd77881e2d678dd13a93d07fa833210780dba146a931db383";
+ sha512 = "a310e79e4da7a79a0c9d48db19b68e197fa71e4ff3d3b1c1178206ff0bbe883623d97ded1268a8512f370dbb232b8534e503d42bb6fc70583b78e78deb27fcd5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-US/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/en-US/thunderbird-52.6.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "edf130b3b061f15137e6eb83c9674642f0f475de56b293d4acde60f1e7ebcf0d262085fa2a513787ac201ceec5552c029167cec5ad0556baa7b0dd3b52ae4c3f";
+ sha512 = "10c1147b8509876d3b278df8d362cfb3279086d51ad40de1ffc8814878ba28b051940b347b4ca1a67bad8090ba488426403b219b2add070b704fac200ad4c283";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-AR/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/es-AR/thunderbird-52.6.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "931644cbf5e7b4f032f607a52a78f553a7a2ee8fc77fb7d0e73e6d276a6a1ba4a724cc91921c5ef5ac5ad21a3536ffbff264b80eb8d8a658133a24ca0b869456";
+ sha512 = "77753858bcba266c6ea44f12eefc5a8fd1b6a7ef39b2e778e01490ff290046415e6a75a56a104dae12b1a6cfc69b179d13f6cf5b80ef20e8120864b7e9447d1f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-ES/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/es-ES/thunderbird-52.6.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "c2673d9f6b347493e3fc807cec86f55300a6e894c9c1edd7f7bec63cb073fdda2e9cf7794269f02f744280788bbcb8e42ee6249c317aabc57f91cbaa3635492f";
+ sha512 = "f9228ef15899197a8defc67cfa8f51e17aa3f2e5b1e8b79cef8b221a012e47b74d5a91dc82ba1a53e97f1518b4d60f08220f870427751c9ee1c477600cfb3a38";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/et/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/et/thunderbird-52.6.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "dd634f76848fb990b4fb1bd28e2cceafca651280ece9ead3aad6b9746d0eaeef76b5ad925163a68367d84f66949e799e2649cf358ad0949ee4f2538c71b8914b";
+ sha512 = "37cdd026fe48f84b19adf63c6bb642fd2efa72a95125fbf5e2761623c920549c045589dc53892a828bc759630e8cfd1afad5825af7d51d6c7c5fc495e450f401";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/eu/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/eu/thunderbird-52.6.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "1c9f04cc1b32ffb21bfacb186f327aa945f36f12ae316a9cff8b2a4f8584ff8847ac5be1c8bd898ea1a71fbf3294a2f54b270eb6f0b63abb3da3178c6a125600";
+ sha512 = "4827d5f30c5a9bda1aaf5836250d43b41d38d2f882cae61a097c5ae753a7d429a7486d8a47991173ebea15bb70cfdd6b1d4ee4c1e7696b41e9e047786f320b0f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fi/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fi/thunderbird-52.6.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "03880d8334ede087a419443e9fb56bcf6727c652f435a366b4b49fb6116a62225686297ba82f298378e03267dc1aa50e90d75b81ea277a7afeb93331c45c3459";
+ sha512 = "9e40fdfa10cfb24e4983834d72c831b5e94d8a05e51e45e989564c558af6d5c91710da1a63f5a21042da2cca9a4b310a52c1c212db02bcbe77d5579ba600d9fc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fr/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fr/thunderbird-52.6.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "6f9909df3329a32d6d0c2203b484fdaa8b54a17849283bffcb04298601a284a6fe30eac20ec6b3a97ad2e8e3d4e0360c6145e87baa2af11049ae0d94fe9dcd44";
+ sha512 = "362d689566ac6ad74adcbccb188ca958af5d308090cc13f268be8608f4b20917ed0b1ccc33fd344b6b4434ed2a8a62c212cc25dc85f52f7ab20e0355df06a370";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fy-NL/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fy-NL/thunderbird-52.6.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "b20f130ad4a9b0f8448707945773cc76198e04854a0114a06379fd33c3d5abd9abb1f14e4f145df9c1c46e5d1e09522af640ded99f4f20543fd444e365d81fb9";
+ sha512 = "90b553cf697bc488e7f91eca2b9fceda94da72d49ff561af9a2f59dbe830a1ea29a49c9be8c544e1c83503a1902076a2badd7b35656372a18899f579d9455de6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ga-IE/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ga-IE/thunderbird-52.6.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "3fd6839351470d65f14165e3633c80950270ede2c4c9e658c001424126ffbf29c7bde86a720ca33e50cbe9a5306f0339c5cd491371e3ad03a6ee575c75889d63";
+ sha512 = "8fa91ed0e71961e0850f6acd69ffec0876e4b8f72d19b170429c10bd00681095bf816f7c028afa2f01eb5c32f27b6f8272b1a1e3340bdc87ccc9477bb100fbf1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gd/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/gd/thunderbird-52.6.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "a7aae188c866586606f9adb82d5110bc2b89a6bd757191e798b9b2dc799916ae56cbc82932f4b8da76e88a3c1f5ffc828c58aee0cd8f83ede19bde2be2164b79";
+ sha512 = "8653c7664694898222e1dc292bdc244a6a2bc900b240a7fed30ea5cce47e7fc5524afe7b67795d15f0eafb250a5218ae5f8fa8236b7c6e91e15c3c74808a798c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gl/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/gl/thunderbird-52.6.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "3cdab0c553f1d09cdb4dfd1160371eec3d1f878329dcf2f81a177f17647f8dd9b73566a56427d2a593f70f6aecfec951e3dfc2a389c838a4069e5f4db68c10eb";
+ sha512 = "22e5454c0af357e030dda5a84347eb154524d0337fae6389102ffb0073ff33997dacac9b40dede462f55ea30c1bb4da65cc8e272271611f42ddd80b5ab9dae05";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/he/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/he/thunderbird-52.6.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "b71593a5c7cf8fe3960c701f5bce270366f5717b7ccd2a5f20dcdf402d1435b79db06662629deb4bd28e24b251fd2fa1a71a9e932f132e2df7a25ab5a8849de3";
+ sha512 = "51bddbb2a254849b6dcbfaf1f2faae13454bbb71472c7c95d279b5f83a6b29b1b063d904f02f13295fa32e6b33867856341994db9a2201d8f358b006c0c7752b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hr/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hr/thunderbird-52.6.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "d55deeebb9605565ae3c062c8617d7e351f2f514c13f00507d75a5da4ef8e8d845247147d2aa111d4e78c57ceb01404ed3ac2bb69883bddab7b59ce0ff5eff35";
+ sha512 = "a08e2a71ac92e317944f09b2f03bbcfc32122493ebc0800534b6f3c714d4af0c431caf97be1818bc284826b88f08db3e4392f0c2b89ac7adba587f2f450cf804";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hsb/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hsb/thunderbird-52.6.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "c177a0e3c6074eef1abf086fa34e95b09f39a1529ce640927b7be6ee8b7ee8c740ba4e2afbadefe3fa83314cb7c3223499b1a5f08e3b4e381b60bee1ffbdac7c";
+ sha512 = "9539a6c48e60c4c773b735afa6ee544ceceffdca76ceeedd90973145f7deb23f2e449901cdc75190b5bd510537e70fd948775dc66caef8a7b95fc31843cbdb66";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hu/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hu/thunderbird-52.6.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "1442a03fa4367d1f33337d0e88a193de8a6992ab8aa91e28e4a46b8f1860a3cc346d15c00d745b5074b8dec1beca5dba182b5fe2e87827e7ea83b82aba28b721";
+ sha512 = "d4d0fca22d430ec037bdf5cf8ccbce99df3cab22e4e6a2c3fb040cd1db960903e503ff2c8f633aa1f037a590b0a48134d949c1c4899de429a0533175fbb4a61b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hy-AM/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hy-AM/thunderbird-52.6.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "c01325976516765a14a196ff04eb3296a2dfd81670cbf4d693682e78795b14b54f4d2801566f0ccd52c52f0b7100b6040f4e3540c4f3cb8c8b92038e059df45d";
+ sha512 = "362ddd92ceec22ac93d95d721c1806ff0270fccf33f0cc4452ee147b3388f071b6d5aa27a0e7548a35a50453d55be2532d7fde19be611b9f0ecd741b5de59e1f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/id/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/id/thunderbird-52.6.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "db56686b1d8713da9584e03633bcb2b14706c0b44d24484d6625de638eddcbdad1b1afacecf7dba52db6d18b2bbaaa15ea5f4d492366c24c5e2e212050f16c12";
+ sha512 = "29ba391bbd9b8984850f056d856bcf90c0ac816fb8b831416e5a96f36e9b2dd0517cb5f1caf37998f75f024f3fbdd3b989ca6d4973ded22cbd15568a7b249531";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/is/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/is/thunderbird-52.6.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "5423202ebccaddd114393e5a2038b2efbe93fd528dc3d7b659987ab5aa2a4ad82921b3b835249285135be67216eed03de6d58b72800d9c7bf87ec812a37f21ab";
+ sha512 = "2303d0d74e112bc4f86e6d73fb63fabe8f10aa3486a9d2f61fe16b0b0525bc7b6091c94e27f0ccb548b47bf808c937b83a4609c5c0cd0bd0fc6556c18dc08661";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/it/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/it/thunderbird-52.6.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "b64e31155c73f13cd84bb4488e63df5c95473957c792f63f8cf25308d2b860b084aa6beb519a7666fde83d3db25e28ffb1064ddd0abca73ff631924cfa83d7f6";
+ sha512 = "d3d9e95728063bd4e4742619c8ec27d4a0cdc34941ef8e6e3af71f19d59b4db6661366a81f1df7fd1de3a2ce995a1232f39744a825493a0c456d5257d02f7cf0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ja/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ja/thunderbird-52.6.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "8852c526663f69b038ded6bb1382e02de700eab741cb04ccb8d3e329ee4534477a6ea402134a76fe82a020bad279c66e70bc06b0ed8d0fbaea9aaeaafa051b44";
+ sha512 = "1d64a298e5b0ec9eaac8f8972ae975a98a5bcbc4823abd59a6cbab251ddcb5ba76263bdae0b55dac15455d8b7d9c8bda71cc54ea0fe67aea5efa5552973be94b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/kab/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/kab/thunderbird-52.6.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "b08dc52afb713142e11805c5b99f73a11bd3c16756dc5bbb6a0c3de13cc801f27438887d8733cf4b97d70d4741abcb0d8782b9e6f6ffc359f38318f1702fcb7f";
+ sha512 = "1b351b01ea540b809cad198912853b3f74bc9cb52c33b7fe4ab586f921ea4a2486f28e855d2be95398af6abad2911c5fd3f0ab16938edea85596689799b452b1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ko/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ko/thunderbird-52.6.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "0de39397e4401ad939dbce0c02e35505c593398bc2078ad19d680a797a8cfa3f0950a810c8650634e3d40ea3b5265f9e193b77408f1588b51575d87446a336c9";
+ sha512 = "d9895da7e3099c5d9389308ae6982a77387cd7d61c07ec16e4511c00fc3b18bd025b95c6f05a94cd5e990eb9472816bd4af0a1bbe3605561f2bfe2b9f9b207e8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/lt/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/lt/thunderbird-52.6.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "13842d9f210dd192e2072c138d8d0778e85d028dde92b08e616dff6ba62f84b6aa36363a259dca69bb006850de2fb8c42fd93874a4befa970d817aad34d47b57";
+ sha512 = "8791ae3c0ee4745449b1690f69de0665f7854288188f1570e4c876b1f936e790d651bb1f9ecfcfe99f01f49026d534e667f262c72290894368579313b8a59615";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nb-NO/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nb-NO/thunderbird-52.6.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "ec9c96abe94ac17139e9fa83ac2d7ca8ddc6889e7286a4d31e61625db6daea3969fcbaa0796ae0bea41e3a433ed3e170a73c4be1a177bedcbfcf705e306e28e9";
+ sha512 = "be2e537c4dabfc6070f180205787712317ea3bf1befebb5d99d0be562aac60f728635ab665b6813776d985ff5c5d10e72658dbe20c6441722113ca8f9cf00553";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nl/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nl/thunderbird-52.6.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "52e117078f1871bfc7b549a47617d277c763267f7033136c9715223d8f876184c0b5012b193a5f497e1fdba78b902a3c38651e0115829b0f5ca7f0cbb1c439d3";
+ sha512 = "20bc3bd3105880541b2dae20b703191cdb499dc7778fe874da5ae9b0b1626d72075631e256bc0c2fee1c4d1d27424cc6168c419afa8bec8a00d5904ae0678f12";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nn-NO/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nn-NO/thunderbird-52.6.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "24258bbf5e3643544ba5db26fab9678f7e2a44b390ee993be4a304d148b5a57674158afd308d6ef93a86c8e525b37e1aee55ed07be6953301f164a2da00688d4";
+ sha512 = "2437751b998ee2898bbb8f8187adcbd102d29fc54054fb04efef2e0f7f308c864215bb8468ac42975bbd18c6e4a0c8903e5784a4d203df3643029cff696c2540";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pa-IN/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pa-IN/thunderbird-52.6.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "e9d8b4e6019d4cf1ce562e6cc9b9aeac0e93d8b9ac9283c7e8f260b4d611fe2bd0bf6d71c9f82c9d2cbfba5770659d21cfb03fc2deb36b80be0a424178a65936";
+ sha512 = "925ffbbd7d9e301c52b60963bced66af8b97a7b24275d73ca923f0d757164faf4ba7c69003286d74a69f1ed328e94347ba63c6ca7e13f47f42b7529af9de5ee6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pl/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pl/thunderbird-52.6.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "81ced2424282fe6dc7ca6f5e043f6c42ae87cddef900b73fddfe6cd8c488a90e3099824b57d0971816a60c3f43ce66e1799195ae21369958b2e8085018017267";
+ sha512 = "27dfc79cfcfaea36ee50b2249e8e2a5195e9dd2f755b0f9d3274af2e4cb3d0d5214a4065e08678bbfcae4b51f0a0c2c4b4385c2a199a5b65035ac895de08bd63";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-BR/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pt-BR/thunderbird-52.6.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "4120b94c13a9fcf1aa31a2abc3fdde27ef8c0354550ae8511b61641745cdd5eaec16e1ddd1d22193ca6680f070b71c188d94cdc75a40fa1596fa88ed59545b28";
+ sha512 = "b600e2e3dc931ba2db5e4bf36187f971c7c1c710f8535d59c999a9685f551454a6e39f80cf70374aeac41ddace2f80fbe68bcda1675b80c5cc39dd8fccf7625f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-PT/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pt-PT/thunderbird-52.6.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "a89dd739da5262713c99aa9aa28544e48710e80b83770810b240681ff0546c3b3faa37b48ae56c018a6d1d625f0411df557ced12eddfb3a1198eea474418eb68";
+ sha512 = "3ca5ed7c487ca11ef2fc743e8a66eeaa05d2585d2fab0ca40b0d965e10e43d1216de358eb61921578fcdc72b69766f8fe24beb3c548ed47c705ab84a30941c34";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/rm/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/rm/thunderbird-52.6.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "3665bad7a0d1f2d725d0a44ad55918228c2d9cef49112fb19d2c3d885d1ec62af89c15aa0ce96ddebdabf97c8a5e10fdd58d892c085e5b9d17bab6658e7bf444";
+ sha512 = "2d9e51a01175549c712c5bd1e95e08012ed9494a0f6fa5ffec8ee1c311279a6826cee99488a72d86f2cd98d9d9d6d20ef886bd4f69d100a2b589ef8dfc887335";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ro/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ro/thunderbird-52.6.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "07afa28b22705e0e84e17026d04111cb9a5283838fcb94225e2c05da1fa0692770b17052c52d8cfcdb7bd3372fdbba9cd9ed9bc16f6f59f2e3ab6f4308543d91";
+ sha512 = "8cfd1503ef3f4a9b4765d6c3fcc3a44aaa2fa557fc2a698452d10b037fdfcca09c462b455c4088b69aa89c153f14b1621d3c87c942a7bbb4627f95bbf0a37738";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ru/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ru/thunderbird-52.6.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "189c40a8d950496d62f980180502ad342621caf3a2ddffb0fe4f813c9c2d4a25aa375d8ad70c8b7e8ff85f09607bc2ced3366524346a70eed731bd8d9409e5d2";
+ sha512 = "74d611abaa10d04be342139e19b7f724516a91de07a5f4ae4c4cd3ad927accb5e6668830040defa20878ec1fc884bc983d084729ebcd1fd453c7082a627329ec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/si/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/si/thunderbird-52.6.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "0b6ee1e5ca86472a5cc67cdc242a6b62aeea50609661e369c8dd3dfac5a774f50eaf0a68973b1fe5d6d9bdf6a385c52a90b8711c80facbf9fb301981a7aae395";
+ sha512 = "292b5da1ea566ebeae2756b659b1f2ad40a4dc57517da926b3f8263a219e734d197d9aa55ce91582bd8818e0434d2a6b3bc40892d0cbd4715fcac50e3aebf7f3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sk/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sk/thunderbird-52.6.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "9c1f164a2da43aeb51e8b64115618590ba0e9284f3eca8b16d3792b33e269a0acc253314ab7943cbaee94ffc2ae321247b4982798d9d48608e85a935afcb6faf";
+ sha512 = "a5f6466d7ff0ceed4fa25c446925e398cd91c29d705ea1e28166bec09834b1f3ac61722823828d97d17b1ce7ac2e67aa98c3d5d94806b7a470d29c5722f37d9b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sl/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sl/thunderbird-52.6.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "5d4698be05af9f9181af63eb3ca6718feb1c74c81f0a6fbc82217791c911dc5f14ab433d32f6484ced2cd75d5db4b76aff3bbe420d619afcddfcbcaef25873e7";
+ sha512 = "9167d416f7552b55f8551146a3073757bea4106fea2004ad4303809f0532b85d37fea449ed09f0d162cbda2f429d869b90b5ef14f29784f418c63085a7c9b5b1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sq/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sq/thunderbird-52.6.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "32d62e6dfe28c67cc7b0e2cd27c96fd7c7e1079790eb73a8731af44e8a62f8fd1ea2e7298dc772e3014fc8255f022f38bbd5478430629140d0dca9ba0daa401e";
+ sha512 = "aceb16a89f40243f56611d726a47b15bc6b0e5c1177a4beda6b147749299640742dd9d5f64384e88f4fc065c5f5ab80a7456a81ed63331a99a60e1e2e8b76a08";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sr/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sr/thunderbird-52.6.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "6aca04c1b4378489239cef6b5032ef6dfd6d39d84308c335d03e97ea7c48acf021f6cffe35d652e117f71e6ae3f31f54e5ca73a44b4dc51dedcb3f5faf7d016f";
+ sha512 = "c0cefc58703c51d169686bb6c25477ea3116fc9691e0bf971d2a141ee8e93e4e1853911189c2b49d331d8b04c70e3c154083a05179c93a22b043a70918808ba3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sv-SE/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sv-SE/thunderbird-52.6.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "099e22013b8d6791857c378c0f94373ca42d35bbc442cf273c9de2360ab8e64d712eccaedd5a13915ee19a195b6c9f04748ba738e7bbf9b8153edc4c66070d31";
+ sha512 = "179429292f73320f33d3cfbdd4b55b65117c8b8f60abadbf8c28537ab1e6e7664f7e2fa1b20ecdb201d7d535a9974638a7c22c2f5ba0fabea580509bd35d2a3e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ta-LK/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ta-LK/thunderbird-52.6.0.tar.bz2";
locale = "ta-LK";
arch = "linux-x86_64";
- sha512 = "d3c95f37ffbbc5ef78b7c050a4e091bd9f36fa9529ed7c38e25f5495694c1b792d0bfcf53d15b74b52239acb21bd0d235ceb07c7f68f99e1b31e59e6f6282aaf";
+ sha512 = "ccc1e3b1ca1e2a762c840c5e52b33cb3c05b75195576e95f7d28abe53aa6438d83eb185664797be9a0726f51416b4cc70877a4d6e01282d426459820eac59b01";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/tr/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/tr/thunderbird-52.6.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "2f79b9d45d747424a65271033a75a86ff503694d88a30238452fbf817ba153c4638395d3e59f5f6cc662ab3361d2304d5a4c925957d9d6e6d7bddf34947acdf7";
+ sha512 = "55b14f94b1824df5e05d8c8f8c1a86a3d9667123dfb7b86723888ffeab93b8b0ed8dde082c3db0ee33446052e81b6f282e4ac3ae9a2a51ef25e01c6ffc93ad1d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/uk/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/uk/thunderbird-52.6.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "e0d891b4cc082e32d3f6af318f9224e996a8ed3c7e1385bb86a5e2f963239999712c444fed00d779320f6b06efb38f3eb97023e353f91eeb7831b44a870c6394";
+ sha512 = "94047ef1efc45fcd228012a8833ca1d6d5540ba0549a5f598ca420564e85dd0bfe4995968ba241d57b588db542f6c33445459c77b40eb3b568f66d3ef8e4e91b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/vi/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/vi/thunderbird-52.6.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "5a9e13e126c7bc8ef435b8edde1896b9773ce1dfc39fe3fe1bb31e54fe4f592acdb3db360fe0890eb35b1896aeed0954bbd051fde6116b07cb513b1390ee56e7";
+ sha512 = "f30ab0cc3b6d4322d9d65150da1b247db12305f8a39acef383048118f30a757ca380134f0f12c238432a23f5d70d173e53e24f46af158ccdcf5eac516267840c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-CN/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/zh-CN/thunderbird-52.6.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "b0374f022c2a259076d52bc0dc142098975f9f1d3a886192332fd1c1b2a5c9dabc0d3fc1a7fc0f28f6f17979931b9c78a9682be1226ff751446c5427a5219a51";
+ sha512 = "4dd0923c8258dec6de71aad216dffb2945852f2d6ad20e104599a43a13e7c48bdaaa70a7afb35e3699bbaffc9a69623d6d24e299f1a0e75f604ba9bad96647ea";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-TW/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/zh-TW/thunderbird-52.6.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "7e289afc737339be5a3db5869125d891da65fb75a62b7670c3880943ae11bda33122f81cab46bfa95223c45662684b8fb66ec11cfc5f375e024f4d57be098684";
+ sha512 = "39264550d88ad4fbc247b9bb61015b2c0a9e75ffc19ec34e1d7053995e2fcfd65721140f2f4486fe959e67484c6ca6305e997c77b59b98e60e9e979c60e320f7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ar/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ar/thunderbird-52.6.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "872ceb5933a562d352cb3bfc6e9cc95a7485625e5256380cae367d38a560f75bd7964fed1becfa5359db3befbe4aa249f114df307cf14e2db75dd047d87e5c53";
+ sha512 = "b801148b9eccf4425710ff3c5430795d873448ee068dec8e8343ec9094d8c04e317dd0cf6e2d3b69029459d980b841470365441e26d8f71503d9c6f03a52d0fa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ast/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ast/thunderbird-52.6.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "9955dde6ae54c096dbc5e5a28729963a72997fda97505657ccec6e0b5f95f35508815fe663f266932c79ef91463ef6c5da79ace4c19149b17dde9655dbe8017f";
+ sha512 = "7368be5dab56f03635d3bc06f1d1871893dd8a694388baa90a44cef5f88717a705daeb2230dae8c2bfaf8b40e1f7987aeefc729b4e77ec1055726b0944276c79";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/be/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/be/thunderbird-52.6.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "94106fb12bf932f3a8217f3252b4f76394f13cb19c602d1b4a67e4477c3a0c781c3481ac973e40af7b306fdb32c88d4c70f8302b14e693c7270e2afab0dc2539";
+ sha512 = "a39137149f5800b5ea612382b86840b095fd09e38d06ffaeb4a2f5e242b47cac828ffb87c9870a9ebc75b9bd26b0499c2899d5b778267dc6842d21afaab0e7bf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bg/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/bg/thunderbird-52.6.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "194a420d07f952f7d088cb15fd14dce30e352dac13e543321e94fc60b7780678ea1ba51d450aac2d7566a8f23a583cba70e3aed373602ac896e0be13d234f8f2";
+ sha512 = "2314afbb259a561e98bffe3d30aaac571b8f7f54de2246af78a012fcbee19fda15c8a921221ebea738fb09be07a1139f5edc14f1f9f55945a63e08c625a6bf52";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bn-BD/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/bn-BD/thunderbird-52.6.0.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "08a439a7fe40121f318131b035e7a5a1b44a56a6f3434b2854136103b0e11fd720540352ed04bde23f33c7ef75cb57eabbe86425c8f2e440f92c9260ddf1a902";
+ sha512 = "e8cd137f04521293ea60c8f8557b4482baf1d7936c9fca1ea7426ea8a99cae48f3e441a81cf1a779034595eb755009db512f29d31c8ada11391cea0f3962d61d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/br/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/br/thunderbird-52.6.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "68984b8fb564e24f3e331504a0c8a2e88cc1021319b2a47beeffd145eb42a19bd555aca495ac60612efb191830c273c473e0c3cd5844f109e78a4908834926b1";
+ sha512 = "0715d8eda4c144c35b5583bdce6eac058788b761949bcb79f156ba4931c380e33f7810fed55e283e02c5af2d555df471c48383d1ace21da7f88c3b0a8e97213b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ca/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ca/thunderbird-52.6.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "2202c43a63bb283d9eef16c27e0d6125d43284b9c1acdb8cbbdc71f3a9d6f6d527c4a03363dced911321f28399a86ef25defd294befddb8fae41912e17c2fdef";
+ sha512 = "21ec148ddfef69ead9f1b367dce4d6a93a7f1d31fb691035d40132cd4955a66f162a44f0e5b0caaae8cfdb76b0842cd78a630cb6a7949e839611d98d58776a47";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cs/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/cs/thunderbird-52.6.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "d01c6ba52794d3850656c1538e46b64eb69a7c1e3a17347ab5cfda9fb1e91976a4bfc7096f7d12bdf2f15625387aec7066b0a25879d979687c955058b92ce6c7";
+ sha512 = "f2c7c86db91332b9f38ab4ae732ca44c7f7bfa32e3b8123f7ba9662fe9f74b9f01a58ca63a9954b45aad05272baca385797679103c29a95dcf248fe8cdac5a53";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cy/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/cy/thunderbird-52.6.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "3d056c91e1599e91249774cb21d8fbc887b7bab38546aca1815ca9c49fbf4d641bab2427f03ea993a72dc29793feb1cb0cb26217a4f6827e9e0d9d3cb5e3ca0c";
+ sha512 = "f0bdfa8373fc87faa567720c4c998f08ba836f8c26a59e38e92bd641e7efd42010530575bdfe1fa7bc78b7688380eafc274b8954f2a59e60912713afacd42789";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/da/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/da/thunderbird-52.6.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "c940d26284c8ab0a45bc6a55b67b467df7ac160c8774f0e2e2deb9082ea9500142a1d3c8851031a7e7a1763fdf5348c14de57d7168c3f1bb23fed3cf31a1b09e";
+ sha512 = "80dc629b815c4ec98026f0ee5c2b7f754bc9bf0e5d026775866f502ca55b826ce071470a8713ae98089bf2208e5b0d0771a20307db5351b4af78169bd8efc1ee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/de/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/de/thunderbird-52.6.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "b1b63590885f30797ae9825f2286deca69a82a73e7c407be87fa92280b904c0605e7047a402bf6ce1e13936933a27efaa2b35d534b23f745a2ab4a9538d31b47";
+ sha512 = "bd66cf808f3d5ba73dfb0d314050c5d4ddc59966abc84e904cde2dd73c20086dcbd580c1a0bff4d1dee7ae940e38a53b9a37ed75e05758ff9da799f2ae1f7aab";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/dsb/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/dsb/thunderbird-52.6.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "fc81fbfcc6533d34fde2e08351dea6d7e2a561a3620a6d0d225dc1081f59d9927ceb0abfca7c2d21b1cc727c0319646a2f386c022524178e90aa6bba344371c3";
+ sha512 = "58e50c2d6c2d42fcd34273ead868753373e054602ab1ea7e9ea9d5ed15b8ae15e6b654fe81b6a56942f1cd4eb3778d11897fc2b9e34e789aff7d83b47bd3c100";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/el/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/el/thunderbird-52.6.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "baf8d0a52fbb12afdccd003209614ce8d5b4062336744ee783a6c3e7eb5a542c4da233fb680f320226f3681b440ab1d0717616a3664051d231b6638729903b00";
+ sha512 = "40888eca974a5e9dab7459c790b7e589906da72ca9ea64fa690225d876310239faeff8925366b5fc559a5793efcac01696f22886c9ecbd5dfad5661083b8e63d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-GB/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/en-GB/thunderbird-52.6.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "0f5fac2fd3da05cbdece404fe3d170ef49574b5abff07a17120d189338140fadbc0971c7be05656544819df2b1987fd86c0f9fdfcd312e540035e70877212342";
+ sha512 = "5a418b8f6b857a4554cddb81b36b5f4885ba694ff08b3b5f3c342491637587719578738eac9abee2735e8d0fa1ab216ee9bb5cce67955c4b7c30c3a063b95477";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-US/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/en-US/thunderbird-52.6.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "1f3a640d140fa305e115158d98aadf95d180b396aa3935de4505f0f94f510d206ae6e45adf36572cb160175383d0aaad11c3244003e4a99dae613e1a749430cf";
+ sha512 = "628a5f50871bf44c59e1d8983f520d5ede9f22bff15eb4b03673dc6d4b0f72c84247a5e29ba67e871be449825dde8090a6e9a50501e434bbc17d86aeb846e1cf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-AR/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/es-AR/thunderbird-52.6.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "42525a75e154fdf263f276330a998f127de697519a79b447d4860403c40ca2a6caec0a225a978461ae776e56218313a3fa31441817cbb13db34cd47afb9a5eb8";
+ sha512 = "595419a4c26c8974ada3e9856dcabe863666133a98d5730a1a295f1edc414d1d0b3a159afc94bd927c934d44e9b4ed4282d4211948bcbe8b6d744948e7b48e02";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-ES/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/es-ES/thunderbird-52.6.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "86b47481b760206b49f87d15a917754d875203d83613c0c8b83e181f95986e6252ff26cd6dd6f7c6545f9d4da4801f6f236fa82dcce0d0172f19228b4eb5fe33";
+ sha512 = "898a14402ab621fb81b563c039db3ae343173cb39872ca6a2985f6a279af7ffaca404af179cef3adb48285b05e24b372c1e8a1918557280ecd10a4368b540f27";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/et/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/et/thunderbird-52.6.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "4bbfa1fde3a6270b49989747b4b27c284abb89819c46119cc3f2f90f0cad1648e49a2e1e01a35ef193eed4cf504a3e027138ea30a225c3d75347aa062d56afeb";
+ sha512 = "b2ce107034b87b9e4459add9e1d6777e58f52465f81720d1a6276dbe0c341c92984fa9979ec8da0544f4699cf98a097098ed14759c38e47a0f9ea4aba6916907";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/eu/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/eu/thunderbird-52.6.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "292fd0f2db956e5bc86a84d5edf51e3e36141610c99f75b1dd8af0f086fa8bc4a4e5a4e1c3d085587b6bf2d6e3435bc70ee66d379809886a391d67e2c243d762";
+ sha512 = "a401cb39dd18e83cbe64de9c527ce4d72a951f32c5150a88bb509487f3ed4364624354a6571d41ee18f1061841cfe9bb704bf355893fab6cc44d94f660a5e0b7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fi/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fi/thunderbird-52.6.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "b8df95d4ca36efdc4370821068590b1d7e3fb9f348afeb18a0a02c977027312457aaa59c38ee02908e944f166d485576522ea0cb087b28fa857963107e43ced7";
+ sha512 = "d87a4ff14023c2a20241a920d2fac288d76124ba3734ffcae664cbf46ba3a3d54fe42979c243e6ae231f7b5aa54dfe9c82ad87f3839714aa8a21409a6e87221d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fr/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fr/thunderbird-52.6.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "7880654b4133e50ee248b6e287d52ba867361b900fbbdd149c6f06c9d5df1d0b57ce6d9d9bed3e1ab68e90b0ddf874d0b2427553b24ea39f267f576c63357bca";
+ sha512 = "5bd14acb63b044b2aa6f2f75fc365b6d65012a504ac3735cd2d72097b65aa61662007e06857f7288329c39517af01e694d19be5498bf4b718fb9b2510c8ed313";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fy-NL/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fy-NL/thunderbird-52.6.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "4784b06aeb705141d84103bf46635e6ba6a7f7795b40e654f63c783a63ee19d54843c211eac90c4246c5131ecc8808940e560f2fd2a2543522cef13bf3828938";
+ sha512 = "13baa3c5bf0c24474f6f31291b54ff9c846bc3a6056bf43a74f3e5ad4919879adeadfe583151f55cc721e8aaa0b9011cc8e9c3a402d2fc363b4b2ab97f5aef76";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ga-IE/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ga-IE/thunderbird-52.6.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "91b4145d82a4748ef2cfe6d4d46c9e92c3a54a55f72ab1c28135363471d68ee028064ec0c0bb334fb731c6577305177a06d85b2a9d820d9e2a44fb01ac961beb";
+ sha512 = "632cc17bb0e9a5ee4e651cde51f71eb6efb6eac35297126ca3c7397e4bbd407f583b70a2aa5cdb4345276b493f3d8161cd376a443b37be3ba6b2782b7d6a534b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gd/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/gd/thunderbird-52.6.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "4e979ce305a014de612c0f3797b9f8c8d89445f05972a24d8c13cd01160aa2c15007b0e505f9a0cb354f8cf65e286ba52eae8a6bbdcf4c7cf4e89809e0ce530a";
+ sha512 = "03b3f6ab1fa5edd9f4c37f1d2ed9ba7a34e4b3d714bdf238f7e4ed8e8c65c432fff5a2815a1993ac8f221a997dab2b0ee22dea46d5a8b566bad35ae1cc9a4f46";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gl/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/gl/thunderbird-52.6.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "b3081eee4473c097b37b9070cdcdd8eb48e1cf69ee63fd76f1eee0d5ed84009b69d0b31fb38c36f7d5137b78d0ab32087a8e668f1ad01e6ef96984ecd973af11";
+ sha512 = "36398fa1d04ee096c1e2fa1420ca375dc7ff135ff63343e20c916b6ecb03b2adc6e30d26e66ee6ab38cd816d928e8c628a55bb3f6cf921bf7691b6092700200b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/he/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/he/thunderbird-52.6.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "2781cc8fcac549ea394629ba1d7c43c683ea25b4d3c5807f7a4da50541e47ba18ed4d4080e7f3c785be8e71e0a8e2ae0cb9a24e348f830b71b7398efd06863e5";
+ sha512 = "f819c1bc97298445f3d3d5ef91470a7ff370a5db5e4884e8c2590e06bbfbf9a33c7d1cb9919379a6aa654e47f49b6f9e127584eeb29cb14f2e73efc01d4f8ee7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hr/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hr/thunderbird-52.6.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "d42587bb96454e3ee24b964dee1de0f51283b2c3316dd25e798a8809d2289306bf6eba6078f664f87720e7038b14f009640fdb4d3acf211195dc881e6e207c6c";
+ sha512 = "bdebf02084d98a6279c27d914935e4e8486d86cb27475e99983ab0cd8166f78c82b6815528f7afc10e6aae8f0859c393f6f42b7d1a081925b1fe2053f309052f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hsb/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hsb/thunderbird-52.6.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "49e3ee2559c124db79e2dbb2fe74291a377ccf1fbd75b450c8d4913000a055cea855fad03369e7420391faf114e160e35b02d432de847e673e352b731986bb84";
+ sha512 = "b0db8f59739e0ead2d0ec64bf00f6b62854b2b55b34db04e31c27db14b3b67e6af3bc9d857fb528e4e6115e3e1f2da75b685b17a33cf9ea976cca7ef5ebecb56";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hu/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hu/thunderbird-52.6.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "fad46a1ea3e8a1df49e4ba836c68b1744577fdfec319d9dc0b2bd8756d4dc859cb5af7484791b83f2260bd40d1ae64f19539f8f4b3977252a1f559b7df9fef35";
+ sha512 = "10ca02217736663a1fb44e20430bf2ac3a76fb5f87e57e539361ba12361c2f79aa3892fac02c4365890c6506eb86bde8fc955dd126eeddefb7b27813050d1861";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hy-AM/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hy-AM/thunderbird-52.6.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "6a34e03e5e272c847f674bd8c48cee66fb659cbf88251debe505c54011b029cea7b7e8a9722c61b3e603d66aaa4313a5971fdbf2035fd06d305cf229cd8b2afa";
+ sha512 = "a0240daee40e6d8cd76d81bfbc4bd47052f9e20a00b8c687806633eb72e16d9393a6005c16f5391d2caa5a55fb7e0b7e12d1097fe140d6fd664e3ca40358b597";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/id/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/id/thunderbird-52.6.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "1cce3d3653b474219f00f4555990406b661a14c4198f3d246624def4e5a3ad3ea393a74f6c80e0f17b5799784e212778ccb8b56bda31c5e48a55193bef09c417";
+ sha512 = "4450789df3c0176cde9adac0f8b075ca64690c0278b6da9de4040faefa35a9c915de1daec1e1b1ccae2d80c8d55f664c8535d9cc31ade68ef8081fc3f102e992";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/is/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/is/thunderbird-52.6.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "f3604e918502d16ba92e65e9def425efbb829a261d2c433ce83ec89d6ebfebbfcddd1b01508f953ec3c26166c6d01112486cdab6d1a0fe1e6a582f0566900b89";
+ sha512 = "9ad56f873a0138d55a34b6058681c9edb185734c3b358aa1ffd91161403cba5fa0a2d02d858fe45ebbb2e991c0a8da1bfcb6516c9836e26a3aec7e2160f292a4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/it/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/it/thunderbird-52.6.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "458bc19bd6b08f6834e310f7ec4591ad4e84067ae2373864ca9019c20551abbcbc067467fffada229000dda01369da3c28967df522182d8eda1a147d136b6315";
+ sha512 = "242f2c9b2a7821bbd6601f4aeccbfe8f9c31556a061c0200b1139ce28c613c3781fa0ece4c9674c19a2283f647b2804820f29e26cba9ecfdc53a6b05964e2762";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ja/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ja/thunderbird-52.6.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "05faf43b8b0f616bf552988a577891e816fe36b208b7d6292c9896a6946386815e117278feef33063b4f2eb7b5ec89aebc59e1d4432021969bf3b95e750defa3";
+ sha512 = "1686f8cfc156744f2e9c02afa19ca00ac29db0e6f9b07900aae9b068928ff30431350ddb75824918df5a64e076d88b312f1055b74db44ec7cb909d505d2c013d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/kab/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/kab/thunderbird-52.6.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "594669d5518b0be87095527b3013799812c9f45254434523903ad19edb2ebd4bc32409df6f646b1d1e953098e126673427400238a056e0a8c44b672009a12a2c";
+ sha512 = "cadfcf6a02732831411f180d0363d3c3cb08e31d7d108b5f55d14bb75b6c48a744b40ec2a964f659904fde4c5e82ea8b89651db55406e5327db41c6f15f74416";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ko/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ko/thunderbird-52.6.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "db3e6c9efbeeed833384256814a713a5bf3d2a220a74c88fd28f91ec0dd6c7600d77e18ce66c9dc9f1929f5da7452c5904f012fa8f5e4fa04084892e17b2647f";
+ sha512 = "4b4e6bc229049210695536a0e12d685995bf439ab8b2b7879142c93cc749882ed79b98063fabd4df97503e771f585cbfc1590b2a3815a6121a7e43417addaaad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/lt/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/lt/thunderbird-52.6.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "2b8e8b74bbba2a72dc88a8dba457189cad1c902c0bf2cbc54bf989c6444c8b164238f1d9e21c2c8e470df5198d8586cd613b40292b737c04f4c2d834d298dc13";
+ sha512 = "5d73c90f57e50500debfccb555183cb616ac9d893a19ee29fe22f4823085bd62aea156fd5c0f0f6ff49291636c4d90af253096416aeb87982da5455bf548a40b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nb-NO/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nb-NO/thunderbird-52.6.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "bf99756bb7bc5fa699cae5ef3da5a3614e57483b2892e2f6f769699ef3478e22847ddeaf63fc0c521cd1fbcccbdf9bc5054430a5cdbb50e26e371818cae404fb";
+ sha512 = "0adf9e6b10010ea5cce216a510e53fc5dc9c2066eceacf3c3c6bda7526b3bfef1083b130c08432dc59f09e02e19f0c4a5b885cb43627771aec00d78828377eb6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nl/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nl/thunderbird-52.6.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "80170d51276bb77de4af8d45d5869069c7d9c6db7ad6d5786fd4c2c5cfb0a20ceb1cdce7b5dbf99a79dca329efa5d9a53d4ed738cbe7f77bdcb65a8b6e2e7511";
+ sha512 = "372e39c33a78e70d628fc1bc1a9719b3d902d67eead4e47091b40913a4aa76dac63db003cae8113f7d194cc6fd24cad13c4e87aefd1d6bf425434835c983ca7a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nn-NO/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nn-NO/thunderbird-52.6.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "f223dd33108a750563a498e92b53cd3e68e3d50fdb1a08e295a9c3e893c20908ea56c9c5312874469b2f96d1046f754df55bc38d1595d5b811b7ed659e267d98";
+ sha512 = "1c66f021fbdf85e1aaed26e5a6d3abcbc9d71e91126bca10a6f8b62b10abf3927a44ae559136478fd9628dfe3409c4edd83f3336302c84fb0b6be6d4031dbb3a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pa-IN/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pa-IN/thunderbird-52.6.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "a418fea2521ff6971d68d975823bd0917580450a7ff38975455b891c8e3cbcfdf51c40502fa072ebc1f43ce93a3b07ce93db369edfbd511beee5dfc5041a0a84";
+ sha512 = "aba5a6804f08eb303e71aba94b11116f253dd19dd31e10c05ad5469800378ffef678a90a8a33db2da516bb55ea2d1d1b5537c3c11ff9132ce9ce890fb4e8e413";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pl/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pl/thunderbird-52.6.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "05adc7298c91853b373756944d360589caeef6a999f6c5ea9babe3b12ff9409909040b69b641b69b78bd17bddda59f9828e294f5cd5f7d7061cc3f51eb3c48b3";
+ sha512 = "19559239283420bac401dfefec812bbc18d33483380c44f217b70d9412b3d93f9ab3c2f5d9d518191fd891316e9ccb5b21f901676026f7ad2414a4541d584f98";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-BR/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pt-BR/thunderbird-52.6.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "4a2503e3a1daf5b9cb26acf25720c4d0fdc7a170bd454a185e4cf2cd9c9429dcbdee4c13e59e11a2a275d88513b1ae31dffae8bdf70c3196249e432360fbe705";
+ sha512 = "64ada0291a3da9713eb81cd05ddbcddd70379bf07a14e019580bbb7b5fea4976ad7aeae87a651da070139e975bb52f66271ed3124eeada4d6a90f4afed948d3f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-PT/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pt-PT/thunderbird-52.6.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "cb02054a64a74c2e1f936594f001dd721e3016cc68cf705c0413a732153bbe45aaa14736d38b22358bda5f3d059f7306087c27faf040d91bd7f92066403e65c1";
+ sha512 = "ce57a764ee2a529d7e37b6d620cf7c3825f7af1cc04da0502d64d2a7fb577a27a171a4f5d589c3f5e738192241776be4119d45958b2d77fbe3ae4f82279ab380";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/rm/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/rm/thunderbird-52.6.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "8e745e5d1e5a4d3f432bf8c5f90906a22c8d2fe4c6d77ec032cb7eccae1f2f9e7cf0620dd3ef378414d6f34cc25346ff44b7fbee05016f34c49a0c8c5959184c";
+ sha512 = "04bc57c8360be5917fe2e05b6b672fab614ea5a6ff150c83242ee20e89756f2f24afa096249fad5f2795c47e570815281bce70449385efc5e510c64204e5f7cb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ro/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ro/thunderbird-52.6.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "20d9b9666704c87f73f4c8cbe8d09cf79349e811f4c4da93f2754886cc89fabf7c2388430f9f072a3918b38984742adab48ada320dd75761a7443f3be1198a8e";
+ sha512 = "86c790e5b3faeface66d001ea9e56006ac2955883337204e5f79764cdf74860df210688f8467c9f7b0051c9efd5cdbc5c98b615656155b99361bbba656254a47";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ru/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ru/thunderbird-52.6.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "ff7c64ed9a4403e24b7f0f9fb06bc4b96153fbe7d30b94ea7e145d33dc24bb1b2807db8d6e3398dc84e13f68d9c5c4fbaacc3027cd46ee58fecaa8b7b17b27a7";
+ sha512 = "cbf316a94b64d02ee83fdafddbb60daac5157ea11c57889703bde88e3c4baec720dde515e9864f021cbb39e6945a33ccf909623fda0abe542e07b11eab8154d4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/si/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/si/thunderbird-52.6.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "b2358e6df5f5cda477c530dddd9d27e35a8919aa346b66521336fb0cddd2821bb7dd867f4ad005c135ce040a1eb64ad9f1feef81a268a299ca2170312f7c89ef";
+ sha512 = "cf0dddbe01bddd623ce5052f0a72dee9da4eb5de1932d0a0a656baba55c79eaec51387e37f74c1a1a754ee71def8c972af5dda5a5bf9e78c19a2c11c1cc42e57";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sk/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sk/thunderbird-52.6.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "fc3eae35914d2a2ec6d44bf6348f71872f7ccb09d25ed974843b8010526f219437e6530c4d86825d027f1593da0943e0b9a5557bf41d4095e4e9d37108a94c3a";
+ sha512 = "5c70a7e8a47e44a47eac2d00526c4c8da340121c1fc8c136b3b40cbe0809548e9cde6d6dc76d1ad679d7bdedefdaf3fc373b2c124cca6b36a9cdb9f4e6da939a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sl/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sl/thunderbird-52.6.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "532b87d22bd05194470801cccf242ffbae57685e69a836c8179e2fc562bdf2aba196f214b7a66006ef90d7fb1781d66e1ea62c2cf95820402deb9a73122ad143";
+ sha512 = "9bbaf000fd2c1fe28f0f64c31c7736a2595399788498ae8be8fdac8dabc709efeacd8fb1f6ae8a095c130ff7620e1b7c6e909959b9c724b7bde736049664357c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sq/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sq/thunderbird-52.6.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "b621973b1f76f2d789afa854917e20b7b48e3381344da29e07b8c5bfd469162c47d51e9552ab2428895c45dab9662d8fdc2704e65c96faa4afbddc4649a77dec";
+ sha512 = "6f8d71fa87777b11f5ebf14c6811ce9a0c2c380db5b7f3fe774219cc60bea6d4f59de8a3dd193d855725c3a0e5470b36dc0538f94539d637be14de5d8e480c7b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sr/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sr/thunderbird-52.6.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "d26812c232168c30c6a76dad5f3f7e20fe88cd75fc63f863bca255fa353928b8d3988c56abbb649266e52b8d31d70182c59ded496607aae17d7d2d0409ecc53a";
+ sha512 = "0bbcd2a98f767a8836d054a97c797a0ea7eac5c08fed9177189474e47e8dc50d395735c0eaf8c6e839ac608084c6e533a3b20fda5e69ad74ada53636f1181359";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sv-SE/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sv-SE/thunderbird-52.6.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "294e141cabec4edab0695e7c8e29149543e4cf4d451cfe9ba038a6997a822e02f223045ac3a8ac25b99a1e847740fac4d9d5c0b5ce0c5d69d331d823bf8e4899";
+ sha512 = "22cc597657e44124162a6b8693022bd4086e3b4e0f9e42342c997bd333e1182163f0ca0c67d91cbb5e18c45605c877eb69d00372c86a9378ed2e7846547f3964";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ta-LK/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ta-LK/thunderbird-52.6.0.tar.bz2";
locale = "ta-LK";
arch = "linux-i686";
- sha512 = "9c9b79cf21e64461b8a78dd0f7816346ada2cce0ef4bce4da291497c9fd1aa414c199d57265390e5b885828b1efa38f9883882870b84a5b3a64ffffb47da79e1";
+ sha512 = "902832bf66b2efd39cf038e9361bf0ee8f9682e73a42895ccf6bb637eeabb8d4d5e8b3b3d28bfa52e537ad1babee6bbb8d033c538a61880920ace6a4a7cadf95";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/tr/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/tr/thunderbird-52.6.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "61a671ae2804b06143e636c9e8ae0badb460bf9cbb3555213bf43aa2d56b2a9f13ca3a13362f2a9b7ecafb4b03451093ea2f817a104cc7d4555e11b1ffb18103";
+ sha512 = "70dbb015aa4acf35d5cba0e9d8916bed2603c7e44574c98e98e56edfb68db3ab572402fda5c809d838c51a2e3f135cd3b86f2dde44acd2e1ae2f12cecc276655";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/uk/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/uk/thunderbird-52.6.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "629ede67d8bbfd6b1233d2030234fed7f99915045131caa11edce99b6e9c314b7cfd6ef457d26a0e628b525bb78c05426e8c078364ade5e606dfaba90200feee";
+ sha512 = "9fd85a4f4366caea3409cca47df70d2f028c7d85c248ebbe5e7e92005d98d45947639fae2aac8a145e4cad12cc92e368b9f86de4623a7d1a35e0485fb35cff97";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/vi/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/vi/thunderbird-52.6.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "728644651b7eff73be44bceccf8038bca79e020fbaad87d74fb1ff4856554766e6494e1e16a0d93187615f5f8cb663fc3233855d66e8cf0996fe597c9645273c";
+ sha512 = "205b22a39b795946f019cbb9e8c1813a0ca9f59551c9ea30c661fbe43bbf1d87069dd3992e71c83226b2559cdb4db2186b37120c847367b6a4e1b16aba24510f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-CN/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/zh-CN/thunderbird-52.6.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "ef5a81e04ed973fd2ed576d1654f1ada7d9cefb6943bf604bee53053fedc4b2127c780ac2ff3c9b568813699f29f744950e899bc71733cd8d385368e1d0c07c2";
+ sha512 = "d1a9247b1db70ddba4f0cf80af7b8606e6bf006b31d3e771a4047dd7ccd121114bab900c38c02f36c4b60636caae75047f153bafd06aacf1b546c3d8af01806a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-TW/thunderbird-52.4.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/zh-TW/thunderbird-52.6.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "ddf5a00621d6916c6033f81589c9376a8aaba3bf12810a2fd41358af323d9f6354384a5b938f299855d27a1272d36e99ca3f45a8ab8299aa7afc118d942ae624";
+ sha512 = "a92b42e7e1869ad91d8343072d508df6bb8e67ddf7d929d4911457c5bba04fc1ec7d3218685954a4ded7ecf819bfbef975813fb2bbb9d1da60444b83f1f0fdb9";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 2e1f8ed50701..f59202920ccd 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL
-, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
+, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip
+, yasm, libGLU_combined, sqlite, unzip
, hunspell, libevent, libstartup_notification
, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc
, autoconf213, which, m4
@@ -22,11 +22,11 @@ let
wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
in stdenv.mkDerivation rec {
name = "thunderbird-${version}";
- version = "52.4.0";
+ version = "52.6.0";
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "6ac39cecca9e53b51754d7a8bd7cae228d197eb234b03a2386c16fd665f4f7a67f10bbdf981c20b3f7a21a5ef67e2771154a3dd9f249c6a884c48a9e59bcfc78";
+ sha512 = "80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a8f56445e2394484be088a7b9801405f3d6618fb2742601cc968bf34427f0";
};
# New sed no longer tolerates this mistake.
@@ -39,9 +39,9 @@ in stdenv.mkDerivation rec {
# from firefox, but without sound libraries
buildInputs =
[ gtk2 zip libIDL libjpeg zlib bzip2
- dbus dbus_glib pango freetype fontconfig xorg.libXi
+ dbus dbus-glib pango freetype fontconfig xorg.libXi
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
- nspr nss libnotify xorg.pixman yasm mesa
+ nspr nss libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip
hunspell libevent libstartup_notification /* cairo */
@@ -72,7 +72,6 @@ in stdenv.mkDerivation rec {
"--enable-system-sqlite"
#"--enable-system-cairo"
"--enable-startup-notification"
- "--enable-content-sandbox" # available since 26.0, but not much info available
"--disable-crashreporter"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
@@ -141,7 +140,7 @@ in stdenv.mkDerivation rec {
exec = "thunderbird %U";
desktopName = "Thunderbird";
icon = "$out/lib/thunderbird-${version}/chrome/icons/default/default256.png";
- genericName = "Main Reader";
+ genericName = "Mail Reader";
categories = "Application;Network";
mimeType = stdenv.lib.concatStringsSep ";" [
# Email
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index a611e2cf3ee8..d8029f02a6f0 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, pkgconfig
+{ stdenv, fetchurl, fetchgit, fetchpatch, pkgconfig
, qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
, alsaLib, python
, jackSupport ? false, libjack2 ? null
@@ -17,7 +17,7 @@ let
generic = overrides: source: stdenv.mkDerivation (source // overrides // {
name = "${overrides.type}-${source.version}";
- patches = optional jackSupport ./mumble-jack-support.patch;
+ patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
nativeBuildInputs = [ pkgconfig python ]
++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmake ]; }."qt${toString source.qtVersion}"
@@ -90,7 +90,7 @@ let
mkdir -p $out/share/icons{,/hicolor/scalable/apps}
cp icons/mumble.svg $out/share/icons
- ln -s $out/share/icon/mumble.svg $out/share/icons/hicolor/scalable/apps
+ ln -s $out/share/icons/mumble.svg $out/share/icons/hicolor/scalable/apps
'';
} source;
@@ -116,17 +116,24 @@ let
url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz";
sha256 = "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh";
};
+
+ # Fix compile error against boost 1.66 (#33655):
+ patches = singleton (fetchpatch {
+ url = "https://github.com/mumble-voip/mumble/commit/"
+ + "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch";
+ sha256 = "1r50dc8dcl6jmbj4abhnay9div7y56kpmajzqd7ql0pm853agwbh";
+ });
};
gitSource = rec {
- version = "2017-05-25";
+ version = "2018-01-12";
qtVersion = 5;
# Needs submodules
src = fetchgit {
url = "https://github.com/mumble-voip/mumble";
- rev = "3754898ac94ed3f1e86408114917d1b4c06f17b3";
- sha256 = "1qh49x3y7m0c0h0gcs6amkf8nb75p6g611zwn19mbplwmi7h9y8f";
+ rev = "e348e47f4af68eaa8e0f87d1d9fc28c5583e421e";
+ sha256 = "12z41qfaq6w3i4wcw8pvyb8wwwa8gs3ar5zx6aqx6yssc6513lr3";
};
};
in {
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 93e10fbe5664..0b8a584fc6a6 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -1,26 +1,26 @@
{ stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook
-, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1
-, libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg
-, gobjectIntrospection, glib_networking
+, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1
+, libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg
+, gobjectIntrospection, glib-networking
}:
let
pname = "liferea";
- version = "1.12-rc3";
+ version = "1.12.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
- sha256 = "0dd6hisqvc4ps6dx9ly34qx49ab1qa5h826b7dvf64mjqxa2v3kr";
+ sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15";
};
nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];
buildInputs = [
- glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas
- libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection
- librsvg glib_networking libnotify
+ glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas
+ libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection
+ librsvg glib-networking libnotify
] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
]);
@@ -28,6 +28,7 @@ in stdenv.mkDerivation rec {
pythonPath = with python3Packages; [ pygobject3 pycairo ];
preFixup = ''
+ rm "$out/share/icons/hicolor/icon-theme.cache"
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
'';
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 63d7f29d7de6..1d913118433e 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,23 +1,38 @@
{ spellChecking ? true
-, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null
-, perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify
+, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
+, perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
+, makeWrapper, gnupg
+, gnomeSupport ? true, libgnome-keyring3
}:
-assert spellChecking -> gtkspell2 != null;
+assert spellChecking -> gtkspell3 != null;
-let version = "0.139"; in
+let version = "0.144"; in
stdenv.mkDerivation {
name = "pan-${version}";
src = fetchurl {
url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
- sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz";
+ sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk2 perl gmime gettext intltool dbus_glib libnotify ]
- ++ stdenv.lib.optional spellChecking gtkspell2;
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
+ buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ]
+ ++ stdenv.lib.optional spellChecking gtkspell3
+ ++ stdenv.lib.optional gnomeSupport libgnome-keyring3;
+
+ configureFlags = [
+ "--with-dbus"
+ "--with-gtk3"
+ "--with-gnutls"
+ "--enable-libnotify"
+ ] ++ stdenv.lib.optional spellChecking "--with-gtkspell"
+ ++ stdenv.lib.optional gnomeSupport "--enable-gkr";
+
+ postInstall = ''
+ wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin
+ '';
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 5ebd01f38c41..d527279ab775 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "quiterss-${version}";
- version = "0.18.8";
+ version = "0.18.9";
src = fetchFromGitHub {
owner = "QuiteRSS";
repo = "quiterss";
rev = "${version}";
- sha256 = "09mdxpv04zycrip1p5w6947348xfraicijddvxsr7d498r59b7ff";
+ sha256 = "0n2rgzyxw6m29i8m8agri3cp5dbpjblhhyklvxsyzmkksnsxpw58";
};
nativeBuildInputs = [ pkgconfig qmake ];
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 652de194a5e7..6ed5e63cd0f1 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
-, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }:
+, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome-keyring }:
stdenv.mkDerivation rec {
name = "nextcloud-client-${version}";
- version = "2.3.2";
+ version = "2.3.3";
src = fetchgit {
url = "git://github.com/nextcloud/client_theming.git";
- rev = "1ee750d1aeaaefc899629e85c311594603e9ac1b";
- sha256 = "0dxyng8a7cg78z8yngiqypsb44lf5c6vkabvkfch0cl0cqmarc1a";
+ rev = "ab40efe1e1475efddd636c09251d8917627261da";
+ sha256 = "19a1kqydgx47sa1a917j46zlbc5g9nynsanasyad9c8sqi0qvyip";
fetchSubmodules = true;
};
@@ -36,9 +36,12 @@ stdenv.mkDerivation rec {
"-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include"
];
- postInstall = stdenv.lib.optionalString (withGnomeKeyring) ''
+ postInstall = ''
+ sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \
+ $out/share/applications/nextcloud.desktop
+ '' + stdenv.lib.optionalString (withGnomeKeyring) ''
wrapProgram "$out/bin/nextcloud" \
- --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]}
+ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome-keyring ]}
'';
meta = with stdenv.lib; {
@@ -46,6 +49,6 @@ stdenv.mkDerivation rec {
homepage = https://nextcloud.com;
license = licenses.gpl2;
maintainers = with maintainers; [ caugner ];
- platforms = platforms.unix;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix
index 75ed084c2853..af6a4dfddc1b 100644
--- a/pkgs/applications/networking/offrss/default.nix
+++ b/pkgs/applications/networking/offrss/default.nix
@@ -8,18 +8,14 @@ stdenv.mkDerivation {
cp offrss $out/bin
'';
- crossAttrs = {
- propagatedBuildInputs = [ curl.crossDrv libmrss.crossDrv ];
- preConfigure = ''
- sed 's/^PDF/#PDF/' -i Makefile
- '';
- };
-
- buildInputs = [ curl libmrss podofo ]
+ buildInputs = [ curl libmrss ]
+ ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo
++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
configurePhase = stdenv.lib.optionalString (!stdenv.isLinux) ''
sed 's/#EXTRA/EXTRA/' -i Makefile
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ sed 's/^PDF/#PDF/' -i Makefile
'';
src = fetchurl {
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 41e64d7b721f..b3a1c1a23b37 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "ostinato-${version}";
- version = "0.8";
+ version = "0.9";
src = fetchFromGitHub {
owner = "pstavirs";
repo = "ostinato";
rev = "v${version}";
- sha256 = "1b5a5gypcy9i03mj6md3lkrq05rqmdyhfykrr1z0sv8n3q48xca3";
+ sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx";
};
ostinatoIcon = fetchurl {
@@ -54,6 +54,10 @@ stdenv.mkDerivation rec {
EOF
'';
+ # `cd common; qmake ostproto.pro; make pdmlreader.o`:
+ # pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory
+ enableParallelBuilding = false;
+
meta = with stdenv.lib; {
description = "A packet traffic generator and analyzer";
homepage = http://ostinato.org;
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 814dc1bf69a9..94e3b7d0ba6a 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,13 +2,15 @@
stdenv.mkDerivation rec {
name = "owncloud-client-${version}";
- version = "2.3.3";
+ version = "2.3.4";
src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
- sha256 = "1r5ddln1wc9iyjizgqb104i0r6qhzsmm2wdnxfaif119cv0vphda";
+ sha256 = "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49";
};
+ patches = [ ../nextcloud-client/find-sql.patch ];
+
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index 7f8594b8bbb1..c6e5d0f3cb31 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, libtorrentRasterbar_1_0, pythonPackages }:
+{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages }:
pythonPackages.buildPythonPackage rec {
name = "deluge-${version}";
version = "1.3.15";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec {
};
propagatedBuildInputs = with pythonPackages; [
- pyGtkGlade libtorrentRasterbar_1_0 twisted Mako chardet pyxdg pyopenssl service-identity
+ pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity
];
nativeBuildInputs = [ intltool ];
diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 8a159f033aec..727999414020 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -1,24 +1,80 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
-with stdenv.lib;
+let
+ version = "6.6.3-build-253";
+ name = "frostwire-desktop-${version}";
-stdenv.mkDerivation rec {
- version = "6.4.5";
- name = "frostwire-${version}";
-
- src = fetchurl {
- url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
- sha256 = "01nq1vwkqdidmprlnz5d3c5412r6igv689barv64dmb9m6iqg53z";
+ src = fetchFromGitHub {
+ owner = "frostwire";
+ repo = "frostwire";
+ rev = name;
+ sha256 = "1bqv942hfz12i3b3nm1pfwdp7f58nzjxg44h31f3q47719hh8kd7";
};
+ desktopItem = makeDesktopItem {
+ name = "frostwire";
+ desktopName = "FrostWire";
+ genericName = "P2P Bittorrent client";
+ exec = "frostwire";
+ icon = "frostwire";
+ comment = "Search and explore all kinds of files on the Bittorrent network";
+ categories = "Network;FileTransfer;P2P;";
+ };
+
+ # fake build to pre-download deps into fixed-output derivation
+ deps = stdenv.mkDerivation {
+ name = "${name}-deps";
+ inherit src;
+ buildInputs = [ gradle perl ];
+ buildPhase = ''
+ export GRADLE_USER_HOME=$(mktemp -d)
+ ( cd desktop
+ gradle --no-daemon build
+ )
+ '';
+ # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
+ installPhase = ''
+ find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \
+ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+ | sh
+ '';
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0p279i41q7pn6nss8vndv3g4qzrvj3pmhdxq50kymwkyp2kly3lc";
+ };
+
+in stdenv.mkDerivation {
+ inherit name src;
+
nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ gradle ];
+
+ buildPhase = ''
+ export GRADLE_USER_HOME=$(mktemp -d)
+ ( cd desktop
+ substituteInPlace src/com/frostwire/gui/player/MediaPlayerLinux.java \
+ --replace /usr/bin/mplayer ${mplayer}/bin/mplayer
+ substituteInPlace build.gradle \
+ --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }'
+ gradle --offline --no-daemon build
+ )
+ '';
installPhase = ''
- mkdir -p $out/share/java
- mv $(ls */*.jar) $out/share/java
+ mkdir -p $out/lib $out/share/java
- makeWrapper $out/share/java/frostwire $out/bin/frostwire \
- --prefix PATH : ${jre}/bin/
+ cp desktop/build/libs/frostwire.jar $out/share/java/frostwire.jar
+
+ cp ${ { x86_64-darwin = "desktop/lib/native/*.dylib";
+ x86_64-linux = "desktop/lib/native/libjlibtorrent.so";
+ i686-linux = "desktop/lib/native/libjlibtorrentx86.so";
+ }.${stdenv.system} or (throw "unsupported system ${stdenv.system}")
+ } $out/lib
+
+ cp -dpR ${desktopItem}/share $out
+
+ makeWrapper ${jre}/bin/java $out/bin/frostwire \
+ --add-flags "-Djava.library.path=$out/lib -jar $out/share/java/frostwire.jar"
'';
meta = with stdenv.lib; {
@@ -26,6 +82,6 @@ stdenv.mkDerivation rec {
description = "BitTorrent Client and Cloud File Downloader";
license = licenses.gpl2;
maintainers = with maintainers; [ gavin ];
- platforms = platforms.all;
+ platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" ];
};
}
diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
new file mode 100644
index 000000000000..4f885116bd82
--- /dev/null
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ version = "6.6.3";
+ name = "frostwire-${version}";
+
+ src = fetchurl {
+ url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
+ sha256 = "0n1g0am3d2fxw4a4zzzyif1fal1x3xch9q7743jhkkm3mldl2grw";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ mkdir -p $out/share/java
+ mv $(ls */*.jar) $out/share/java
+
+ makeWrapper $out/share/java/frostwire $out/bin/frostwire \
+ --prefix PATH : ${jre}/bin/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.frostwire.com/;
+ description = "BitTorrent Client and Cloud File Downloader";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ gavin ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index 6d204de9ac43..400600751a2e 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Modern and lightweight direct connect client with a friendly ncurses interface";
- homepage = http://dev.yorhel.nl/ncdc;
+ homepage = https://dev.yorhel.nl/ncdc;
license = licenses.mit;
platforms = platforms.linux; # arbitrary
maintainers = with maintainers; [ ehmry ];
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 03178b5cb75d..90d68a96e5c0 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, which
-, boost, libtorrentRasterbar, qtbase, qttools
+, boost, libtorrentRasterbar, qtbase, qttools, qtsvg
, debugSupport ? false # Debugging
, guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
, webuiSupport ? true # WebUI
@@ -10,16 +10,16 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
- version = "3.3.16";
+ version = "4.0.4";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
- sha256 = "0mxyn2pajvb55bhcaz55v64p2xzy15p0yy174s62b5y3f8cac27a";
+ sha256 = "13sw0sdw2agm49plp9xvkg6wva274drpvgz76dqj4j2kfxx9s2jk";
};
nativeBuildInputs = [ pkgconfig which ];
- buildInputs = [ boost libtorrentRasterbar qtbase qttools ]
+ buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ]
++ optional guiSupport dbus_libs;
# Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist.
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Free Software alternative to µtorrent";
- homepage = http://www.qbittorrent.org/;
+ homepage = https://www.qbittorrent.org/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ viric ];
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 0d7a41735ea4..950187ed9c60 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
- speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools
+ speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools
protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg
];
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
new file mode 100644
index 000000000000..315106ea8525
--- /dev/null
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, fetchurl
+, dbus
+, expat, zlib, fontconfig
+, libpng, libX11, libxcb, libXau, libXdmcp, freetype, libbsd
+}:
+
+with stdenv.lib;
+let
+ libPath = makeLibraryPath
+ [ stdenv.cc.cc dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd ];
+
+ version = "2016-1-17";
+
+ mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit");
+ srcs = {
+ "i686-linux" = fetchurl {
+ url = "https://www.dropbox.com/s/kebk1b5ib1m3xxw/${mainbin}.tgz";
+ sha256 = "0r9rhnfslkgbw3l7fnc0rcfqjh58amgh5p33kwam0qvn1h1frnir";
+ };
+
+ "x86_64-linux" = fetchurl {
+ url = "https://www.dropbox.com/s/7qh902qv2sxyp6p/${mainbin}.tgz";
+ sha256 = "05l3smpdvw8xdhv4v8a28j0yi1kvzhrha2ck23g4bl7x9wkay4cc";
+ };
+ };
+
+in stdenv.mkDerivation rec {
+
+ name = "soulseekqt-${version}";
+ inherit version;
+ src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+
+ sourceRoot = ".";
+ buildPhase = ":"; # nothing to build
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp ${mainbin} $out/bin/soulseekqt
+ '';
+
+ fixupPhase = ''
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath ${libPath} \
+ $out/bin/soulseekqt
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Official Qt SoulSeek client";
+ homepage = http://www.soulseekqt.net;
+ license = licenses.unfree;
+ maintainers = [ maintainers.genesis ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index d37f5293ef80..688f908c798c 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, zlib, dbus, dbus_glib, gtk2, gdk_pixbuf, cairo, pango }:
+{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk_pixbuf, cairo, pango }:
stdenv.mkDerivation rec {
name = "tixati-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus_glib gtk2 gdk_pixbuf cairo pango ]} \
+ --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk_pixbuf cairo pango ]} \
tixati
install -D tixati $out/bin/tixati
install -D tixati.desktop $out/share/applications/tixati.desktop
diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix
index a33f85551f3d..f047b630ec40 100644
--- a/pkgs/applications/networking/p2p/transgui/default.nix
+++ b/pkgs/applications/networking/p2p/transgui/default.nix
@@ -3,12 +3,12 @@ libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }:
stdenv.mkDerivation rec {
name = "transgui-5.0.1-svn-r${revision}";
- revision = "986";
+ revision = "988";
src = fetchsvn {
url = "https://svn.code.sf.net/p/transgui/code/trunk/";
rev = revision;
- sha256 = "0z83hvlhllm6p1z4gkcfi1x3akgn2xkssnfhwp74qynb0n5362pi";
+ sha256 = "1i6ysxs6d2wsmqi6ha10rl3n562brmhizlanhcfad04i53y8pyxf";
};
nativeBuildInputs = [ pkgconfig ];
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
substituteInPlace restranslator.pas --replace /usr/ $out/
'';
+ patches = [
+ ./r988-compile-fix.patch
+ ];
+
makeFlags = [
"FPC=fpc"
"PP=fpc"
diff --git a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch
new file mode 100644
index 000000000000..4b070d0cbe8a
--- /dev/null
+++ b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch
@@ -0,0 +1,22 @@
+diff --git a/utils.pas b/utils.pas
+index eb8b828..1ff2440 100644
+--- a/utils.pas
++++ b/utils.pas
+@@ -100,7 +100,7 @@ uses
+ {$ifdef CALLSTACK}
+ lineinfo2,
+ {$endif CALLSTACK}
+- LazFileUtils, LazUtf8, StdCtrls, Graphics;
++ LazFileUtils, LazUtf8, StdCtrls, Graphics, FileUtil;
+
+ {$ifdef windows}
+ function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle;
+@@ -235,7 +235,7 @@ end;
+
+ function ParamStrUTF8(Param: Integer): utf8string;
+ begin
+- Result:=FileUtil.ParamStrUTF8(Param);
++ Result:=LazUtf8.ParamStrUTF8(Param);
+ end;
+
+ function ParamCount: integer;
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 20c3540b7f45..eb88d1c24c20 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -1,6 +1,6 @@
{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig
-, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib
-, hicolor_icon_theme }:
+, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib
+, hicolor-icon-theme }:
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
pkgconfig intltool autoconf-archive
appstream-glib
];
- buildInputs = [ gtk3 json_glib curl glib hicolor_icon_theme ];
+ buildInputs = [ gtk3 json-glib curl glib hicolor-icon-theme ];
meta = with stdenv.lib;
{ description = "GTK remote control for the Transmission BitTorrent client";
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 9b448f86736d..cf825b724962 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook
, openssl, curl, libevent, inotify-tools, systemd, zlib
, enableGTK3 ? false, gtk3
, enableSystemd ? stdenv.isLinux
@@ -6,23 +6,21 @@
, enableCli ? true
}:
-let
- version = "2.92";
-in
-
let inherit (stdenv.lib) optional optionals optionalString; in
stdenv.mkDerivation rec {
name = "transmission-" + optionalString enableGTK3 "gtk-" + version;
+ version = "2.93";
src = fetchurl {
- url = "https://transmission.cachefly.net/transmission-${version}.tar.xz";
- sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s";
+ url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.93.tar.xz";
+ sha256 = "8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ]
+ ++ optionals enableGTK3 [ wrapGAppsHook ];
buildInputs = [ intltool file openssl curl libevent zlib ]
- ++ optionals enableGTK3 [ gtk3 makeWrapper ]
+ ++ optionals enableGTK3 [ gtk3 ]
++ optionals enableSystemd [ systemd ]
++ optionals stdenv.isLinux [ inotify-tools ];
@@ -41,10 +39,8 @@ stdenv.mkDerivation rec {
++ optional enableSystemd "--with-systemd-daemon"
++ optional enableGTK3 "--with-gtk";
- preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ ''
+ preFixup = optionalString enableGTK3 ''
rm "$out/share/icons/hicolor/icon-theme.cache"
- wrapProgram "$out/bin/transmission-gtk" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation";
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 9d26a74f8bb1..f6828fe6f317 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "tribler";
name = "${pname}-${version}";
- version = "7.0.0-rc3";
+ version = "7.0.1";
src = fetchurl {
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
- sha256 = "0f1f8mzbk1ygkh8lv9y1s9mvslv12d94mxvmp3b4s2vm8w4syza7";
+ sha256 = "0cqg6319x2lid5la5vdlj6lwja8g712196j39jzv5yiaq8d0zym4";
};
buildInputs = [
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
maintainers = with maintainers; [ xvapx ];
- homepage = http://www.tribler.org/;
+ homepage = https://www.tribler.org/;
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
license = licenses.lgpl21;
platforms = platforms.linux;
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index bceabc2a64a9..2a4991b9318f 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -2,15 +2,19 @@
stdenv.mkDerivation rec {
name = "pjsip-${version}";
- version = "2.6";
+ version = "2.7.2";
src = fetchurl {
url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
- sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig";
+ sha256 = "0wiph6g51wanzwjjrpwsz63amgvly8g08jz033gnwqmppa584b4w";
};
buildInputs = [ openssl libsamplerate alsaLib ];
+ preConfigure = ''
+ export LD=$CC
+ '';
+
postInstall = ''
mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
@@ -25,7 +29,7 @@ stdenv.mkDerivation rec {
description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE";
homepage = http://pjsip.org/;
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
+ maintainers = with stdenv.lib.maintainers; [viric olynch];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix
new file mode 100644
index 000000000000..305aceec62b5
--- /dev/null
+++ b/pkgs/applications/networking/protocol/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub }:
+
+buildPythonApplication rec {
+ pname = "protocol";
+ version = "20171226";
+
+ src = fetchFromGitHub {
+ owner = "luismartingarcia";
+ repo = "protocol";
+ rev = "d450da7d8a58595d8ef82f1d199a80411029fc7d";
+ sha256 = "1g31s2xx0bw8ak5ag1c6mv0p0b8bj5dp3lkk9mxaf2ndj1m1qdkw";
+ };
+
+ meta = with stdenv.lib; {
+ description = "An ASCII Header Generator for Network Protocols";
+ homepage = https://github.com/luismartingarcia/protocol;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ teto ];
+ };
+}
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index f6be80e4a1d4..d5982f33e78e 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -15,7 +15,7 @@
, cairo
, pango
, gnome3
-, xlibs
+, xorg
, libpng12
, freetype
, fontconfig
@@ -67,9 +67,31 @@ let
patch = "0";
x64hash = "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91";
x86hash = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6";
- homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # Fix when updating version
x64suffix = "10276927";
x86suffix = "10276925";
+ homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html;
+ };
+
+ "13.8.0" = {
+ major = "13";
+ minor = "8";
+ patch = "0";
+ x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931";
+ x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7";
+ x64suffix = "10299729";
+ x86suffix = "10299729";
+ homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-138.html;
+ };
+
+ "13.9.0" = {
+ major = "13";
+ minor = "9";
+ patch = "0";
+ x64hash = "00l18s7i9yky3ddabwljwsf7fx4cjgjn9hfd74j0x1v4gl078nl9";
+ x86hash = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag";
+ x64suffix = "102";
+ x86suffix = "102";
+ homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
};
};
@@ -121,11 +143,11 @@ let
cairo
pango
gnome3.dconf
- xlibs.libX11
- xlibs.libXext
- xlibs.libXrender
- xlibs.libXinerama
- xlibs.libXfixes
+ xorg.libX11
+ xorg.libXext
+ xorg.libXrender
+ xorg.libXinerama
+ xorg.libXfixes
libpng12
libidn
zlib
@@ -158,7 +180,7 @@ let
./${prefixWithBitness}/hinst
# Run the installer...
- ./${prefixWithBitness}/hinst CDROM "`pwd`"
+ bash ./${prefixWithBitness}/hinst CDROM "`pwd`"
echo "Deleting broken links..."
for link in `find $ICAInstDir -type l `
@@ -191,7 +213,7 @@ let
makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
--add-flags "-icaroot $ICAInstDir" \
--set ICAROOT "$ICAInstDir" \
- --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
+ --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set LD_LIBRARY_PATH "$libPath" \
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 31e1a860ac98..59ae225210ca 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -13,14 +13,14 @@
}:
stdenv.mkDerivation rec {
- name = "freerdp-git-${version}";
- version = "20170724";
+ name = "freerdp-${version}";
+ version = "2.0.0-rc1";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
- rev = "2.0.0-rc0";
- sha256 = "0ngwdy0lfv2k59z1z8yq1wj5zbhqigpyfqbgh38m9p35yzh33lv1";
+ rev = version;
+ sha256 = "0m28n3mq3ax0j6j3ai4pnlx3shg2ap0md0bxlqkhfv6civ9r11nn";
};
# outputs = [ "bin" "out" "dev" ];
@@ -46,17 +46,19 @@ stdenv.mkDerivation rec {
cmake pkgconfig
];
+ enableParallelBuilding = true;
+
doCheck = false;
cmakeFlags = with lib; [
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DWITH_CUNIT=OFF"
"-DWITH_OSS=OFF"
- ] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON"
- ++ optional (cups != null) "-DWITH_CUPS=ON"
- ++ optional (pcsclite != null) "-DWITH_PCSC=ON"
- ++ optional buildServer "-DWITH_SERVER=ON"
- ++ optional optimize "-DWITH_SSE2=ON";
+ ] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON"
+ ++ optional (cups != null) "-DWITH_CUPS=ON"
+ ++ optional (pcsclite != null) "-DWITH_PCSC=ON"
+ ++ optional buildServer "-DWITH_SERVER=ON"
+ ++ optional (optimize && stdenv.isx86_64) "-DWITH_SSE2=ON";
meta = with lib; {
description = "A Remote Desktop Protocol Client";
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index 4179cc3058e8..4caa9ae63f75 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, libX11} :
+{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig} :
stdenv.mkDerivation (rec {
pname = "rdesktop";
@@ -10,12 +10,12 @@ stdenv.mkDerivation (rec {
sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8";
};
- buildInputs = [openssl libX11];
+ nativeBuildInputs = [pkgconfig];
+ buildInputs = [openssl libX11 libgssglue];
configureFlags = [
"--with-ipv6"
"--with-openssl=${openssl.dev}"
- "--disable-credssp"
"--disable-smartcard"
];
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 5cbee68551e5..6d32036def55 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook
-, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11
+, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11
, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
-, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core
-, openssl, gsettings_desktop_schemas
+, libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core
+, openssl, gsettings-desktop-schemas
# The themes here are soft dependencies; only icons are missing without them.
-, hicolor_icon_theme, adwaita-icon-theme
+, hicolor-icon-theme, adwaita-icon-theme
}:
let
- version = "1.2.0-rcgit.17";
+ version = "1.2.0-rcgit.24";
desktopItem = makeDesktopItem {
name = "remmina";
@@ -29,17 +29,17 @@ in stdenv.mkDerivation {
owner = "FreeRDP";
repo = "Remmina";
rev = "v${version}";
- sha256 = "1vfg8sfpj83ircp7ny6xsbn2ba5xbp3xrdl5wwyfcg1zrpdmi7f1";
+ sha256 = "1x7kygl9a5nh7rf2gfrk0wwv23mbw7rrjms402l3zp1w53hrhwmg";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake wrapGAppsHook gsettings_desktop_schemas
- glib gtk3 gettext libxkbfile libgnome_keyring libX11
+ buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas
+ glib gtk3 gettext libxkbfile libgnome-keyring libX11
freerdp libssh libgcrypt gnutls
pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon
- libsecret spice_protocol spice_gtk epoxy at_spi2_core
- openssl hicolor_icon_theme adwaita-icon-theme ];
+ libsecret spice-protocol spice-gtk epoxy at-spi2-core
+ openssl hicolor-icon-theme adwaita-icon-theme ];
cmakeFlags = [
"-DWITH_VTE=OFF"
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index d15d0afa63cd..260500e9d337 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -4,25 +4,25 @@ let
ld32 =
if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
- else abort "Unsupported architecture";
+ else throw "Unsupported system ${stdenv.system}";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);
- deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]);
+ deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xorg; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]);
tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux);
tvldpath64 = lib.makeLibraryPath (deps pkgs);
in
stdenv.mkDerivation rec {
name = "teamviewer-${version}";
- version = "12.0.76279";
+ version = "12.0.90041";
src = fetchurl {
# There is a 64-bit package, but it has no differences apart from Debian dependencies.
# Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason.
- url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb";
- sha256 = "15yhx66zxbjk0x3dpfg39gb1f2ajcp9kbp4zi58bfnvby277jl00";
+ url = "https://dl.tvcdn.de/download/version_12x/teamviewer_${version}_i386.deb";
+ sha256 = "19gf68xadayncrbpkk3v05xm698zavv8mz8ia6jhadrh5s6i0bwg";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 3edf45d9acd9..904a6812c489 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -33,6 +33,5 @@ stdenv.mkDerivation rec {
homepage = http://x2go.org/;
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index b6b1f6542af3..ed1abfcba99d 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -3,13 +3,13 @@
let
xorgxrdp = stdenv.mkDerivation rec {
name = "xorgxrdp-${version}";
- version = "0.2.3";
+ version = "0.2.5";
src = fetchFromGitHub {
owner = "neutrinolabs";
repo = "xorgxrdp";
rev = "v${version}";
- sha256 = "0l1b38j3q9mxyb8ffpdplbqs6rnabj92i8wngrwlkhfh2c88szn1";
+ sha256 = "05ix0bvbgpg0l0f6pyxp64a4785yv16dxf522y7k84b0rag4bxr7";
};
nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
@@ -34,7 +34,7 @@ let
};
xrdp = stdenv.mkDerivation rec {
- version = "0.9.3";
+ version = "0.9.5";
name = "xrdp-${version}";
src = fetchFromGitHub {
@@ -42,7 +42,7 @@ let
repo = "xrdp";
rev = "refs/heads/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already
fetchSubmodules = true;
- sha256 = "0xqyg3m688fj442zgg9fqmbz7nnzvqpd7a9ki2cwh1hyibacpmz7";
+ sha256 = "1sm994dic72zvxgwxw9z6an6050976nlnnn2my42pnzj9l5842d8";
};
nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 7622cb76ad2a..5e94106a48f1 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -4,7 +4,7 @@ let
arch = {
"x86_64-linux" = "x64";
"i686-linux" = "i386";
- }.${stdenv.system};
+ }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
in stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 74f5ecb6b75f..0d7bdf970f5b 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, writeScript, pkgconfig, cmake, qtbase, qttools
+{ stdenv, fetchFromGitHub, writeScript, pkgconfig, cmake, qtbase, qttools
, seafile-shared, ccnet, makeWrapper
, withShibboleth ? true, qtwebengine }:
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "6.1.0";
+ version = "6.1.6";
name = "seafile-client-${version}";
- src = fetchurl {
- url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
- sha256 = "16rn6b9ayaccgwx8hs3yh1wb395pp8ffh8may8a8bpcc4gdry7bd";
+ src = fetchFromGitHub {
+ owner = "haiwen";
+ repo = "seafile-client";
+ rev = "v${version}";
+ sha256 = "0r02frlspjq8k0zz1z4wh2sx3jm6b1qby5mxg394sb3rjdxb8jhk";
};
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
@@ -30,6 +32,6 @@ stdenv.mkDerivation rec {
description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
license = licenses.asl20;
platforms = platforms.linux;
- maintainers = [ maintainers.calrama ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/networking/sniffers/wireshark/cmake.patch b/pkgs/applications/networking/sniffers/wireshark/cmake.patch
new file mode 100644
index 000000000000..890fffedce03
--- /dev/null
+++ b/pkgs/applications/networking/sniffers/wireshark/cmake.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,6 +19,7 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+
++cmake_minimum_required(VERSION 3.7)
+ project(Wireshark C CXX)
+
+ # Updated by make-version.pl
+@@ -40,7 +41,7 @@
+ # Needed for GREATER_EQUAL operator
+ cmake_minimum_required(VERSION 3.7)
+ else()
+- cmake_minimum_required(VERSION 2.8.8)
++ cmake_minimum_required(VERSION 3.7)
+ endif()
+
+ # Needs to be set after cmake_minimum_required or cmake_policy(VERSION)
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 2ed87c71a906..424c1926f35a 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
-, libssh, zlib, cmake, extra-cmake-modules, fetchpatch
-, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
+, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
+, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
, withQt ? false, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
}:
@@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;
let
- version = "2.4.2";
+ version = "2.4.5";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@@ -20,10 +20,15 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
- sha256 = "0zglapd3sz08p2z9x8a5va3jnz17b3n5a1bskf7f2dgx6m3v5b6i";
+ sha256 = "1mvgy67rvnwj2kbc43s4il81jvz5ai0bx2j3j2js7x50zclyrcmk";
};
- cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE";
+ cmakeFlags = [
+ "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}"
+ "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
+ "-DENABLE_QT5=${if withQt then "ON" else "OFF"}"
+ "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}"
+ ];
nativeBuildInputs = [
bison cmake extra-cmake-modules flex pkgconfig
@@ -31,15 +36,37 @@ in stdenv.mkDerivation {
buildInputs = [
gettext pcre perl libpcap lua5 libssh openssl libgcrypt
- libgpgerror gnutls geoip c-ares python glib zlib
+ libgpgerror gnutls geoip c-ares python glib zlib makeWrapper
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
- ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ]
+ ++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ]
++ optionals stdenv.isLinux [ libcap libnl ]
- ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
+ ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
+ ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
- patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
+ patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]
+ # https://code.wireshark.org/review/#/c/23728/
+ ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+ name = "fix-timeout.patch";
+ url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0";
+ sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv";
+ })
+ ++ stdenv.lib.optional stdenv.isDarwin ./cmake.patch;
- postInstall = optionalString (withQt || withGtk) ''
+ postInstall = if stdenv.isDarwin then ''
+ ${optionalString withQt ''
+ mkdir -p $out/Applications
+ mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
+
+ for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do
+ install_name_tool $so -change libwireshark.10.dylib $out/lib/libwireshark.10.dylib
+ install_name_tool $so -change libwiretap.7.dylib $out/lib/libwiretap.7.dylib
+ install_name_tool $so -change libwsutil.8.dylib $out/lib/libwsutil.8.dylib
+ done
+
+ wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \
+ --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
+ ''}
+ '' else optionalString (withQt || withGtk) ''
${optionalString withGtk ''
install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop
''}
@@ -66,7 +93,7 @@ in stdenv.mkDerivation {
experts. It runs on UNIX, macOS and Windows.
'';
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ bjornfor fpletz ];
};
}
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index d6fe0d9114c2..4f91a2b24e95 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -4,16 +4,16 @@
}:
let
- arch = if stdenv.system == "x86_64-linux" then "x86_64"
- else if stdenv.system == "i686-linux" then "i386"
+ arch = if stdenv.system == "x86_64-linux" then "x64"
+ else if stdenv.system == "i686-linux" then "x86"
else throw "Spideroak client for: ${stdenv.system} not supported!";
interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
else throw "Spideroak client for: ${stdenv.system} not supported!";
- sha256 = if stdenv.system == "x86_64-linux" then "0k87rn4aj0v79rz9jvwspnwzmh031ih0y74ra88nc8kl8j6b6gjm"
- else if stdenv.system == "i686-linux" then "1wbxfikj8f7rx26asswqrfp9vpk8w5941s21y1pnaff2gcac8m3z"
+ sha256 = if stdenv.system == "x86_64-linux" then "993e01986e3657d6fa979b8d0f45ac25b8223c18f75555016a9f92e651e91b1f"
+ else if stdenv.system == "i686-linux" then "d12c09c3a01bfa48bdecc8763bbf2c7f10b71cea5bcecc177dad031ba79bc83d"
else throw "Spideroak client for: ${stdenv.system} not supported!";
ldpath = stdenv.lib.makeLibraryPath [
@@ -21,14 +21,14 @@ let
libX11 libXext libXrender zlib
];
- version = "6.1.9";
+ version = "7.0.1";
in stdenv.mkDerivation {
name = "spideroak-${version}";
src = fetchurl {
- name = "spideroak-${version}-${arch}";
- url = "https://spideroak.com/getbuild?platform=slackware&arch=${arch}&version=${version}";
+ name = "SpiderOakONE-${version}-slack_tar_${arch}.tgz";
+ url = "https://spideroak.com/release/spideroak/slack_tar_${arch}";
inherit sha256;
};
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index a7cf26ea7aea..e4bdec668a02 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "lsyncd-${version}";
- version = "2.1.6";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "axkibe";
repo = "lsyncd";
rev = "release-${version}";
- sha256 = "1cab96h4qfyapk7lb682j1d8k0hpv7h9pl41vdgc0vr4bq4c3ij2";
+ sha256 = "1q2ixp52r96ckghgmxdbms6xrq8dbziimp8gmgzqfq4lk1v1w80y";
};
patchPhase = ''
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index ad51703bd6fe..aa2a971b15f6 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "rclone-${version}";
- version = "1.38";
+ version = "1.40";
goPackagePath = "github.com/ncw/rclone";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "ncw";
repo = "rclone";
rev = "v${version}";
- sha256 = "0f56qm4lz55anzqf6dmjfywmvqy10zi5cl69zz8lda8lmvrpjm1d";
+ sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9";
};
outputs = [ "bin" "out" "man" ];
diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
index a95835610d52..abc1f27e4f60 100644
--- a/pkgs/applications/networking/sync/rsync/base.nix
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
rec {
- version = "3.1.2";
+ version = "3.1.3";
src = fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
- sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
+ sha256 = "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m";
};
- patches = fetchurl {
+ upstreamPatchTarball = fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
- sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd";
+ sha256 = "167vk463bb3xl9c4gsbxms111dk1ip7pq8y361xc0xfa427q9hhd";
};
meta = with stdenv.lib; {
- homepage = http://rsync.samba.org/;
+ description = "Fast incremental file transfer utility";
+ homepage = https://rsync.samba.org/;
license = licenses.gpl3Plus;
platforms = platforms.unix;
};
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 1f5e9601ff22..f1e3f6b7301c 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, libiconv, zlib, popt
+{ stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt
, enableACLs ? true, acl ? null
, enableCopyDevicesPatch ? false
}:
@@ -6,14 +6,14 @@
assert enableACLs -> acl != null;
let
- base = import ./base.nix { inherit stdenv fetchurl; };
+ base = import ./base.nix { inherit stdenv fetchurl fetchpatch; };
in
stdenv.mkDerivation rec {
name = "rsync-${base.version}";
mainSrc = base.src;
- patchesSrc = base.patches;
+ patchesSrc = base.upstreamPatchTarball;
srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 7563b0ea1950..bc2a6eb9c3cb 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, perl, rsync }:
+{ stdenv, fetchurl, fetchpatch, perl, rsync }:
let
- base = import ./base.nix { inherit stdenv fetchurl; };
+ base = import ./base.nix { inherit stdenv fetchurl fetchpatch; };
in
stdenv.mkDerivation rec {
name = "rrsync-${base.version}";
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
new file mode 100644
index 000000000000..e41671f23604
--- /dev/null
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, python2Packages }:
+
+python2Packages.buildPythonApplication rec {
+ name = "syncplay-${version}";
+ version = "1.5.2";
+
+ format = "other";
+
+ src = fetchurl {
+ url = https://github.com/Syncplay/syncplay/archive/v1.5.2.tar.gz;
+ sha256 = "0a7lqq3y53ag5hzkkjpz61gfmglf3w1kpvyynhq2514fn9rnwsla";
+ };
+
+ propagatedBuildInputs = with python2Packages; [ pyside twisted ];
+
+ makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+
+ postInstall = ''
+ mkdir -p $out/lib/python2.7/site-packages
+ mv $out/lib/syncplay/syncplay $out/lib/python2.7/site-packages/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://syncplay.pl/;
+ description = "Free software that synchronises media players";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ enzime ];
+ };
+}
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
new file mode 100644
index 000000000000..ae715aa4321c
--- /dev/null
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }:
+
+buildPythonApplication rec {
+ version = "0.9.2.7";
+ name = "syncthing-gtk-${version}";
+
+ src = fetchFromGitHub {
+ owner = "syncthing";
+ repo = "syncthing-gtk";
+ rev = "v${version}";
+ sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2";
+ };
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ # For setup hook populating GI_TYPELIB_PATH
+ gobjectIntrospection
+ ];
+
+ buildInputs = [
+ gtk3 librsvg
+ libnotify
+ # Schemas with proxy configuration
+ gnome3.gsettings-desktop-schemas
+ ];
+
+ propagatedBuildInputs = [
+ dateutil pyinotify pygobject3 bcrypt
+ ];
+
+ patches = [
+ ./disable-syncthing-binary-configuration.patch
+ (substituteAll {
+ src = ./paths.patch;
+ killall = "${psmisc}/bin/killall";
+ syncthing = "${syncthing}/bin/syncthing";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"
+ substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share"
+ substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share"
+ substituteInPlace syncthing_gtk/uisettingsdialog.py --replace "/usr/share" "$out/share"
+ substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share"
+ substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "GTK3 & python based GUI for Syncthing";
+ maintainers = with maintainers; [ ];
+ platforms = syncthing.meta.platforms;
+ homepage = https://github.com/syncthing/syncthing-gtk;
+ license = licenses.gpl2;
+ };
+}
diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
new file mode 100644
index 000000000000..6c516e98acb1
--- /dev/null
+++ b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
@@ -0,0 +1,77 @@
+--- a/find-daemon.glade
++++ b/find-daemon.glade
+@@ -112,6 +112,7 @@
+
+@@ -126,6 +127,7 @@
+ _Browse...
+ True
+ True
++ False
+ True
+ True
+ 0.51999998092651367
+--- a/syncthing_gtk/configuration.py
++++ b/syncthing_gtk/configuration.py
+@@ -168,6 +168,8 @@
+ yield k
+
+ def get(self, key):
++ if key == "syncthing_binary":
++ return self.REQUIRED_KEYS[key][1]
+ return self.values[key]
+
+ def set(self, key, value):
+--- a/syncthing_gtk/finddaemondialog.py
++++ b/syncthing_gtk/finddaemondialog.py
+@@ -163,7 +163,7 @@
+ self["lblDownloadProgress"].set_markup(_("Download failed."))
+ self["btDownload"].set_visible(True)
+ self["pbDownload"].set_visible(False)
+- self["vsyncthing_binary"].set_sensitive(True)
++ self["vsyncthing_binary"].set_sensitive(False)
+ self["btBrowse"].set_sensitive(True)
+ self["btSave"].set_sensitive(True)
+
+@@ -179,7 +179,7 @@
+
+ def cb_extract_finished(self, downloader, *a):
+ """ Called after extraction is finished """
+- self["vsyncthing_binary"].set_sensitive(True)
++ self["vsyncthing_binary"].set_sensitive(False)
+ self["btBrowse"].set_sensitive(True)
+ self["vsyncthing_binary"].set_text(downloader.get_target())
+ self["lblDownloadProgress"].set_markup("" + _("Download finished.") + "")
+--- a/syncthing_gtk/wizard.py
++++ b/syncthing_gtk/wizard.py
+@@ -60,7 +60,6 @@
+ self.quit_button.connect("clicked", lambda *a : self.emit("cancel"))
+ # Pages
+ self.add_page(IntroPage(self))
+- self.add_page(FindDaemonPage())
+ self.add_page(GenerateKeysPage())
+ self.add_page(HttpSettingsPage())
+ self.add_page(SaveSettingsPage())
+--- a/ui-settings.glade
++++ b/ui-settings.glade
+@@ -943,6 +943,7 @@
+ _Browse...
+ True
+ True
++ False
+ True
+ True
+ 0.51999998092651367
+@@ -974,6 +975,7 @@
+
diff --git a/pkgs/applications/networking/syncthing-gtk/paths.patch b/pkgs/applications/networking/syncthing-gtk/paths.patch
new file mode 100644
index 000000000000..0ba5a4f2db84
--- /dev/null
+++ b/pkgs/applications/networking/syncthing-gtk/paths.patch
@@ -0,0 +1,22 @@
+--- a/syncthing_gtk/configuration.py
++++ b/syncthing_gtk/configuration.py
+@@ -30,7 +30,7 @@
+ "autokill_daemon" : (int, 2), # 0 - never kill, 1 - always kill, 2 - ask
+ "daemon_priority" : (int, 0), # uses nice values
+ "max_cpus" : (int, 0), # 0 for all cpus
+- "syncthing_binary" : (str, "/usr/bin/syncthing"),
++ "syncthing_binary" : (str, "@syncthing@"),
+ "syncthing_arguments" : (str, ""),
+ "minimize_on_start" : (bool, False),
+ "folder_as_path" : (bool, True),
+--- a/syncthing_gtk/tools.py
++++ b/syncthing_gtk/tools.py
+@@ -303,7 +303,7 @@
+ return False
+ # signal 0 doesn't kill anything, but killall exits with 1 if
+ # named process is not found
+- p = Popen(["killall", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"])
++ p = Popen(["@killall@", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"])
+ p.communicate()
+ return p.returncode == 0
+ else:
diff --git a/pkgs/applications/networking/syncthing/add-stcli-target.patch b/pkgs/applications/networking/syncthing/add-stcli-target.patch
new file mode 100644
index 000000000000..58ac15253aed
--- /dev/null
+++ b/pkgs/applications/networking/syncthing/add-stcli-target.patch
@@ -0,0 +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{
+ {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
++ },
+ }
+
+ func init() {
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index ecdecd07eeb9..d79396f3b1d7 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,57 +1,103 @@
-{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
+{ stdenv, lib, go, procps, removeReferencesTo, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- version = "0.14.40";
- name = "syncthing-${version}";
+let
+ common = { stname, target, patches ? [], postInstall ? "" }:
+ stdenv.mkDerivation rec {
+ version = "0.14.45";
+ name = "${stname}-${version}";
- src = fetchFromGitHub {
- owner = "syncthing";
- repo = "syncthing";
- rev = "v${version}";
- sha256 = "0fd4k09sb91d1bjqj2v1fh7raq98fdw45aaa58kramwhidsf9sy5";
+ src = fetchFromGitHub {
+ owner = "syncthing";
+ repo = "syncthing";
+ rev = "v${version}";
+ sha256 = "0hhldmvsbvkaj0x6af7c41zq5mbzcymv5xxmwvb4h5zbz49z9vzl";
+ };
+
+ inherit patches;
+
+ buildInputs = [ go ];
+ nativeBuildInputs = [ removeReferencesTo ];
+
+ buildPhase = ''
+ # Syncthing expects that it is checked out in $GOPATH, if that variable is
+ # set. Since this isn't true when we're fetching source, we can explicitly
+ # unset it and force Syncthing to set up a temporary one for us.
+ env GOPATH= BUILD_USER=nix BUILD_HOST=nix go run build.go -no-upgrade -version v${version} build ${target}
+ '';
+
+ installPhase = ''
+ install -Dm755 ${target} $out/bin/${target}
+ runHook postInstall
+ '';
+
+ inherit postInstall;
+
+ preFixup = ''
+ find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
+ '';
+
+ meta = with lib; {
+ homepage = https://www.syncthing.net/;
+ description = "Open Source Continuous File Synchronization";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ pshendry joko peterhoeg andrew-d ];
+ platforms = platforms.unix;
+ };
+ };
+
+in {
+ syncthing = common {
+ stname = "syncthing";
+ target = "syncthing";
+
+ postInstall = ''
+ # This installs man pages in the correct directory according to the suffix
+ # on the filename
+ for mf in man/*.[1-9]; do
+ mantype="$(echo "$mf" | awk -F"." '{print $NF}')"
+ mandir="$out/share/man/man$mantype"
+ install -Dm644 "$mf" "$mandir/$(basename "$mf")"
+ done
+
+ '' + lib.optionalString (stdenv.isLinux) ''
+ mkdir -p $out/lib/systemd/{system,user}
+
+ substitute etc/linux-systemd/system/syncthing-resume.service \
+ $out/lib/systemd/system/syncthing-resume.service \
+ --replace /usr/bin/pkill ${procps}/bin/pkill
+
+ substitute etc/linux-systemd/system/syncthing@.service \
+ $out/lib/systemd/system/syncthing@.service \
+ --replace /usr/bin/syncthing $out/bin/syncthing
+
+ substitute etc/linux-systemd/user/syncthing.service \
+ $out/lib/systemd/user/syncthing.service \
+ --replace /usr/bin/syncthing $out/bin/syncthing
+ '';
};
- buildInputs = [ go removeReferencesTo ];
+ syncthing-cli = common {
+ stname = "syncthing-cli";
- buildPhase = ''
- mkdir -p src/github.com/syncthing
- ln -s $(pwd) src/github.com/syncthing/syncthing
- export GOPATH=$(pwd)
+ patches = [ ./add-stcli-target.patch ];
+ target = "stcli";
+ };
- # Syncthing's build.go script expects this working directory
- cd src/github.com/syncthing/syncthing
+ syncthing-discovery = common {
+ stname = "syncthing-discovery";
+ target = "stdiscosrv";
+ };
- go run build.go -no-upgrade -version v${version} build
- '';
+ syncthing-relay = common {
+ stname = "syncthing-relay";
+ target = "strelaysrv";
- installPhase = ''
- mkdir -p $out/lib/systemd/{system,user}
+ postInstall = lib.optionalString (stdenv.isLinux) ''
+ mkdir -p $out/lib/systemd/system
- install -Dm755 syncthing $out/bin/syncthing
-
- '' + lib.optionalString (stdenv.isLinux) ''
- substitute etc/linux-systemd/system/syncthing-resume.service \
- $out/lib/systemd/system/syncthing-resume.service \
- --replace /usr/bin/pkill ${procps}/bin/pkill
-
- substitute etc/linux-systemd/system/syncthing@.service \
- $out/lib/systemd/system/syncthing@.service \
- --replace /usr/bin/syncthing $out/bin/syncthing
-
- substitute etc/linux-systemd/user/syncthing.service \
- $out/lib/systemd/user/syncthing.service \
- --replace /usr/bin/syncthing $out/bin/syncthing
- '';
-
- preFixup = ''
- find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
- '';
-
- meta = with stdenv.lib; {
- homepage = https://www.syncthing.net/;
- description = "Open Source Continuous File Synchronization";
- license = licenses.mpl20;
- maintainers = with maintainers; [ pshendry joko peterhoeg ];
- platforms = platforms.unix;
+ substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+ $out/lib/systemd/system/strelaysrv.service \
+ --replace /usr/bin/strelaysrv $out/bin/strelaysrv
+ '';
};
}
diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix
deleted file mode 100644
index e5e554db67b8..000000000000
--- a/pkgs/applications/networking/syncthing/inotify-deps.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
-[
- {
- goPackagePath = "github.com/syncthing/syncthing";
- fetch = {
- type = "git";
- url = "https://github.com/syncthing/syncthing";
- rev = "d0061c172caecd3baf61f3ff720f56fdb805186e";
- sha256 = "08cn0ym4arjppbnfn2b37crarwmiqbj4yjr7kinhdxx9gqm5wkj1";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a";
- sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj";
- };
- }
-]
diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix
deleted file mode 100644
index e33501a17158..000000000000
--- a/pkgs/applications/networking/syncthing/inotify.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
- name = "syncthing-inotify-${version}";
- version = "0.8.6";
-
- goPackagePath = "github.com/syncthing/syncthing-inotify";
-
- src = fetchFromGitHub {
- owner = "syncthing";
- repo = "syncthing-inotify";
- rev = "v${version}";
- sha256 = "0z1zpb7av4q5nj2d4yda9jcbjdz4yj3823c29y73yf0gfp26lppl";
- };
-
- goDeps = ./inotify-deps.nix;
-
- postInstall = ''
- mkdir -p $bin/lib/systemd/{system,user}
-
- substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \
- $bin/lib/systemd/system/syncthing-inotify@.service \
- --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
-
- substitute $src/etc/linux-systemd/user/syncthing-inotify.service \
- $bin/lib/systemd/user/syncthing-inotify.service \
- --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
- '';
-
- meta = with stdenv.lib; {
- homepage = https://github.com/syncthing/syncthing-inotify;
- description = "File watcher intended for use with Syncthing";
- license = licenses.mpl20;
- maintainers = with maintainers; [ joko peterhoeg ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix
deleted file mode 100644
index 4b5359555f4a..000000000000
--- a/pkgs/applications/networking/syncthing012/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
- name = "syncthing-${version}";
- version = "0.12.15";
- rev = "v${version}";
-
- goPackagePath = "github.com/syncthing/syncthing";
-
- src = fetchFromGitHub {
- inherit rev;
- owner = "syncthing";
- repo = "syncthing";
- sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1";
- };
-
- goDeps = ./deps.nix;
-
- postPatch = ''
- # Mostly a cosmetic change
- sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go
- '';
-
- preBuild = ''
- export buildFlagsArray+=("-tags" "noupgrade release")
- '';
-}
diff --git a/pkgs/applications/networking/syncthing012/deps.nix b/pkgs/applications/networking/syncthing012/deps.nix
deleted file mode 100644
index 44e18c2f606d..000000000000
--- a/pkgs/applications/networking/syncthing012/deps.nix
+++ /dev/null
@@ -1,128 +0,0 @@
-[
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
- sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
- sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
- };
- }
- {
- goPackagePath = "github.com/rcrowley/go-metrics";
- fetch = {
- type = "git";
- url = "https://github.com/rcrowley/go-metrics";
- rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3";
- sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa";
- };
- }
- {
- goPackagePath = "github.com/kardianos/osext";
- fetch = {
- type = "git";
- url = "https://github.com/kardianos/osext";
- rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
- sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
- };
- }
- {
- goPackagePath = "github.com/bkaradzic/go-lz4";
- fetch = {
- type = "git";
- url = "https://github.com/bkaradzic/go-lz4";
- rev = "74ddf82598bc4745b965729e9c6a463bedd33049";
- sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1";
- };
- }
- {
- goPackagePath = "github.com/calmh/luhn";
- fetch = {
- type = "git";
- url = "https://github.com/calmh/luhn";
- rev = "0c8388ff95fa92d4094011e5a04fc99dea3d1632";
- sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e";
- sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14";
- };
- }
- {
- goPackagePath = "github.com/vitrun/qart";
- fetch = {
- type = "git";
- url = "https://github.com/vitrun/qart";
- rev = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0";
- sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8";
- };
- }
- {
- goPackagePath = "github.com/calmh/du";
- fetch = {
- type = "git";
- url = "https://github.com/calmh/du";
- rev = "3c0690cca16228b97741327b1b6781397afbdb24";
- sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa";
- };
- }
- {
- goPackagePath = "github.com/calmh/xdr";
- fetch = {
- type = "git";
- url = "https://github.com/calmh/xdr";
- rev = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e";
- sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra";
- };
- }
- {
- goPackagePath = "github.com/juju/ratelimit";
- fetch = {
- type = "git";
- url = "https://github.com/juju/ratelimit";
- rev = "772f5c38e468398c4511514f4f6aa9a4185bc0a0";
- sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p";
- };
- }
- {
- goPackagePath = "github.com/thejerf/suture";
- fetch = {
- type = "git";
- url = "https://github.com/thejerf/suture";
- rev = "99c1f2d613756768fc4299acd9dc621e11ed3fd7";
- sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4";
- };
- }
- {
- goPackagePath = "github.com/golang/snappy";
- fetch = {
- type = "git";
- url = "https://github.com/golang/snappy";
- rev = "723cc1e459b8eea2dea4583200fd60757d40097a";
- sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h";
- };
- }
- {
- goPackagePath = "github.com/syndtr/goleveldb";
- fetch = {
- type = "git";
- url = "https://github.com/syndtr/goleveldb";
- rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0";
- sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb";
- };
- }
-]
diff --git a/pkgs/applications/networking/syncthing013/default.nix b/pkgs/applications/networking/syncthing013/default.nix
deleted file mode 100644
index b6d318011aa1..000000000000
--- a/pkgs/applications/networking/syncthing013/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchgit, go }:
-
-stdenv.mkDerivation rec {
- version = "0.13.10";
- name = "syncthing-${version}";
-
- src = fetchgit {
- url = https://github.com/syncthing/syncthing;
- rev = "refs/tags/v${version}";
- sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7";
- };
-
- buildInputs = [ go ];
-
- buildPhase = ''
- mkdir -p src/github.com/syncthing
- ln -s $(pwd) src/github.com/syncthing/syncthing
- export GOPATH=$(pwd)
-
- # Syncthing's build.go script expects this working directory
- cd src/github.com/syncthing/syncthing
-
- go run build.go -no-upgrade -version v${version} install all
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp bin/* $out/bin
- '';
-
- meta = {
- homepage = https://www.syncthing.net/;
- description = "Open Source Continuous File Synchronization";
- license = stdenv.lib.licenses.mpl20;
- maintainers = with stdenv.lib.maintainers; [pshendry];
- platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd;
- };
-}
diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix
index 79bc32dfa40d..8a056e21692b 100644
--- a/pkgs/applications/networking/tcpkali/default.nix
+++ b/pkgs/applications/networking/tcpkali/default.nix
@@ -1,6 +1,6 @@
{stdenv, autoreconfHook, fetchFromGitHub, bison}:
-let version = "0.9"; in
+let version = "1.1.1"; in
stdenv.mkDerivation rec {
name = "tcpkali-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "machinezone";
repo = "tcpkali";
rev = "v${version}";
- sha256 = "03cbmnc60wkd7f4bapn5cbm3c4zas2l0znsbpci2mn8ms8agif82";
+ sha256 = "09ky3cccaphcqc6nhfs00pps99lasmzc2pf5vk0gi8hlqbbhilxf";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ bison];
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index dc7c961856d6..8ac2f7b0a3b6 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -1,14 +1,18 @@
{ stdenv, fetchFromGitHub, pkgs }:
-stdenv.mkDerivation rec {
- version = "2.9.5-1";
+let
+ version = "2.9.5-2";
+ pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
+ opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
+
+in stdenv.mkDerivation rec {
name = "testssl.sh-${version}";
src = fetchFromGitHub {
owner = "drwetter";
repo = "testssl.sh";
rev = "v${version}";
- sha256 = "0hz6g685jwl0c0jrdca746425xpwiwc8lnlc2gigga5hkcq8qzl9";
+ sha256 = "0nrzb2lhjq0s4dabyq8nldjijsld9gq4cxm8ys1cw5jyz1875g2w";
};
nativeBuildInputs = with pkgs; [
@@ -17,8 +21,6 @@ stdenv.mkDerivation rec {
patches = [ ./testssl.patch ];
- pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
- opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
postPatch = ''
sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \
-e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index c3424e2fc779..e38ba36b9253 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "vnstat-${version}";
- version = "1.17";
+ version = "1.18";
src = fetchurl {
- sha256 = "0wbrmb4zapblb3b61180ryqy6i0c7gcacqz0y3r1x7nafqswbr0q";
+ sha256 = "1mc7qqvrnl0zyhgh8n7wx1g1cbwq74xpvbz8rfjmyi77p693a6fp";
url = "http://humdi.net/vnstat/${name}.tar.gz";
};
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
'';
homepage = http://humdi.net/vnstat/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ nckx ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 2923a30b2ef0..4b68285c3f1a 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -15,6 +15,26 @@ let
in rec {
+ backlog = zncDerivation rec {
+ name = "znc-backlog-${version}";
+ version = "git-2017-06-13";
+ module_name = "backlog";
+
+ src = fetchFromGitHub {
+ owner = "FruitieX";
+ repo = "znc-backlog";
+ rev = "42e8f439808882d2dae60f2a161eabead14e4b0d";
+ sha256 = "1k7ifpqqzzf2j7w795q4mx1nvmics2higzjqr3mid3lp43sqg5s6";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Request backlog for IRC channels.";
+ homepage = https://github.com/fruitiex/znc-backlog/;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ infinisil ];
+ };
+ };
+
clientbuffer = zncDerivation rec {
name = "znc-clientbuffer-${version}";
version = "git-2015-08-27";
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 1563cdf3d056..ea503b8df9bd 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
patches = [
- ./patches/fix-13791.patch
+ # https://bugzilla.abisource.com/show_bug.cgi?id=13791
+ (fetchurl {
+ url = https://bugzilla.abisource.com/attachment.cgi?id=5860;
+ sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al";
+ })
];
buildInputs =
diff --git a/pkgs/applications/office/abiword/patches/fix-13791.patch b/pkgs/applications/office/abiword/patches/fix-13791.patch
deleted file mode 100644
index 98004f01bcba..000000000000
--- a/pkgs/applications/office/abiword/patches/fix-13791.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 46388f407c893123d9b3824a7570b050fc3b049b Mon Sep 17 00:00:00 2001
-From: James Cameron
-Date: Thu, 17 Aug 2017 15:05:39 +1000
-Subject: [PATCH] Fix flickering
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- in GR_Caret::s_blink_timeout, avoid repeated calls by stopping the
- timer, it will be restarted when needed,
-
-- in GR_Caret::s_enable, avoid extra unnecessary _blink calls when blink
- is enabled, as they serve no purpose,
-
-- in XAP_UnixFrameImpl::_fe::expose, use the Cairo clip rectangle
- instead of the expose event area, thanks to Hubert Figuière in
- 865c1dda7e13deff04573ffc42028b71fee07f9c,
-
-- in XAP_UnixFrameImpl::_fe::expose, do not return FALSE, as other
- handlers will need to handle the draw event,
-
-- in GR_UnixCairoGraphics::flush, fix excessive draw events;
- gtk_widget_queue_draw only marks the widget as needing redrawing,
- which causes a draw event for each call to flush, therefore every
- caret blink, so use gdk_flush instead,
-
-Fixes AbiSource #13791.
-Fixes Debian #851052.
-Fixes Fedora #1287835.
-Fixes Ubuntu LP: #1574278.
-Fixes Sugar Labs #4915.
-
-Signed-off-by: James Cameron
----
- src/af/gr/gtk/gr_UnixCairoGraphics.cpp | 4 +---
- src/af/gr/xp/gr_Caret.cpp | 13 ++++---------
- src/af/xap/gtk/xap_UnixFrameImpl.cpp | 27 ++++++++++++++++++---------
- src/af/xap/gtk/xap_UnixFrameImpl.h | 2 +-
- 4 files changed, 24 insertions(+), 22 deletions(-)
-
-diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-index 509bd37..7c3c06f 100644
---- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-+++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint()
-
- void GR_UnixCairoGraphics::flush(void)
- {
-- if (m_Widget) {
-- gtk_widget_queue_draw(m_Widget);
-- }
-+ gdk_flush();
- }
-
- bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const
-diff --git a/src/af/gr/xp/gr_Caret.cpp b/src/af/gr/xp/gr_Caret.cpp
-index 5d5d116..a8aa451 100644
---- a/src/af/gr/xp/gr_Caret.cpp
-+++ b/src/af/gr/xp/gr_Caret.cpp
-@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w)
- {
- GR_Caret * c = static_cast(_w->getInstanceData());
-
-+ c->m_enabler->stop();
- c->m_worker->stop();
-- c->_blink(true);
-- if (!c->m_bCursorIsOn)
-- c->_blink(true); // blink again
-- else
-- {
-- c->_blink(true); // ?? - MARCM
-- c->_blink(true);
-- }
- c->m_worker->start();
-- c->m_enabler->stop();
-+ c->_blink(true);
- }
-
- void GR_Caret::s_blink_timeout(UT_Worker * _w)
- {
- GR_Caret * c = static_cast(_w->getInstanceData());
-+
-+ c->m_blinkTimeout->stop();
- if (c->isEnabled())
- c->disable();
- }
-diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-index 780000e..e81961a 100644
---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
- }
-
- #if GTK_CHECK_VERSION(3,0,0)
--gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
-+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
- #else
- gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- #endif
- {
- XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data"));
- FV_View * pView = static_cast(pUnixFrameImpl->getFrame()->getCurrentView());
-+ double x, y, width, height;
- #if GTK_CHECK_VERSION(3,0,0)
-- GdkEventExpose *pExposeEvent = reinterpret_cast(gtk_get_current_event());
-+ cairo_clip_extents (cr, &x, &y, &width, &height);
-+ width -= x;
-+ height -= y;
-+#else
-+ x = pExposeEvent->area.x;
-+ y = pExposeEvent->area.y;
-+ width = pExposeEvent->area.width;
-+ height = pExposeEvent->area.height;
- #endif
- /* Jean: commenting out next lines since the zoom update code does draw only
- * part of what needs to be updated. */
-@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- UT_Rect rClip;
- if (pGr->getPaintCount () > 0)
- return TRUE;
-- xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height));
-- rClip.left = pGr->tlu(pExposeEvent->area.x);
-- rClip.top = pGr->tlu(pExposeEvent->area.y);
-- rClip.width = pGr->tlu(pExposeEvent->area.width)+1;
-- rClip.height = pGr->tlu(pExposeEvent->area.height)+1;
--#if GTK_CHECK_VERSION(3,0,0)
-+ rClip.left = pGr->tlu(x);
-+ rClip.top = pGr->tlu(y);
-+ #if GTK_CHECK_VERSION(3,0,0)
-+ rClip.width = pGr->tlu(width);
-+ rClip.height = pGr->tlu(height);
- static_cast(pGr)->setCairo(cr);
- pView->draw(&rClip);
- static_cast(pGr)->setCairo(NULL);
- #else
-+ rClip.width = pGr->tlu(width)+1;
-+ rClip.height = pGr->tlu(height)+1;
- pView->draw(&rClip);
- #endif
- }
-- return FALSE;
-+ return TRUE;
- }
-
- static bool bScrollWait = false;
-diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
-index 30ee5d8..26fbb2e 100644
---- a/src/af/xap/gtk/xap_UnixFrameImpl.h
-+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
-@@ -152,7 +152,7 @@ protected:
- static gint key_release_event(GtkWidget* w, GdkEventKey* e);
- static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
- #if GTK_CHECK_VERSION(3,0,0)
-- static gint draw(GtkWidget * w, cairo_t * cr);
-+ static gboolean draw(GtkWidget * w, cairo_t * cr);
- #else
- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
- #endif
---
-2.11.0
-
diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index 9cee31b01eb7..9eec315217cb 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, python3Packages }:
stdenv.mkDerivation rec {
- name = "bean-add-2017-10-31";
+ name = "bean-add-2018-01-08";
src = fetchFromGitHub {
owner = "simon-v";
repo = "bean-add";
- rev = "9ac64272a17e76f8292bd94deb5aee45c14130d2";
- sha256 = "1vcwbbi2jsf87yq8f2hyf7nz9br1973sb20qjnsx5fxlmcpn47jh";
+ rev = "660c657f295b019d8dbc26375924eb17bf654341";
+ sha256 = "0vzff2hdng8ybwd5frflhxpak0yqg0985p1dy7vpvhr8kbqqzwdz";
};
propagatedBuildInputs = with python3Packages; [ python ];
diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix
deleted file mode 100644
index 959a44a35c10..000000000000
--- a/pkgs/applications/office/calligra/2.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
-, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
-, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
-, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
-, kactivities, okular, git, oxygen-icons5, makeWrapper
-# TODO: not found
-#, xbase, openjpeg
-# TODO: package libWPS, Spnav, m2mml, LibEtonyek
-}:
-
-stdenv.mkDerivation rec {
- name = "calligra-2.9.11";
-
- src = fetchurl {
- url = "mirror://kde/stable/${name}/${name}.tar.xz";
- sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di";
- };
-
- nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
-
- buildInputs = [
- kdelibs4 lcms2 libpng eigen
- exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
- libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
- freetds fftw glew libkdcraw opencolorio kdepimlibs
- kactivities okular git
- ];
-
- enableParallelBuilding = true;
-
- postInstall = ''
- for i in $out/bin/*; do
- wrapProgram $i \
- --prefix PATH ':' "${pstoedit.out}/bin" \
- --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
- done
- '';
-
- meta = with stdenv.lib; {
- description = "A suite of productivity applications";
- longDescription = ''
- Calligra Suite is a set of applications written to help
- you to accomplish your work. Calligra includes efficient
- and capable office components: Words for text processing,
- Sheets for computations, Stage for presentations, Plan for
- planning, Flow for flowcharts, Kexi for database creation,
- Krita for painting and raster drawing, and Karbon for
- vector graphics.
- '';
- homepage = http://calligra.org;
- maintainers = with maintainers; [ phreedom ebzzry ];
- inherit (kdelibs4.meta) platforms;
- license = licenses.gpl2;
- broken = true;
- };
-}
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index bec19d675cb0..8449cdf05def 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,6 +1,6 @@
{
- mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
- boost, qtwebkit, qtx11extras, shared_mime_info,
+ mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper,
+ boost, qtwebkit, qtx11extras, shared-mime-info,
breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross,
@@ -23,10 +23,20 @@ mkDerivation rec {
sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5";
};
+ enableParallelBuilding = true;
+
+ patches = [
+ (fetchpatch {
+ name = "calligra-build-with-newer-kcalcore.patch";
+ url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff";
+ sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0";
+ })
+ ];
+
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
buildInputs = [
- boost qtwebkit qtx11extras shared_mime_info
+ boost qtwebkit qtx11extras shared-mime-info
kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews
kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts
diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index 3421abc557fc..c768f4c7fa34 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -1,6 +1,7 @@
-{ fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile
-, intltool, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
-, webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file
+{ fetchurl, fetchpatch, stdenv, intltool, pkgconfig, file, makeWrapper
+, libxml2, libxslt, perl, perlPackages, gconf, guile
+, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
+, webkit, glibcLocales, gsettings-desktop-schemas, dconf
, gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
, pango, gdk_pixbuf
}:
@@ -13,21 +14,31 @@ Two cave-ats right now:
*/
stdenv.mkDerivation rec {
- name = "gnucash-2.6.12";
+ name = "gnucash-2.6.18-1";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
- sha256 = "0x84f07p30pwhriamv8ifljgw755cj87rc12jy1xddf47spyj7rp";
+ sha256 = "1794qi7lkn1kbnhzk08wawacfcphbln3ngdl3q0qax5drv7hnwv8";
};
+ patches = [
+ (fetchpatch {
+ sha256 = "11nlf9j7jm1i37mfcmmnkplxr3nlf257fxd01095vd65i2rn1m8h";
+ name = "fix-brittle-test.patch";
+ url = "https://github.com/Gnucash/gnucash/commit/42ac55e03a1a84739f4a5b7a247c31d91c0adc4a.patch";
+ })
+ ];
+
+ nativeBuildInputs = [ intltool pkgconfig file makeWrapper ];
+
buildInputs = [
# general
- intltool pkgconfig libxml2 libxslt glibcLocales file gettext swig enchant
+ libxml2 libxslt glibcLocales gettext swig enchant
bzip2 isocodes
# glib, gtk...
glib gtk2 goffice webkit
# gnome...
- dconf gconf libgnomecanvas gsettings_desktop_schemas
+ dconf gconf libgnomecanvas gsettings-desktop-schemas
# financial
libofx aqbanking gwenhywfar
# perl
@@ -36,12 +47,10 @@ stdenv.mkDerivation rec {
guile slibGuile
# database backends
libdbi libdbiDrivers
- # build
- makeWrapper
];
- patchPhase = ''
- patchShebangs ./src
+ postPatch = ''
+ patchShebangs ./src
'';
configureFlags = [
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index f6c4728eb531..d17cd2a7ab75 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
];
+ propagatedUserEnvPkgs = [ gconf ];
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking";
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index c6458e477186..60c8b0280a14 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -9,11 +9,11 @@ let
isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; };
isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; };
in stdenv.mkDerivation rec {
- name = "gnumeric-1.12.35";
+ name = "gnumeric-1.12.38";
src = fetchurl {
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
- sha256 = "77b1e3ce523578a807767ad71680fb865ac021d7bfadf93eada99ae094c06c0a";
+ sha256 = "3435d7d93a47a32764b1ec2d03f7fbb348a97af52530815e49370803a1a69c65";
};
configureFlags = "--disable-component";
diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
index 29c30204ddbe..62dcf5dd8a88 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
-, hicolor_icon_theme, libsoup, gnome3 }:
+, hicolor-icon-theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
name = "grisbi-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup
+ buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
gnome3.defaultIconTheme ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 1d90e8be282a..28b85936a281 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -1,15 +1,15 @@
{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
-, hicolor_icon_theme, libsoup, gnome3 }:
+, hicolor-icon-theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "homebank-5.1.6";
+ name = "homebank-5.1.8";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
- sha256 = "1q4h890g6a6pm6kfiavbq9sbpsnap0f854sja2y5q3x0j0ay2q98";
+ sha256 = "0fzjmwz2pgi0nw49xljp1za3vp67kjh88gf688d9ig4wc2ygr0qh";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup
+ buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
gnome3.defaultIconTheme ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix
index b8844391c7d9..59ecb5a5c3b7 100644
--- a/pkgs/applications/office/ib/tws/default.nix
+++ b/pkgs/applications/office/ib/tws/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
Download the TWS from
https://download2.interactivebrokers.com/download/unixmacosx_latest.jar,
rename the file to ${name}, and add it to the nix store with
- "nix-prefetch-url file://${name}".
+ "nix-prefetch-url file://\$PWD/${name}".
'';
sha256 = "1a2jiwwnr5g3xfba1a89c257bdbnq4zglri8hz021vk7f6s4rlrf";
};
diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix
index 59249d1a6eb0..92feb6618c9e 100644
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@@ -1,8 +1,8 @@
{ fetchurl, stdenv, python2, makeWrapper, lib
-, mesa, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }:
+, libGLU_combined, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }:
let
- version = "0.11.1";
+ version = "0.12.0";
pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]);
in stdenv.mkDerivation {
# This project was formerly known as KeyJNote.
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
- sha256 = "0b3rmy6acp2vmf5nill3aknxvr9a5aawk1vnphkah61anxp62gsr";
+ sha256 = "0zaqq3yvd296mfr5bxpj2hqlk7vrb0rsbgd4dc1l5ag46giqvivx";
};
buildInputs = [ makeWrapper pythonEnv ];
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index e7b821834546..5dfd03570121 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings_desktop_schemas }:
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
version = "3.8.1";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
exec = "jabref";
};
- buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings_desktop_schemas ];
+ buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ];
unpackPhase = "#";
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index 66aee6bd9628..8463703c0179 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -4,7 +4,7 @@
breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
kwidgetsaddons, kxmlgui,
- kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql
+ kdb, kproperty, kreport, lcms2, mysql, marble, postgresql
}:
mkDerivation rec {
@@ -24,7 +24,7 @@ mkDerivation rec {
breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets
kwidgetsaddons kxmlgui
- kdb kproperty kreport lcms2 libmysql marble postgresql
+ kdb kproperty kreport lcms2 mysql.connector-c marble postgresql
];
propagatedUserEnvPkgs = [ kproperty ];
diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 2d66fe4b309e..bb6e529f5d29 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://ledger-cli.org/;
+ homepage = https://ledger-cli.org/;
description = "A double-entry accounting system with a command-line reporting interface";
license = licenses.bsd3;
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index cc3329bdcc9d..f8742253c519 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -1,17 +1,17 @@
{ fetchurl }:
rec {
- major = "5";
- minor = "4";
- patch = "1";
- tweak = "2";
+ major = "6";
+ minor = "0";
+ patch = "2";
+ tweak = "1";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
src = fetchurl {
- url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "0c17193vcf4nj8l5k9q87byv27px74kzp0hvgr1dfz5700cv086k";
+ url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
+ sha256 = "0qga01lhh09jf2gx3czk66i5c854gzzjxgkrmj5d7m4ci2zaxfsd";
};
}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 830ae68fd1b9..7da7a6bf7342 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
+{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, 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
-, openssl, gperf, cppunit, GConf, ORBit2, poppler
-, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
+, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
-, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
+, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
-, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
+, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
+, langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ]
, withHelp ? true
, kdeIntegration ? false
}:
@@ -29,27 +29,27 @@ let
langsSpaces = lib.concatStringsSep " " langs;
fetchSrc = {name, sha256}: fetchurl {
- url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
+ url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
inherit sha256;
};
srcs = {
third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec {
- url = "http://dev-www.libreoffice.org/extern/${md5}-${name}";
+ url = "https://dev-www.libreoffice.org/extern/${md5}-${name}";
sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
name = "unowinreg.dll";
}) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs.nix));
translations = fetchSrc {
name = "translations";
- sha256 = "1ir1f5jgjhpnxsw6izsryp4wg52ifzmcqyc0gdp9zh03rjf5i4cg";
+ sha256 = "1fx9xkf1ppap77b8zdr8qawbikgp607z5w9b7jk3rilcqs7xbkwl";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "1apgc57a8q6lsjfq2f7pzdn7wanqm8zkkrkbq2nd4hidp6avgm6f";
+ sha256 = "0zphmhl4a8pd5l7ma4bzhrwgbv037j8p5m1ilvb1blgbqv53v38a";
};
};
@@ -106,6 +106,11 @@ in stdenv.mkDerivation rec {
# BLFS patch for Glibc 2.23 renaming isnan
sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx
+
+ # 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"
'';
# fetch_Download_item tries to interpret the name as a variable name
@@ -115,11 +120,13 @@ in stdenv.mkDerivation rec {
sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
# unit test sd_tiledrendering seems to be fragile
- # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+ # 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
# 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
@@ -138,6 +145,8 @@ in stdenv.mkDerivation rec {
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
'';
@@ -147,9 +156,6 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildPhase = ''
- # This is required as some cppunittests require fontconfig configured
- export FONTCONFIG_FILE=${fontsConf}
-
# This to avoid using /lib:/usr/lib at linking
sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
@@ -166,10 +172,6 @@ in stdenv.mkDerivation rec {
for a in sbase scalc sdraw smath swriter simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
- wrapProgram "$out/bin/$a" \
- --prefix XDG_DATA_DIRS : \
- "$out/share:$GSETTINGS_SCHEMAS_PATH" \
- ;
done
ln -s $out/bin/soffice $out/bin/libreoffice
@@ -233,8 +235,10 @@ in stdenv.mkDerivation rec {
"--without-system-liblangtag"
"--without-system-libmspub"
"--without-system-libpagemaker"
- "--without-system-libgltf"
"--without-system-libstaroffice"
+ "--without-system-libepubgen"
+ "--without-system-libqxp"
+ "--without-system-mdds"
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
"--without-system-orcus"
];
@@ -246,22 +250,23 @@ in stdenv.mkDerivation rec {
buildInputs = with xorg;
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core
- CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
+ CompressZlib 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 mesa mythes gst_all_1.gstreamer
- gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
+ libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib
mdds bluez5 glibc libcmis libwps libabw libzmf libtool
- libxshmfence libatomic_ops graphite2 harfbuzz gpgme
+ libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy
- libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
+ libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
gdb
]
++ lib.optional kdeIntegration kdelibs4;
+ nativeBuildInputs = [ wrapGAppsHook ];
passthru = {
inherit srcs;
@@ -271,7 +276,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
- homepage = http://libreoffice.org/;
+ homepage = https://libreoffice.org/;
license = licenses.lgpl3;
maintainers = with maintainers; [ viric raskin ];
platforms = platforms.linux;
diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
index dcda0ff782dc..636f36cb383b 100755
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
@@ -256,7 +256,7 @@ def interpret(x):
Output: One of 1. Dict with keys 'name' and 'attrs'
2. 'unrecognized' (if interpretation failed)
"""
- for f in [interpret_md5, interpret_sha256, interpret_tarball_with_md5, interpret_tarball]:
+ for f in [interpret_md5, interpret_sha256, interpret_tarball_with_md5, interpret_tarball, interpret_jar]:
result = f(x)
if result is not None:
return result
@@ -296,6 +296,13 @@ def interpret_tarball(x):
return {'name': match.group(1),
'attrs': {'tarball': x['value'], 'brief': True}}
+def interpret_jar(x):
+ match = re.match('^(.*)_JAR$', x['key'])
+
+ if match:
+ return {'name': match.group(1),
+ 'attrs': {'tarball': x['value'], 'brief': True}}
+
def interpret_tarball_with_md5(x):
"""
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
index 478c6c4d9062..e82fa241c00c 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
@@ -3,43 +3,43 @@
name = "libabw-0.1.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2";
sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199";
- md5 = "7a3815b506d064313ba309617b6f5a0b";
- md5name = "7a3815b506d064313ba309617b6f5a0b-libabw-0.1.1.tar.bz2";
+ md5 = "";
+ md5name = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199-libabw-0.1.1.tar.bz2";
}
{
name = "commons-logging-1.2-src.tar.gz";
url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz";
sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81";
- md5 = "ce977548f1cbf46918e93cd38ac35163";
- md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz";
+ md5 = "";
+ md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz";
}
{
name = "apr-1.5.2.tar.gz";
url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz";
sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb";
- md5 = "98492e965963f852ab29f9e61b2ad700";
- md5name = "98492e965963f852ab29f9e61b2ad700-apr-1.5.2.tar.gz";
+ md5 = "";
+ md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz";
}
{
name = "apr-util-1.5.4.tar.gz";
url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz";
sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19";
- md5 = "866825c04da827c6e5f53daff5569f42";
- md5name = "866825c04da827c6e5f53daff5569f42-apr-util-1.5.4.tar.gz";
+ md5 = "";
+ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
}
{
- name = "boost_1_60_0.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2";
- sha256 = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b";
- md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe";
- md5name = "65a840e1a0b13a558ff19eeb2c4f0cbe-boost_1_60_0.tar.bz2";
+ name = "boost_1_63_0.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2";
+ sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0";
+ md5 = "";
+ md5name = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0-boost_1_63_0.tar.bz2";
}
{
name = "breakpad.zip";
url = "http://dev-www.libreoffice.org/src/breakpad.zip";
sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9";
- md5 = "415ce291aa6f2ee1d5db7b62bf62ade8";
- md5name = "415ce291aa6f2ee1d5db7b62bf62ade8-breakpad.zip";
+ md5 = "";
+ md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip";
}
{
name = "bsh-2.0b6-src.zip";
@@ -56,18 +56,18 @@
md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
}
{
- name = "cairo-1.14.6.tar.xz";
- url = "http://dev-www.libreoffice.org/src/23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz";
- sha256 = "613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252";
- md5 = "23a0b2f0235431d35238df1d3a517fdb";
- md5name = "23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz";
+ name = "cairo-1.14.8.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz";
+ sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20";
+ md5 = "";
+ md5name = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20-cairo-1.14.8.tar.xz";
}
{
name = "libcdr-0.1.3.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2";
sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d";
- md5 = "e369f30b5b861ee0fc4f9e6cbad701fe";
- md5name = "e369f30b5b861ee0fc4f9e6cbad701fe-libcdr-0.1.3.tar.bz2";
+ md5 = "";
+ md5name = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d-libcdr-0.1.3.tar.bz2";
}
{
name = "clucene-core-2.3.3.4.tar.gz";
@@ -80,15 +80,15 @@
name = "libcmis-0.5.1.tar.gz";
url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz";
sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e";
- md5 = "3270154f0f40d86fce849b161f914101";
- md5name = "3270154f0f40d86fce849b161f914101-libcmis-0.5.1.tar.gz";
+ md5 = "";
+ md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz";
}
{
name = "CoinMP-1.7.6.tgz";
url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz";
sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f";
- md5 = "1cce53bf4b40ae29790d2c5c9f8b1129";
- md5name = "1cce53bf4b40ae29790d2c5c9f8b1129-CoinMP-1.7.6.tgz";
+ md5 = "";
+ md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz";
}
{
name = "collada2gltf-master-cb1d97788a.tar.bz2";
@@ -98,11 +98,11 @@
md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2";
}
{
- name = "cppunit-1.13.2.tar.gz";
- url = "http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz";
- sha256 = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f";
- md5 = "d1c6bdd5a76c66d2c38331e2d287bc01";
- md5name = "d1c6bdd5a76c66d2c38331e2d287bc01-cppunit-1.13.2.tar.gz";
+ name = "cppunit-1.14.0.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz";
+ sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780";
+ md5 = "";
+ md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz";
}
{
name = "converttexttonumber-1-5-0.oxt";
@@ -115,15 +115,22 @@
name = "curl-7.52.1.tar.gz";
url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz";
sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae";
- md5 = "4e1ef056e117b4d25f4ec42ac609c0d4";
- md5name = "4e1ef056e117b4d25f4ec42ac609c0d4-curl-7.52.1.tar.gz";
+ md5 = "";
+ md5name = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae-curl-7.52.1.tar.gz";
}
{
name = "libe-book-0.1.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2";
sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850";
- md5 = "6b48eda57914e6343efebc9381027b78";
- md5name = "6b48eda57914e6343efebc9381027b78-libe-book-0.1.2.tar.bz2";
+ md5 = "";
+ md5name = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850-libe-book-0.1.2.tar.bz2";
+ }
+ {
+ name = "libepoxy-1.3.1.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2";
+ sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64";
+ md5 = "";
+ md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2";
}
{
name = "epm-3.7.tar.gz";
@@ -136,29 +143,29 @@
name = "libetonyek-0.1.6.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2";
sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78";
- md5 = "77ff46936dcc83670557274e7dd2aa33";
- md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2";
+ md5 = "";
+ md5name = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78-libetonyek-0.1.6.tar.bz2";
}
{
name = "expat-2.2.3.tar.bz2";
url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2";
sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f";
- md5 = "f053af63ef5f39bd9b78d01fbc203334";
- md5name = "f053af63ef5f39bd9b78d01fbc203334-expat-2.2.3.tar.bz2";
+ md5 = "";
+ md5name = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f-expat-2.2.3.tar.bz2";
}
{
name = "Firebird-3.0.0.32483-0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2";
sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860";
- md5 = "821260b61dafc22899d1464d4e91ee6a";
- md5name = "821260b61dafc22899d1464d4e91ee6a-Firebird-3.0.0.32483-0.tar.bz2";
+ md5 = "";
+ md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2";
}
{
- name = "fontconfig-2.8.0.tar.gz";
- url = "http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz";
- sha256 = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335";
- md5 = "77e15a92006ddc2adbb06f840d591c0e";
- md5name = "77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz";
+ name = "fontconfig-2.12.1.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2";
+ sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3";
+ md5 = "";
+ md5name = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3-fontconfig-2.12.1.tar.bz2";
}
{
name = "crosextrafonts-20130214.tar.gz";
@@ -241,29 +248,22 @@
name = "EmojiOneColor-SVGinOT-1.3.tar.gz";
url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz";
sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7";
- md5 = "919389b307ee8696288ea3b8210ab974";
- md5name = "919389b307ee8696288ea3b8210ab974-EmojiOneColor-SVGinOT-1.3.tar.gz";
+ md5 = "";
+ md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz";
}
{
name = "libfreehand-0.1.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2";
sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877";
- md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7";
- md5name = "8cf70c5dc4d24d2dc4a107f509d2d6d7-libfreehand-0.1.1.tar.bz2";
+ md5 = "";
+ md5name = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877-libfreehand-0.1.1.tar.bz2";
}
{
- name = "freetype-2.4.8.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2";
- sha256 = "a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71";
- md5 = "dbf2caca1d3afd410a29217a9809d397";
- md5name = "dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2";
- }
- {
- name = "glew-1.12.0.zip";
- url = "http://dev-www.libreoffice.org/src/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip";
- sha256 = "6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4";
- md5 = "3941e9cab2f4f9d8faee3e8d57ae7664";
- md5name = "3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip";
+ name = "freetype-2.7.1.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2";
+ sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88";
+ md5 = "";
+ md5name = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88-freetype-2.7.1.tar.bz2";
}
{
name = "glm-0.9.4.6-libreoffice.zip";
@@ -272,19 +272,26 @@
md5 = "bae83fa5dc7f081768daace6e199adc3";
md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip";
}
+ {
+ name = "gpgme-1.8.0.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2";
+ sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33";
+ md5 = "";
+ md5name = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33-gpgme-1.8.0.tar.bz2";
+ }
{
name = "graphite2-minimal-1.3.10.tgz";
url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz";
sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9";
- md5 = "9c499b8ec9f1b81fd0bb6a3b986f4b0f";
- md5name = "9c499b8ec9f1b81fd0bb6a3b986f4b0f-graphite2-minimal-1.3.10.tgz";
+ md5 = "";
+ md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz";
}
{
- name = "harfbuzz-1.3.2.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2";
- sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027";
- md5 = "5986e1bfcd983d1f6caa53ef64c4abc5";
- md5name = "5986e1bfcd983d1f6caa53ef64c4abc5-harfbuzz-1.3.2.tar.bz2";
+ name = "harfbuzz-1.4.8.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/harfbuzz-1.4.8.tar.bz2";
+ sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131";
+ md5 = "";
+ md5name = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131-harfbuzz-1.4.8.tar.bz2";
}
{
name = "hsqldb_1_8_0.zip";
@@ -392,25 +399,18 @@
md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
}
{
- name = "jpegsrc.v9a.tar.gz";
- url = "http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz";
- sha256 = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7";
- md5 = "3353992aecaee1805ef4109aadd433e7";
- md5name = "3353992aecaee1805ef4109aadd433e7-jpegsrc.v9a.tar.gz";
+ name = "libjpeg-turbo-1.5.1.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz";
+ sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c";
+ md5 = "";
+ md5name = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c-libjpeg-turbo-1.5.1.tar.gz";
}
{
- name = "libjpeg-turbo-1.4.2.tar.gz";
- url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.4.2.tar.gz";
- sha256 = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e";
- md5 = "86b0d5f7507c2e6c21c00219162c3c44";
- md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz";
- }
- {
- name = "language-subtag-registry-2017-04-19.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2";
- sha256 = "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a";
- md5 = "59a3595c1052c5b51f996f44fe9994b9";
- md5name = "59a3595c1052c5b51f996f44fe9994b9-language-subtag-registry-2017-04-19.tar.bz2";
+ name = "language-subtag-registry-2017-12-14.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2";
+ sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362";
+ md5 = "";
+ md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@@ -420,25 +420,32 @@
md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2";
}
{
- name = "lcms2-2.6.tar.gz";
- url = "http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz";
- sha256 = "5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1";
- md5 = "f4c08d38ceade4a664ebff7228910a33";
- md5name = "f4c08d38ceade4a664ebff7228910a33-lcms2-2.6.tar.gz";
+ name = "lcms2-2.8.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz";
+ sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22";
+ md5 = "";
+ md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz";
+ }
+ {
+ name = "libassuan-2.4.3.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2";
+ sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71";
+ md5 = "";
+ md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2";
}
{
name = "libatomic_ops-7_2d.zip";
url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip";
sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad";
- md5 = "c0b86562d5aa40761a87134f83e6adcf";
- md5name = "c0b86562d5aa40761a87134f83e6adcf-libatomic_ops-7_2d.zip";
+ md5 = "";
+ md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip";
}
{
name = "libeot-0.01.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2";
sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a";
- md5 = "aa24f5dd2a2992f4a116aa72af817548";
- md5name = "aa24f5dd2a2992f4a116aa72af817548-libeot-0.01.tar.bz2";
+ md5 = "";
+ md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2";
}
{
name = "libexttextcat-3.4.4.tar.bz2";
@@ -448,32 +455,39 @@
md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2";
}
{
- name = "libgltf-0.0.2.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2";
- sha256 = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b";
- md5 = "d63a9f47ab048f5009d90693d6aa6424";
- md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2";
+ name = "libgltf-0.1.0.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz";
+ sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da";
+ md5 = "";
+ md5name = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da-libgltf-0.1.0.tar.gz";
+ }
+ {
+ name = "libgpg-error-1.26.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2";
+ sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69";
+ md5 = "";
+ md5name = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69-libgpg-error-1.26.tar.bz2";
}
{
name = "liblangtag-0.6.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";
sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e";
- md5 = "284f120247323a35122ab32b4b359c45";
- md5name = "284f120247323a35122ab32b4b359c45-liblangtag-0.6.2.tar.bz2";
+ md5 = "";
+ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2";
}
{
name = "ltm-1.0.zip";
url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip";
sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483";
- md5 = "da283d2e3e72137d0c600ac36b991c9d";
- md5name = "da283d2e3e72137d0c600ac36b991c9d-ltm-1.0.zip";
+ md5 = "";
+ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
}
{
- name = "xmlsec1-1.2.23.tar.gz";
- url = "http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz";
- sha256 = "41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f";
- md5 = "86b1daaa438f5a7bea9a52d7b9799ac0";
- md5name = "86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz";
+ name = "xmlsec1-1.2.24.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz";
+ sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc";
+ md5 = "";
+ md5name = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc-xmlsec1-1.2.24.tar.gz";
}
{
name = "libxml2-2.9.4.tar.gz";
@@ -507,29 +521,29 @@
name = "mdds-1.2.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2";
sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d";
- md5 = "8855cf852a6088cfdc792c6f7ceb0243";
- md5name = "8855cf852a6088cfdc792c6f7ceb0243-mdds-1.2.2.tar.bz2";
+ md5 = "";
+ md5name = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d-mdds-1.2.2.tar.bz2";
}
{
name = "mDNSResponder-576.30.4.tar.gz";
url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz";
sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0";
- md5 = "940057ac8b513b00e8e9ca12ef796762";
- md5name = "940057ac8b513b00e8e9ca12ef796762-mDNSResponder-576.30.4.tar.gz";
+ md5 = "";
+ md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz";
}
{
name = "libmspub-0.1.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2";
sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a";
- md5 = "ff9d0f9dd8fbc523408ea1953d5bde41";
- md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2";
+ md5 = "";
+ md5name = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a-libmspub-0.1.2.tar.bz2";
}
{
- name = "libmwaw-0.3.9.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2";
- sha256 = "11a1f318431a052e1d623385351c8e659377d36db3e71e188af55da87ce9461f";
- md5 = "d8532ad5630d3f3b2189a7ec5639151b";
- md5name = "d8532ad5630d3f3b2189a7ec5639151b-libmwaw-0.3.9.tar.bz2";
+ name = "libmwaw-0.3.11.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz";
+ sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a";
+ md5 = "";
+ md5name = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a-libmwaw-0.3.11.tar.xz";
}
{
name = "mysql-connector-c++-1.1.4.tar.gz";
@@ -556,15 +570,15 @@
name = "nss-3.29.5-with-nspr-4.13.1.tar.gz";
url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz";
sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4";
- md5 = "e55ee06b22687df68fafc6a30c0554b2";
- md5name = "e55ee06b22687df68fafc6a30c0554b2-nss-3.29.5-with-nspr-4.13.1.tar.gz";
+ md5 = "";
+ md5name = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4-nss-3.29.5-with-nspr-4.13.1.tar.gz";
}
{
name = "libodfgen-0.1.6.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2";
sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2";
- md5 = "32572ea48d9021bbd6fa317ddb697abc";
- md5name = "32572ea48d9021bbd6fa317ddb697abc-libodfgen-0.1.6.tar.bz2";
+ md5 = "";
+ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
}
{
name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
@@ -584,43 +598,50 @@
name = "OpenCOLLADA-master-6509aa13af.tar.bz2";
url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2";
sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4";
- md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6";
- md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2";
+ md5 = "";
+ md5name = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4-OpenCOLLADA-master-6509aa13af.tar.bz2";
}
{
name = "openldap-2.4.44.tgz";
url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz";
sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400";
- md5 = "693ac26de86231f8dcae2b4e9d768e51";
- md5name = "693ac26de86231f8dcae2b4e9d768e51-openldap-2.4.44.tgz";
+ md5 = "";
+ md5name = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400-openldap-2.4.44.tgz";
}
{
- name = "openssl-1.0.2h.tar.gz";
- url = "http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz";
- sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919";
- md5 = "9392e65072ce4b614c1392eefc1f23d0";
- md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz";
+ name = "openssl-1.0.2k.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz";
+ sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0";
+ md5 = "";
+ md5name = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0-openssl-1.0.2k.tar.gz";
}
{
name = "liborcus-0.12.1.tar.gz";
url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz";
sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908";
- md5 = "d0ad3a2fcf7008e5b33604bab33df3ad";
- md5name = "d0ad3a2fcf7008e5b33604bab33df3ad-liborcus-0.12.1.tar.gz";
+ md5 = "";
+ md5name = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908-liborcus-0.12.1.tar.gz";
}
{
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb";
- md5 = "593f0aa47bf2efc0efda2d28fae063b2";
- md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
+ md5 = "";
+ md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
}
{
name = "libpagemaker-0.0.3.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2";
sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33";
- md5 = "5c4985a68be0b79d3f809da5e12b143c";
- md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2";
+ md5 = "";
+ md5name = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33-libpagemaker-0.0.3.tar.bz2";
+ }
+ {
+ name = "pdfium-3064.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2";
+ sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883";
+ md5 = "";
+ md5name = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883-pdfium-3064.tar.bz2";
}
{
name = "pixman-0.34.0.tar.gz";
@@ -633,15 +654,15 @@
name = "libpng-1.6.28.tar.gz";
url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz";
sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2";
- md5 = "897ccec1ebfb0922e83c2bfaa1be8748";
- md5name = "897ccec1ebfb0922e83c2bfaa1be8748-libpng-1.6.28.tar.gz";
+ md5 = "";
+ md5name = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2-libpng-1.6.28.tar.gz";
}
{
- name = "poppler-0.49.0.tar.xz";
- url = "http://dev-www.libreoffice.org/src/poppler-0.49.0.tar.xz";
- sha256 = "14485f0e1e43dcddf49cfc02c2ccb92910ba3e0e91e06f4bd2642ec00cb3a79f";
- md5 = "9e057ed8eee1f9979fa75d8f044783b8";
- md5name = "9e057ed8eee1f9979fa75d8f044783b8-poppler-0.49.0.tar.xz";
+ name = "poppler-0.56.0.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz";
+ sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173";
+ md5 = "";
+ md5name = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173-poppler-0.56.0.tar.xz";
}
{
name = "postgresql-9.2.1.tar.bz2";
@@ -650,19 +671,12 @@
md5 = "c0b4799ea9850eae3ead14f0a60e9418";
md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2";
}
- {
- name = "Python-3.3.5.tgz";
- url = "http://dev-www.libreoffice.org/src/Python-3.3.5.tgz";
- sha256 = "916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168";
- md5 = "803a75927f8f241ca78633890c798021";
- md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz";
- }
{
name = "Python-3.5.4.tgz";
url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz";
sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44";
- md5 = "2ed4802b7a2a7e40d2e797272bf388ec";
- md5name = "2ed4802b7a2a7e40d2e797272bf388ec-Python-3.5.4.tgz";
+ md5 = "";
+ md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz";
}
{
name = "raptor2-2.0.15.tar.gz";
@@ -689,8 +703,8 @@
name = "librevenge-0.0.4.tar.bz2";
url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2";
sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf";
- md5 = "5b9ac52ec77d4d19157cf5962ebc0aea";
- md5name = "5b9ac52ec77d4d19157cf5962ebc0aea-librevenge-0.0.4.tar.bz2";
+ md5 = "";
+ md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2";
}
{
name = "rhino1_5R5.zip";
@@ -703,15 +717,15 @@
name = "serf-1.2.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2";
sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700";
- md5 = "4f8e76c9c6567aee1d66aba49f76a58b";
- md5name = "4f8e76c9c6567aee1d66aba49f76a58b-serf-1.2.1.tar.bz2";
+ md5 = "";
+ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
}
{
- name = "libstaroffice-0.0.2.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2";
- sha256 = "f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899";
- md5 = "4012950240c2bf768c9b29ad376123d7";
- md5name = "4012950240c2bf768c9b29ad376123d7-libstaroffice-0.0.2.tar.bz2";
+ name = "libstaroffice-0.0.3.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz";
+ sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6";
+ md5 = "";
+ md5name = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6-libstaroffice-0.0.3.tar.xz";
}
{
name = "swingExSrc.zip";
@@ -731,29 +745,29 @@
name = "libvisio-0.1.5.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2";
sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e";
- md5 = "cbee198a78b842b2087f32d33c522818";
- md5name = "cbee198a78b842b2087f32d33c522818-libvisio-0.1.5.tar.bz2";
+ md5 = "";
+ md5name = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e-libvisio-0.1.5.tar.bz2";
}
{
name = "libwpd-0.10.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2";
sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d";
- md5 = "79b56bcc349264d686a67994506ad199";
- md5name = "79b56bcc349264d686a67994506ad199-libwpd-0.10.1.tar.bz2";
+ md5 = "";
+ md5name = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d-libwpd-0.10.1.tar.bz2";
}
{
name = "libwpg-0.3.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2";
sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59";
- md5 = "dfd066658ec9d2fb2262417039a8a1c3";
- md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2";
+ md5 = "";
+ md5name = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59-libwpg-0.3.1.tar.bz2";
}
{
- name = "libwps-0.4.4.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libwps-0.4.4.tar.bz2";
- sha256 = "387c46d9543bb566381fddb8991e2838599fc500ee132fef9631a704c5cbed73";
- md5 = "dcfd1d18bfa9818cf3ab21663ba857a3";
- md5name = "dcfd1d18bfa9818cf3ab21663ba857a3-libwps-0.4.4.tar.bz2";
+ name = "libwps-0.4.6.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz";
+ sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0";
+ md5 = "";
+ md5name = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0-libwps-0.4.6.tar.xz";
}
{
name = "xsltml_2.1.2.zip";
@@ -763,17 +777,17 @@
md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
}
{
- name = "zlib-1.2.8.tar.gz";
- url = "http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz";
- sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d";
- md5 = "44d667c142d7cda120332623eab69f40";
- md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz";
+ name = "zlib-1.2.11.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz";
+ sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066";
+ md5 = "";
+ md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz";
}
{
name = "libzmf-0.0.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2";
sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b";
- md5 = "c611df8664240de0276ab95670f413d8";
- md5name = "c611df8664240de0276ab95670f413d8-libzmf-0.0.1.tar.bz2";
+ md5 = "";
+ md5name = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b-libzmf-0.0.1.tar.bz2";
}
]
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index d20ec2d0cc80..28c06b65869f 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -1,45 +1,45 @@
[
{
- name = "libabw-0.1.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2";
- sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199";
+ name = "libabw-0.1.2.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz";
+ sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485";
md5 = "";
- md5name = "-libabw-0.1.1.tar.bz2";
+ md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz";
}
{
name = "commons-logging-1.2-src.tar.gz";
url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz";
sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81";
md5 = "";
- md5name = "-commons-logging-1.2-src.tar.gz";
+ md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz";
}
{
name = "apr-1.5.2.tar.gz";
url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz";
sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb";
md5 = "";
- md5name = "-apr-1.5.2.tar.gz";
+ md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz";
}
{
name = "apr-util-1.5.4.tar.gz";
url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz";
sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19";
md5 = "";
- md5name = "-apr-util-1.5.4.tar.gz";
+ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
}
{
- name = "boost_1_63_0.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2";
- sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0";
+ name = "boost_1_65_1.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2";
+ sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
md5 = "";
- md5name = "-boost_1_63_0.tar.bz2";
+ md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2";
}
{
name = "breakpad.zip";
url = "http://dev-www.libreoffice.org/src/breakpad.zip";
sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9";
md5 = "";
- md5name = "-breakpad.zip";
+ md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip";
}
{
name = "bsh-2.0b6-src.zip";
@@ -56,18 +56,18 @@
md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
}
{
- name = "cairo-1.14.8.tar.xz";
- url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz";
- sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20";
+ name = "cairo-1.14.10.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz";
+ sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09";
md5 = "";
- md5name = "-cairo-1.14.8.tar.xz";
+ md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz";
}
{
- name = "libcdr-0.1.3.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2";
- sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d";
+ name = "libcdr-0.1.4.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz";
+ sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d";
md5 = "";
- md5name = "-libcdr-0.1.3.tar.bz2";
+ md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz";
}
{
name = "clucene-core-2.3.3.4.tar.gz";
@@ -81,28 +81,21 @@
url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz";
sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e";
md5 = "";
- md5name = "-libcmis-0.5.1.tar.gz";
+ md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz";
}
{
name = "CoinMP-1.7.6.tgz";
url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz";
sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f";
md5 = "";
- md5name = "-CoinMP-1.7.6.tgz";
- }
- {
- name = "collada2gltf-master-cb1d97788a.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2";
- sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb";
- md5 = "4b87018f7fff1d054939d19920b751a0";
- md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2";
+ md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz";
}
{
name = "cppunit-1.14.0.tar.gz";
url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz";
sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780";
md5 = "";
- md5name = "-cppunit-1.14.0.tar.gz";
+ md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz";
}
{
name = "converttexttonumber-1-5-0.oxt";
@@ -112,25 +105,25 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
- name = "curl-7.52.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz";
- sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae";
+ name = "curl-7.58.0.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz";
+ sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115";
md5 = "";
- md5name = "-curl-7.52.1.tar.gz";
+ md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz";
}
{
- name = "libe-book-0.1.2.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2";
- sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850";
+ name = "libe-book-0.1.3.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz";
+ sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9";
md5 = "";
- md5name = "-libe-book-0.1.2.tar.bz2";
+ md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz";
}
{
name = "libepoxy-1.3.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2";
sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64";
md5 = "";
- md5name = "-libepoxy-1.3.1.tar.bz2";
+ md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2";
}
{
name = "epm-3.7.tar.gz";
@@ -140,32 +133,39 @@
md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz";
}
{
- name = "libetonyek-0.1.6.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2";
- sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78";
+ name = "libepubgen-0.1.0.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2";
+ sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633";
md5 = "";
- md5name = "-libetonyek-0.1.6.tar.bz2";
+ md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2";
}
{
- name = "expat-2.2.3.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2";
- sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f";
+ name = "libetonyek-0.1.7.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz";
+ sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac";
md5 = "";
- md5name = "-expat-2.2.3.tar.bz2";
+ md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz";
+ }
+ {
+ name = "expat-2.2.5.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2";
+ sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6";
+ md5 = "";
+ md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2";
}
{
name = "Firebird-3.0.0.32483-0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2";
sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860";
md5 = "";
- md5name = "-Firebird-3.0.0.32483-0.tar.bz2";
+ md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2";
}
{
- name = "fontconfig-2.12.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2";
- sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3";
+ name = "fontconfig-2.12.6.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2";
+ sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017";
md5 = "";
- md5name = "-fontconfig-2.12.1.tar.bz2";
+ md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2";
}
{
name = "crosextrafonts-20130214.tar.gz";
@@ -216,20 +216,6 @@
md5 = "e7a384790b13c29113e22e596ade9687";
md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
}
- {
- name = "open-sans-font-ttf-1.10.tar.gz";
- url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz";
- sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8";
- md5 = "7a15edea7d415ac5150ea403e27401fd";
- md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz";
- }
- {
- name = "pt-serif-font-1.0000W.tar.gz";
- url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
- sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa";
- md5 = "c3c1a8ba7452950636e871d25020ce0d";
- md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
- }
{
name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz";
url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
@@ -249,21 +235,77 @@
url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz";
sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7";
md5 = "";
- md5name = "-EmojiOneColor-SVGinOT-1.3.tar.gz";
+ md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz";
}
{
- name = "libfreehand-0.1.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2";
- sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877";
+ name = "noto-fonts-20171024.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";
+ sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994";
md5 = "";
- md5name = "-libfreehand-0.1.1.tar.bz2";
+ md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz";
}
{
- name = "freetype-2.7.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2";
- sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88";
+ name = "culmus-0.131.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";
+ sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b";
md5 = "";
- md5name = "-freetype-2.7.1.tar.bz2";
+ md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz";
+ }
+ {
+ name = "libre-hebrew-1.0.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz";
+ sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a";
+ md5 = "";
+ md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz";
+ }
+ {
+ name = "alef-1.001.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz";
+ sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52";
+ md5 = "";
+ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz";
+ }
+ {
+ name = "amiri-0.109.zip";
+ url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip";
+ sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6";
+ md5 = "";
+ md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip";
+ }
+ {
+ name = "ttf-kacst_2.01+mry.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz";
+ sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56";
+ md5 = "";
+ md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz";
+ }
+ {
+ name = "ReemKufi-0.6.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz";
+ sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b";
+ md5 = "";
+ md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz";
+ }
+ {
+ name = "Scheherazade-2.100.zip";
+ url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip";
+ sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5";
+ md5 = "";
+ md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip";
+ }
+ {
+ name = "libfreehand-0.1.2.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz";
+ sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac";
+ md5 = "";
+ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
+ }
+ {
+ name = "freetype-2.8.1.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2";
+ sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78";
+ md5 = "";
+ md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2";
}
{
name = "glm-0.9.4.6-libreoffice.zip";
@@ -273,25 +315,25 @@
md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip";
}
{
- name = "gpgme-1.8.0.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2";
- sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33";
+ name = "gpgme-1.9.0.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2";
+ sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb";
md5 = "";
- md5name = "-gpgme-1.8.0.tar.bz2";
+ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";
}
{
name = "graphite2-minimal-1.3.10.tgz";
url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz";
sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9";
md5 = "";
- md5name = "-graphite2-minimal-1.3.10.tgz";
+ md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz";
}
{
- name = "harfbuzz-1.3.2.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2";
- sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027";
+ name = "harfbuzz-1.7.0.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2";
+ sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029";
md5 = "";
- md5name = "-harfbuzz-1.3.2.tar.bz2";
+ md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2";
}
{
name = "hsqldb_1_8_0.zip";
@@ -301,11 +343,11 @@
md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
}
{
- name = "hunspell-1.6.0.tar.gz";
- url = "http://dev-www.libreoffice.org/src/047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
- sha256 = "512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2";
- md5 = "047c3feb121261b76dc16cdb62f54483";
- md5name = "047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
+ name = "hunspell-1.6.2.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz";
+ sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4";
+ md5 = "";
+ md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz";
}
{
name = "hyphen-2.8.8.tar.gz";
@@ -315,11 +357,18 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
- name = "icu4c-58_1-src.tgz";
- url = "http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz";
- sha256 = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309";
- md5 = "1901302aaff1c1633ef81862663d2917";
- md5name = "1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz";
+ name = "icu4c-60_2-src.tgz";
+ url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz";
+ sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418";
+ md5 = "";
+ md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz";
+ }
+ {
+ name = "icu4c-60_2-data.zip";
+ url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip";
+ sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9";
+ md5 = "";
+ md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip";
}
{
name = "flow-engine-0.9.4.zip";
@@ -399,18 +448,18 @@
md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
}
{
- name = "libjpeg-turbo-1.5.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz";
- sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c";
+ name = "libjpeg-turbo-1.5.2.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz";
+ sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528";
md5 = "";
- md5name = "-libjpeg-turbo-1.5.1.tar.gz";
+ md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz";
}
{
- name = "language-subtag-registry-2017-04-19.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2";
- sha256 = "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a";
+ name = "language-subtag-registry-2017-12-14.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2";
+ sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362";
md5 = "";
- md5name = "-language-subtag-registry-2017-04-19.tar.bz2";
+ md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@@ -424,84 +473,77 @@
url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz";
sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22";
md5 = "";
- md5name = "-lcms2-2.8.tar.gz";
+ md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz";
}
{
name = "libassuan-2.4.3.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2";
sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71";
md5 = "";
- md5name = "-libassuan-2.4.3.tar.bz2";
+ md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2";
}
{
name = "libatomic_ops-7_2d.zip";
url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip";
sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad";
md5 = "";
- md5name = "-libatomic_ops-7_2d.zip";
+ md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip";
}
{
name = "libeot-0.01.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2";
sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a";
md5 = "";
- md5name = "-libeot-0.01.tar.bz2";
+ md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2";
}
{
- name = "libexttextcat-3.4.4.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2";
- sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163";
- md5 = "10d61fbaa6a06348823651b1bd7940fe";
- md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2";
- }
- {
- name = "libgltf-0.1.0.tar.gz";
- url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz";
- sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da";
+ name = "libexttextcat-3.4.5.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz";
+ sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8";
md5 = "";
- md5name = "-libgltf-0.1.0.tar.gz";
+ md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz";
}
{
- name = "libgpg-error-1.26.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2";
- sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69";
+ name = "libgpg-error-1.27.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";
+ sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2";
md5 = "";
- md5name = "-libgpg-error-1.26.tar.bz2";
+ md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2";
}
{
name = "liblangtag-0.6.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";
sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e";
md5 = "";
- md5name = "-liblangtag-0.6.2.tar.bz2";
+ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2";
}
{
name = "ltm-1.0.zip";
url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip";
sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483";
md5 = "";
- md5name = "-ltm-1.0.zip";
+ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
}
{
- name = "xmlsec1-1.2.24.tar.gz";
- url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz";
- sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc";
+ name = "xmlsec1-1.2.25.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz";
+ sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2";
md5 = "";
- md5name = "-xmlsec1-1.2.24.tar.gz";
+ md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz";
}
{
- name = "libxml2-2.9.4.tar.gz";
- url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz";
- sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c";
- md5 = "ae249165c173b1ff386ee8ad676815f5";
- md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz";
+ name = "libxml2-2.9.7.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libxml2-2.9.7.tar.gz";
+ sha256 = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c";
+ md5 = "";
+ md5name = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c-libxml2-2.9.7.tar.gz";
}
{
- name = "libxslt-1.1.29.tar.gz";
- url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz";
- sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce";
- md5 = "a129d3c44c022de3b9dcf6d6f288d72e";
- md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz";
+ name = "libxslt-1.1.32.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz";
+ sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460";
+ md5 = "";
+ md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz";
}
{
name = "lp_solve_5.5.tar.gz";
@@ -518,32 +560,32 @@
md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
}
{
- name = "mdds-1.2.2.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2";
- sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d";
+ name = "mdds-1.3.1.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2";
+ sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1";
md5 = "";
- md5name = "-mdds-1.2.2.tar.bz2";
+ md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2";
}
{
name = "mDNSResponder-576.30.4.tar.gz";
url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz";
sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0";
md5 = "";
- md5name = "-mDNSResponder-576.30.4.tar.gz";
+ md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz";
}
{
- name = "libmspub-0.1.2.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2";
- sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a";
+ name = "libmspub-0.1.3.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz";
+ sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97";
md5 = "";
- md5name = "-libmspub-0.1.2.tar.bz2";
+ md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz";
}
{
- name = "libmwaw-0.3.11.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz";
- sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a";
+ name = "libmwaw-0.3.13.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz";
+ sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea";
md5 = "";
- md5name = "-libmwaw-0.3.11.tar.xz";
+ md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz";
}
{
name = "mysql-connector-c++-1.1.4.tar.gz";
@@ -560,32 +602,32 @@
md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
}
{
- name = "neon-0.30.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
- sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd";
- md5 = "231adebe5c2f78fded3e3df6e958878e";
- md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
+ name = "neon-0.30.2.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";
+ sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca";
+ md5 = "";
+ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
}
{
- name = "nss-3.29.5-with-nspr-4.13.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz";
- sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4";
+ name = "nss-3.33-with-nspr-4.17.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz";
+ sha256 = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4";
md5 = "";
- md5name = "-nss-3.29.5-with-nspr-4.13.1.tar.gz";
+ md5name = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4-nss-3.33-with-nspr-4.17.tar.gz";
}
{
name = "libodfgen-0.1.6.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2";
sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2";
md5 = "";
- md5name = "-libodfgen-0.1.6.tar.bz2";
+ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
}
{
- name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
- url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
- sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34";
- md5 = "a084cd548b586552cb7d3ee51f1af969";
- md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
+ name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
+ url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
+ sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf";
+ md5 = "";
+ md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
}
{
name = "officeotron-0.7.4-master.jar";
@@ -595,53 +637,46 @@
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
}
{
- name = "OpenCOLLADA-master-6509aa13af.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2";
- sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4";
+ name = "openldap-2.4.45.tgz";
+ url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";
+ sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824";
md5 = "";
- md5name = "-OpenCOLLADA-master-6509aa13af.tar.bz2";
+ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
}
{
- name = "openldap-2.4.44.tgz";
- url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz";
- sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400";
+ name = "openssl-1.0.2m.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz";
+ sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f";
md5 = "";
- md5name = "-openldap-2.4.44.tgz";
+ md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz";
}
{
- name = "openssl-1.0.2k.tar.gz";
- url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz";
- sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0";
+ name = "liborcus-0.13.1.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz";
+ sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937";
md5 = "";
- md5name = "-openssl-1.0.2k.tar.gz";
- }
- {
- name = "liborcus-0.12.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz";
- sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908";
- md5 = "";
- md5name = "-liborcus-0.12.1.tar.gz";
+ md5name = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937-liborcus-0.13.1.tar.gz";
}
{
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb";
md5 = "";
- md5name = "-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
+ md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
}
{
- name = "libpagemaker-0.0.3.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2";
- sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33";
+ name = "libpagemaker-0.0.4.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz";
+ sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d";
md5 = "";
- md5name = "-libpagemaker-0.0.3.tar.bz2";
+ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
- name = "pdfium-3064.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2";
- sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883";
+ name = "pdfium-3235.tar.bz2";
+ url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2";
+ sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f";
md5 = "";
- md5name = "-pdfium-3064.tar.bz2";
+ md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2";
}
{
name = "pixman-0.34.0.tar.gz";
@@ -651,18 +686,18 @@
md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
}
{
- name = "libpng-1.6.28.tar.gz";
- url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz";
- sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2";
+ name = "libpng-1.6.34.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz";
+ sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6";
md5 = "";
- md5name = "-libpng-1.6.28.tar.gz";
+ md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz";
}
{
- name = "poppler-0.56.0.tar.xz";
- url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz";
- sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173";
+ name = "poppler-0.59.0.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz";
+ sha256 = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641";
md5 = "";
- md5name = "-poppler-0.56.0.tar.xz";
+ md5name = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641-poppler-0.59.0.tar.xz";
}
{
name = "postgresql-9.2.1.tar.bz2";
@@ -676,7 +711,14 @@
url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz";
sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44";
md5 = "";
- md5name = "-Python-3.5.4.tgz";
+ md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz";
+ }
+ {
+ name = "libqxp-0.0.1.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz";
+ sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73";
+ md5 = "";
+ md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz";
}
{
name = "raptor2-2.0.15.tar.gz";
@@ -704,7 +746,7 @@
url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2";
sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf";
md5 = "";
- md5name = "-librevenge-0.0.4.tar.bz2";
+ md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2";
}
{
name = "rhino1_5R5.zip";
@@ -718,14 +760,14 @@
url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2";
sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700";
md5 = "";
- md5name = "-serf-1.2.1.tar.bz2";
+ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
}
{
- name = "libstaroffice-0.0.3.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz";
- sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6";
+ name = "libstaroffice-0.0.5.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz";
+ sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982";
md5 = "";
- md5name = "-libstaroffice-0.0.3.tar.xz";
+ md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz";
}
{
name = "swingExSrc.zip";
@@ -742,32 +784,32 @@
md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
}
{
- name = "libvisio-0.1.5.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2";
- sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e";
+ name = "libvisio-0.1.6.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz";
+ sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9";
md5 = "";
- md5name = "-libvisio-0.1.5.tar.bz2";
+ md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz";
}
{
- name = "libwpd-0.10.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2";
- sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d";
+ name = "libwpd-0.10.2.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz";
+ sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610";
md5 = "";
- md5name = "-libwpd-0.10.1.tar.bz2";
+ md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz";
}
{
- name = "libwpg-0.3.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2";
- sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59";
+ name = "libwpg-0.3.2.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz";
+ sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33";
md5 = "";
- md5name = "-libwpg-0.3.1.tar.bz2";
+ md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz";
}
{
- name = "libwps-0.4.6.tar.xz";
- url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz";
- sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0";
+ name = "libwps-0.4.8.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz";
+ sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e";
md5 = "";
- md5name = "-libwps-0.4.6.tar.xz";
+ md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz";
}
{
name = "xsltml_2.1.2.zip";
@@ -781,13 +823,13 @@
url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz";
sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066";
md5 = "";
- md5name = "-zlib-1.2.11.tar.xz";
+ md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz";
}
{
- name = "libzmf-0.0.1.tar.bz2";
- url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2";
- sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b";
+ name = "libzmf-0.0.2.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";
+ sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22";
md5 = "";
- md5name = "-libzmf-0.0.1.tar.bz2";
+ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
}
]
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
index 82133cdf6813..32abab8abf8e 100644
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/still-primary-src.nix
@@ -2,8 +2,8 @@
rec {
major = "5";
- minor = "3";
- patch = "6";
+ minor = "4";
+ patch = "5";
tweak = "1";
subdir = "${major}.${minor}.${patch}";
@@ -11,7 +11,7 @@ rec {
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
src = fetchurl {
- url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "023a7hr7v5cf0ipga4ijhyl58ncgbjrp500qq5fwf65j8g2c3apz";
+ url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
+ sha256 = "167bh6jgyhfcvn3g7xghkg4nb99h91diypdlry5df21xs8bis5gb";
};
}
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index a3991b8b35c1..8726d5130d75 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -4,16 +4,16 @@
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis
, openssl, gperf, cppunit, GConf, ORBit2, poppler
-, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf
+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
-, libatomic_ops, graphite2, harfbuzz, libodfgen
+, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
-, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
-, defaultIconTheme, glib, ncurses
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
+, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
+, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
+, langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ]
, withHelp ? true
, kdeIntegration ? false
}:
@@ -29,27 +29,27 @@ let
langsSpaces = lib.concatStringsSep " " langs;
fetchSrc = {name, sha256}: fetchurl {
- url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
+ url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
inherit sha256;
};
srcs = {
third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec {
- url = "http://dev-www.libreoffice.org/extern/${md5}-${name}";
+ url = "https://dev-www.libreoffice.org/extern/${md5}-${name}";
sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
name = "unowinreg.dll";
}) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs-still.nix));
translations = fetchSrc {
name = "translations";
- sha256 = "0mvfc33pkyrdd7h4kyi6lnzydaka8b5vw0ns50rw08kg9iirig4i";
+ sha256 = "0max423hdlr4j6y6ymng15awilh2aq8gly1hsf16lnk1pxihgr54";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "0yflll24yd4nxqxisb6mx1qgqk4awkwwi41wxmdaiq8las59sk95";
+ sha256 = "14ziy02qq092x8h29f9dlwvvk2scd5v385zhln4848lf3q5cnifl";
};
};
@@ -65,16 +65,15 @@ in stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
- NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
+ # And LO refers to gpgme++ by no-path name
+ NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++";
# If we call 'configure', 'make' will then call configure again without parameters.
# It's their system.
configureScript = "./autogen.sh";
dontUseCmakeConfigure = true;
- patches = [
- ./xdg-open.patch
- ];
+ patches = [ ./xdg-open-brief.patch ];
postUnpack = ''
mkdir -v $sourceRoot/src
@@ -84,6 +83,10 @@ in stdenv.mkDerivation rec {
ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
'';
+ postPatch = ''
+ sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx
+ '';
+
QT4DIR = qt4;
# Fix boost 1.59 compat
@@ -112,7 +115,7 @@ in stdenv.mkDerivation rec {
sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
# unit test sd_tiledrendering seems to be fragile
- # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+ # 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
# one more fragile test?
@@ -120,11 +123,11 @@ in stdenv.mkDerivation rec {
# 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@rtl::OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
+ sed -e 's@OString sSysPath("~/tmp");@& return ; @' -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
+ # 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
@@ -134,6 +137,7 @@ in stdenv.mkDerivation rec {
sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_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
# not sure about this fragile test
sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
'';
@@ -162,10 +166,6 @@ in stdenv.mkDerivation rec {
for a in sbase scalc sdraw smath swriter simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
- wrapProgram "$out/bin/$a" \
- --prefix XDG_DATA_DIRS : \
- "$out/share:$GSETTINGS_SCHEMAS_PATH" \
- ;
done
ln -s $out/bin/soffice $out/bin/libreoffice
@@ -191,6 +191,7 @@ in stdenv.mkDerivation rec {
"--disable-report-builder"
"--enable-python=system"
"--enable-dbus"
+ "--enable-release-build"
(lib.enableFeature kdeIntegration "kde4")
"--with-package-format=installed"
"--enable-epm"
@@ -241,21 +242,23 @@ in stdenv.mkDerivation rec {
buildInputs = with xorg;
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core
- CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
+ CompressZlib 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 mesa mythes gst_all_1.gstreamer
- gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
+ libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib
- mdds bluez5 glibc libcmis libwps libabw libzmf
- libxshmfence libatomic_ops graphite2 harfbuzz
- librevenge libe-book libmwaw glm glew ncurses
- libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
+ mdds bluez5 glibc libcmis libwps libabw libzmf libtool
+ libxshmfence libatomic_ops graphite2 harfbuzz gpgme
+ librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy
+ libodfgen CoinMP librdf_rasqal defaultIconTheme
+ gdb
]
++ lib.optional kdeIntegration kdelibs4;
+ nativeBuildInputs = [ wrapGAppsHook ];
passthru = {
inherit srcs;
@@ -265,7 +268,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Comprehensive, professional-quality productivity suite (Still/stable release)";
- homepage = http://libreoffice.org/;
+ homepage = https://libreoffice.org/;
license = licenses.lgpl3;
maintainers = with maintainers; [ viric raskin ];
platforms = platforms.linux;
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 6ce003ff25d9..a8664e6820a4 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, dpkg, which
, makeWrapper
, alsaLib
-, desktop_file_utils
+, desktop-file-utils
, dbus
, libcap
, fontconfig
@@ -15,16 +15,23 @@
, orc
, nss
, nspr
-, qt5
+, qtbase
+, qtsvg
+, qtdeclarative
+, qtwebchannel
+, qtquickcontrols
+, qtwebkit
+, qtwebengine
, sqlite
, xorg
-, xlibs
, zlib
# The provided wrapper does this, but since we don't use it
# we emulate the behavior. The downside is that this
# will leave entries on your system after uninstalling mendeley.
# (they can be removed by running '$out/bin/install-mendeley-link-handler.sh -u')
, autorunLinkHandler ? true
+# Update script
+, writeScript
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@@ -37,23 +44,23 @@ let
then "i386"
else "amd64";
- shortVersion = "1.17.11-stable";
+ shortVersion = "1.17.13-stable";
version = "${shortVersion}_${arch}";
url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
sha256 = if stdenv.system == arch32
- then "033855ix5qj1gwd3pa6qws5k94hgbp6rvibrrxl3rn5bvhrvvbkq"
- else "09h6br8qhvphkvzy28y1pnh7dhyigb3w41w3kjwqj6027i46chi7";
+ then "0q4x62k00whmq8lskphpcxc610cvclxzcr5k0v7pxjxs9sx5yx43"
+ else "01ylyily1hip35z0d4qkdpbzp5yn4r015psc5773xsqlgrnlwjm3";
deps = [
- qt5.qtbase
- qt5.qtsvg
- qt5.qtdeclarative
- qt5.qtwebchannel
- qt5.qtquickcontrols
- qt5.qtwebkit
- qt5.qtwebengine
+ qtbase
+ qtsvg
+ qtdeclarative
+ qtwebchannel
+ qtquickcontrols
+ qtwebkit
+ qtwebengine
alsaLib
dbus
freetype
@@ -70,7 +77,7 @@ let
orc
sqlite
xorg.libX11
- xlibs.xcbutilkeysyms
+ xorg.xcbutilkeysyms
xorg.libxcb
xorg.libXcomposite
xorg.libXext
@@ -96,6 +103,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ dpkg which ] ++ deps;
+ propagatedUserEnvPkgs = [ gconf ];
+
unpackPhase = "true";
installPhase = ''
@@ -119,17 +128,20 @@ stdenv.mkDerivation {
# Patch up link handler script
wrapProgram $out/bin/install-mendeley-link-handler.sh \
- --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop_file_utils ] }
+ --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop-file-utils ] }
'';
dontStrip = true;
dontPatchElf = true;
- meta = {
+ updateScript = import ./update.nix { inherit writeScript; };
+
+ meta = with stdenv.lib; {
homepage = http://www.mendeley.com;
description = "A reference manager and academic social network";
- license = stdenv.lib.licenses.unfree;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.unfree;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ dtzWill ];
};
}
diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix
new file mode 100644
index 000000000000..9ac82615c561
--- /dev/null
+++ b/pkgs/applications/office/mendeley/update.nix
@@ -0,0 +1,60 @@
+{ writeScript }:
+
+writeScript "update-mendeley" ''
+ function follow() {
+ local URL=$1
+ while true; do
+ NEWURL=$(curl -m20 -sI "$URL" -o /dev/null -w '%{redirect_url}')
+ [ -z "$NEWURL" ] && break
+ [[ $NEWURL = $URL ]] && (echo "redirect loop?!"; exit 1)
+ echo "Following $URL -> $NEWURL ..." >&2
+ URL=$NEWURL
+ done
+
+ echo $URL
+ }
+
+ amd64URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/amd64/mendeleydesktop-latest)
+ amd64V=$(basename $amd64URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+ i386URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/i386/mendeleydesktop-latest)
+ i386V=$(basename $i386URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+
+ echo "amd64 version: $amd64V"
+ echo "i386 version: $i386V"
+ if [[ $amd64V != $i386V ]]; then
+ echo "Versions not the same!"
+ exit 1
+ fi
+
+ if grep -q -F "$amd64V" ${./default.nix}; then
+ echo "No new version yet, nothing to do."
+ echo "Have a nice day!"
+ exit 0
+ fi
+
+ amd64OldHash=$(nix-instantiate --eval --strict -A "mendeley.src.drvAttrs.outputHash" --argstr system "x86_64-linux"| tr -d '"')
+ i386OldHash=$(nix-instantiate --eval --strict -A "mendeley.src.drvAttrs.outputHash" --argstr system "i686-linux"| tr -d '"')
+
+ echo "Prefetching amd64..."
+ amd64NewHash=$(nix-prefetch-url $amd64URL)
+ echo "Prefetching i386..."
+ i386NewHash=$(nix-prefetch-url $i386URL)
+
+ # Don't actually update, just report that an update is available
+ cat < 0.10.2)
- sequel (~> 4.0.0)
+ sequel (~> 4.43.0)
sqlite3 (~> 1.3.3)
PLATFORMS
diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix
index e68c753750f5..3564454a6741 100644
--- a/pkgs/applications/office/timetrap/default.nix
+++ b/pkgs/applications/office/timetrap/default.nix
@@ -1,14 +1,17 @@
{ stdenv, lib, bundlerEnv, ruby }:
-bundlerEnv {
- name = "timetrap-1.10.0";
+bundlerEnv rec {
+ name = "timetrap-${version}";
+ version = (import gemset).timetrap.version;
inherit ruby;
gemdir = ./.;
+ gemset = ./gemset.nix;
- meta = {
+ meta = with lib; {
description = "A simple command line time tracker written in ruby";
homepage = https://github.com/samg/timetrap;
- license = lib.licenses.mit;
+ license = licenses.mit;
+ maintainers = [ maintainers.jerith666 ];
};
}
diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix
index cbf90f8018ce..5764016573fc 100644
--- a/pkgs/applications/office/timetrap/gemset.nix
+++ b/pkgs/applications/office/timetrap/gemset.nix
@@ -10,25 +10,26 @@
sequel = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17kqm0vd15p9qxbgcysvmg6a046fd7zvxl3xzpsh00pg6v454svm";
+ sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0";
type = "gem";
};
- version = "4.0.0";
+ version = "4.43.0";
};
sqlite3 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny";
+ sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
type = "gem";
};
- version = "1.3.11";
+ version = "1.3.13";
};
timetrap = {
+ dependencies = ["chronic" "sequel" "sqlite3"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rdaa27zvdgmbsbwa59g3dvfwb95nz7x1wycmviby94j5lywyzfc";
+ sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd";
type = "gem";
};
- version = "1.10.0";
+ version = "1.15.1";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix
index 31774b6b55c1..51d5b083e6bd 100644
--- a/pkgs/applications/office/tryton/default.nix
+++ b/pkgs/applications/office/tryton/default.nix
@@ -4,10 +4,10 @@ with stdenv.lib;
python2Packages.buildPythonApplication rec {
name = "tryton-${version}";
- version = "4.2.1";
+ version = "4.6.2";
src = fetchurl {
url = "mirror://pypi/t/tryton/${name}.tar.gz";
- sha256 = "1ry3kvbk769m8rwqa90pplfvmmgsv4jj9w1aqhv892smia8f0ybm";
+ sha256 = "0bamr040np02gfjk8c734rw3mbgg75irfgpdcl2npgkdzyw1ksf9";
};
propagatedBuildInputs = with python2Packages; [
chardet
diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix
index e77287faae25..efa7f2a410d7 100644
--- a/pkgs/applications/office/trytond/default.nix
+++ b/pkgs/applications/office/trytond/default.nix
@@ -5,10 +5,10 @@ with stdenv.lib;
python2Packages.buildPythonApplication rec {
name = "trytond-${version}";
- version = "4.2.1";
+ version = "4.6.2";
src = fetchurl {
url = "mirror://pypi/t/trytond/${name}.tar.gz";
- sha256 = "1ijjpbsf3s0s7ksbi7xgzss4jgr14q5hqsyf6d68l8hwardrwpj7";
+ sha256 = "0asc3pd37h8ky8j66iqxr0fv0k6mpjcwxwm0xgm5hrdi32l5cdda";
};
# Tells the tests which database to use
diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix
index 76ad47950c49..dea3ea9731b0 100644
--- a/pkgs/applications/office/tudu/default.nix
+++ b/pkgs/applications/office/tudu/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
name = "tudu-${version}";
- version = "0.10";
+ version = "0.10.2";
src = fetchurl {
- url = "http://code.meskio.net/tudu/${name}.tar.gz";
- sha256 = "0571wh5hn0hgadyx34zq1zi35pzd7vpwkavm7kzb9hwgn07443x4";
+ url = "https://code.meskio.net/tudu/${name}.tar.gz";
+ sha256 = "1xsncvd1c6v8y0dzc5mspy9rrwc89pabhz6r2lihsirk83h2rqym";
};
buildInputs = [ ncurses ];
meta = {
description = "ncurses-based hierarchical todo list manager with vim-like keybindings";
- homepage = http://code.meskio.net/tudu/;
+ homepage = https://code.meskio.net/tudu/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
index a1fcfd5de700..e0f0c58b4506 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, pythonPackages }:
+{ stdenv, pythonPackages, fetchpatch }:
-pythonPackages.buildPythonApplication rec {
+with pythonPackages;
+
+buildPythonApplication rec {
pname = "td-watson";
- name = "${pname}-${version}";
- version = "1.4.0";
+ version = "1.5.2";
- src = pythonPackages.fetchPypi {
+ src = fetchPypi {
inherit version pname;
- sha256 = "1py0g4990jmvq0dn7jasda7f10kzr41bix46hnbyc1rshjzc17hq";
+ sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8";
};
# uses tox, test invocation fails
@@ -15,8 +16,16 @@ pythonPackages.buildPythonApplication rec {
checkPhase = ''
py.test -vs tests
'';
- checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
- propagatedBuildInputs = with pythonPackages; [ requests click arrow ];
+
+ patches = [
+ (fetchpatch {
+ url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch;
+ sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g";
+ })
+ ];
+
+ checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
+ propagatedBuildInputs = [ requests click arrow ];
meta = with stdenv.lib; {
homepage = https://tailordev.github.io/Watson/;
@@ -24,4 +33,4 @@ pythonPackages.buildPythonApplication rec {
license = licenses.mit;
maintainers = with maintainers; [ mguentner ] ;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
index 67f7e2816a48..be5ac7a2f2be 100644
--- a/pkgs/applications/office/wordgrinder/default.nix
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -1,24 +1,31 @@
{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper
-, lua52Packages, libXft, ncurses, readline, zlib }:
+, lua52Packages, libXft, ncurses, ninja, readline, zlib }:
stdenv.mkDerivation rec {
name = "wordgrinder-${version}";
- version = "0.6-db14181";
+ version = "0.7.1";
src = fetchFromGitHub {
repo = "wordgrinder";
owner = "davidgiven";
- rev = "db141815e8bd1da6e684a1142a59492e516f3041";
- sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2";
+ rev = "${version}";
+ sha256 = "19n4vn8zyvcvgwygm63d3jcmiwh6a2ikrrqqmkm8fvhdvwkqgr9k";
};
makeFlags = [
"PREFIX=$(out)"
"LUA_INCLUDE=${lua52Packages.lua}/include"
"LUA_LIB=${lua52Packages.lua}/lib/liblua.so"
- ];
+ ] ++ stdenv.lib.optional stdenv.isLinux "XFT_PACKAGE=--libs=\{-lX11 -lXft\}";
- nativeBuildInputs = [ pkgconfig makeWrapper ];
+ dontUseNinjaBuild = true;
+ dontUseNinjaInstall = true;
+
+ nativeBuildInputs = [
+ pkgconfig
+ makeWrapper
+ ninja
+ ];
buildInputs = [
libXft
@@ -29,11 +36,12 @@ stdenv.mkDerivation rec {
];
# To be able to find
- NIX_CFLAGS_COMPILE = "-I${libXft.dev}/include/X11";
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11";
# Binaries look for LuaFileSystem library (lfs.so) at runtime
postInstall = ''
wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
+ '' + stdenv.lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so";
'';
@@ -42,6 +50,6 @@ stdenv.mkDerivation rec {
homepage = https://cowlark.com/wordgrinder;
license = licenses.mit;
maintainers = with maintainers; [ matthiasbeyer ];
- platforms = with stdenv.lib.platforms; linux;
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index 2130e64a2a3a..f8785616c5e6 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- fetchurl, fetchpatch,
+ fetchFromGitHub,
extra-cmake-modules,
qtbase, boost,
akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap,
@@ -9,22 +9,16 @@
mkDerivation rec {
pname = "zanshin";
- version = "0.4.1";
+ version = "2017-11-25";
name = "${pname}-${version}";
- src = fetchurl {
- url = "https://files.kde.org/${pname}/${name}.tar.bz2";
- sha256 = "1llqm4w4mhmdirgrmbgwrpqyn47phwggjdghf164k3qw0bi806as";
+ src = fetchFromGitHub {
+ owner = "KDE";
+ repo = "zanshin";
+ rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89";
+ sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m";
};
- patches = [
- (fetchpatch {
- name = "zanshin-fix-qt59-build.patch";
- url = "https://phabricator.kde.org/R4:77ad64872f69ad9f7abe3aa8e103a12b95e100a4?diff=1";
- sha256 = "0p497gqd3jmhbmqzh46zp6zwf6j1q77a9jp0in49xhgc2kj5ar7x";
- })
- ];
-
nativeBuildInputs = [
extra-cmake-modules
];
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 48b278cc1dfb..9f7048f36462 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,11 +9,11 @@
python2Packages.buildPythonApplication rec {
name = "zim-${version}";
- version = "0.67";
+ version = "0.68";
src = fetchurl {
url = "http://zim-wiki.org/downloads/${name}.tar.gz";
- sha256 = "1gdbzy9qyzj3rn9fsl0ss7lbk9kyka99656bphx2dah694yyyz5k";
+ sha256 = "05fzb24a2s3pm89zb6gwa48wb925an5i652klx8yk9pn23h1h5fr";
};
propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index b259623bf91e..2f9999ab856c 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings_desktop_schemas, gtk3, gnome3 }:
+{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }:
let
-version = "5.0.25";
+version = "5.0.35.1";
meta = with stdenv.lib; {
homepage = https://www.zotero.org;
description = "Collect, organize, cite, and share your research sources";
@@ -15,10 +15,10 @@ zoteroSrc = stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
- sha256 = "1y3q5582xp4inpz137x0r9iscs1g0cjlqcfjpzl3klsq3yas688k";
+ sha256 = "0d2imvp84svllrnja1dl4nldp634z632g5xkm2q9v7j3dwbzw1hw";
};
- buildInputs= [ wrapGAppsHook gsettings_desktop_schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
+ buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
phases = [ "unpackPhase" "installPhase" "fixupPhase"];
installPhase = ''
@@ -31,8 +31,8 @@ zoteroSrc = stdenv.mkDerivation rec {
fhsEnv = buildFHSUserEnv {
name = "zotero-fhs-env";
- targetPkgs = pkgs: with pkgs; with xlibs; [
- gtk3 dbus_glib
+ targetPkgs = pkgs: with pkgs; with xorg; [
+ gtk3 dbus-glib
libXt nss
];
};
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index fe6a3a41a236..328253c53437 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, mesa, pkgconfig, perl, autoreconfHook, glib, cairo
+, lua, libGLU_combined, pkgconfig, perl, autoreconfHook, glib, cairo
, pango, gdk_pixbuf, atk
}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa lua
+ buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU_combined lua
perl autoreconfHook ];
patchPhase = ''
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix
new file mode 100644
index 000000000000..9bacf6d90417
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gpredict/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, intltool
+, gtk3, glib, curl, goocanvas2, gpsd
+, hamlib, wrapGAppsHook
+}:
+
+let
+ version = "2.2.1";
+in stdenv.mkDerivation {
+ name = "gpredict-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2";
+ sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7";
+ };
+
+ nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
+ buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ];
+
+ meta = with stdenv.lib; {
+ description = "Real time satellite tracking and orbit prediction";
+ longDescription = ''
+ Gpredict is a real time satellite tracking and orbit prediction program
+ written using the Gtk+ widgets. Gpredict is targetted mainly towards ham radio
+ operators but others interested in satellite tracking may find it useful as
+ well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the
+ NORAD Keplerian elements.
+ '';
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ homepage = http://gpredict.oz9aec.net/;
+ maintainers = [ maintainers.markuskowa maintainers.cmcdragonkai ];
+ };
+}
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index 5903edd337df..d572dd55b2b2 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, mesa, libpng, lua5, autoconf, automake }:
+{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU_combined, libpng, lua5, autoconf, automake }:
stdenv.mkDerivation rec {
name = "gravit-0.5.1";
@@ -8,11 +8,18 @@ stdenv.mkDerivation rec {
sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
};
- buildInputs = [ mesa SDL SDL_ttf SDL_image lua5 libpng libSM libICE ];
+ buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image lua5 libpng libSM libICE ];
nativeBuildInputs = [ autoconf automake ];
- preConfigure = "./autogen.sh";
+ preConfigure = ''
+ ./autogen.sh
+
+ # Build fails on Linux with windres.
+ export ac_cv_prog_WINDRES=
+ '';
+
+ enableParallelBuilding = true;
meta = {
homepage = http://gravit.slowchop.com;
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 32eaa37375f8..3c7af809b884 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchurl
-, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
+, cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv
, qtscript, qtserialport, qttools
, qtmultimedia, qtlocation
}:
@@ -16,7 +16,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake perl ];
buildInputs = [
- freetype libpng mesa openssl libiconv qtscript qtserialport qttools
+ freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools
qtmultimedia qtlocation
];
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index db12fc00c87c..5e899568a7df 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "bcftools";
- version = "1.6";
+ version = "1.7";
src = fetchurl {
url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2";
- sha256 = "10prgmf09a13mk18840938ijqgfc9y92hfc7sa2gcv07ddri0c19";
+ sha256 = "1l82sgw86l1626b7kxv3h0696lbj7317bb48rvqb1zqd3gcn6kyx";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix
index d6e00659c1a9..406f42e9ad7b 100644
--- a/pkgs/applications/science/biology/bedtools/default.nix
+++ b/pkgs/applications/science/biology/bedtools/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "bedtools-${version}";
- version = "2.26.0";
+ version = "2.27.1";
src = fetchFromGitHub {
owner = "arq5x";
repo = "bedtools2";
rev = "v${version}";
- sha256 = "1j2ia68rmcw3qksjm5gvv1cb84bh76vmln59mvncr2an23f5a3ss";
+ sha256 = "1pk68y052rm2m24yfmy82ms8p6kd6xcqxxgi7n0a1sbh89wllm6s";
};
buildInputs = [ zlib python ];
diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix
index 05a85cafedf1..829672d64cc2 100644
--- a/pkgs/applications/science/biology/bowtie2/default.nix
+++ b/pkgs/applications/science/biology/bowtie2/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "bowtie2";
- version = "2.3.3.1";
+ version = "2.3.4.1";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "BenLangmead";
repo = pname;
rev = "v${version}";
- sha256 = "1pcyks76bnnkq6h0gqjw4fkdddjjnw7k5ibim7ajkbvfw58a99y0";
+ sha256 = "07cvcy6483araayj41arjzpxjmf4fmn4iqyl6gp6zmrbzw72wwzj";
};
buildInputs = [ zlib tbb ];
diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix
index bc13032f1aac..d1dbacf053fb 100644
--- a/pkgs/applications/science/biology/bwa/default.nix
+++ b/pkgs/applications/science/biology/bwa/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "bwa-${version}";
- version = "0.7.16a";
+ version = "0.7.17";
src = fetchurl {
url = "mirror://sourceforge/bio-bwa/${name}.tar.bz2";
- sha256 = "0w61zxh6b4isydw5qp6pdb1mc50jg1h8vhahw2xm24w7i1gxpv4g";
+ sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy";
};
buildInputs = [ zlib ];
diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix
new file mode 100644
index 000000000000..781ceb3df59e
--- /dev/null
+++ b/pkgs/applications/science/biology/dcm2niix/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, libyamlcpp
+}:
+
+stdenv.mkDerivation rec {
+ version = "1.0.20170130";
+ name = "dcm2niix-${version}";
+
+ src = fetchFromGitHub {
+ owner = "rordenlab";
+ repo = "dcm2niix";
+ rev = "v${version}";
+ sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532";
+ };
+
+ enableParallelBuilding = true;
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ libyamlcpp ];
+
+ meta = with stdenv.lib; {
+ description = "dcm2niix DICOM to NIfTI converter";
+ longDescription = ''
+ dcm2niix is a designed to convert neuroimaging data from the
+ DICOM format to the NIfTI format.
+ '';
+ homepage = https://www.nitrc.org/projects/dcm2nii;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.ashgillman ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index a2a40f0acc80..853203e7dbb1 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "igv-${version}";
- version = "2.3.98";
+ version = "2.4.9";
src = fetchurl {
- url = "http://data.broadinstitute.org/igv/projects/downloads/IGV_${version}.zip";
- sha256 = "1bjdsvx8jsbcry6v7yfclh3vrlsvaw38f3s9587lklj63zj638l2";
+ url = "http://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
+ sha256 = "0acyq7602g2pz6mc9ip1297c68kgl9pq9yzk3k2lli9l5qvxi3g1";
};
buildInputs = [ unzip jre ];
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
new file mode 100644
index 000000000000..d80ffea9a780
--- /dev/null
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, hdf5, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "kallisto-${version}";
+ version = "0.43.1";
+
+ src = fetchFromGitHub {
+ repo = "kallisto";
+ owner = "pachterlab";
+ rev = "v${version}";
+ sha256 = "04697pf7jvy7vw126s1rn09q4iab9223jvb1nb0jn7ilwkq7pgwz";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ hdf5 zlib ];
+
+ meta = with stdenv.lib; {
+ description = "kallisto is a program for quantifying abundances of transcripts from RNA-Seq data";
+ homepage = https://pachterlab.github.io/kallisto;
+ license = licenses.bsd2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.arcadio ];
+ };
+}
diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix
index aae0cf40cee3..7864658c9582 100644
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, perl, cmake, flex, bison, libminc }:
+{ stdenv, fetchFromGitHub, perl, cmake, flex, bison, libminc }:
stdenv.mkDerivation rec {
- _name = "minc-tools";
- name = "${_name}-2.3.00";
+ name = "${pname}-2.3.00";
+ pname = "minc-tools";
- src = fetchurl {
- url = "https://github.com/BIC-MNI/${_name}/archive/${_name}-2-3-00.tar.gz";
- sha256 = "1d457vrwy2fl6ga2axnwn1cchkx2rmgixfzyb1zjxb06cxkfj1dm";
+ src = fetchFromGitHub {
+ owner = "BIC-MNI";
+ repo = pname;
+ rev = builtins.replaceStrings [ "." ] [ "-" ] name;
+ sha256 = "0px5paprx4ds9aln3jdg1pywszgyz2aykgkdbj1y8gc1lwcizsl9";
};
nativeBuildInputs = [ cmake flex bison ] ++ (if doCheck then [ perl ] else [ ]);
@@ -17,6 +19,8 @@ stdenv.mkDerivation rec {
checkPhase = "ctest";
doCheck = false;
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
homepage = https://github.com/BIC-MNI/minc-tools;
description = "Command-line utilities for working with MINC files";
diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix
new file mode 100644
index 000000000000..9cbabc7ab37e
--- /dev/null
+++ b/pkgs/applications/science/biology/muscle/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ _name = "muscle";
+ name = "${_name}-${version}";
+ version = "3.8.31";
+
+ src = fetchurl {
+ url = "https://www.drive5.com/muscle/downloads${version}/${_name}${version}_src.tar.gz";
+ sha256 = "1b89z0x7h098g99g00nqadgjnb2r5wpi9s11b7ddffqkh9m9dia3";
+ };
+
+ patches = [
+ ./muscle-3.8.31-no-static.patch
+ ];
+
+ preBuild = ''
+ cd ./src/
+ patchShebangs mk
+ '';
+
+ installPhase = ''
+ install -vD muscle $out/bin/muscle
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A multiple sequence alignment method with reduced time and space complexity";
+ license = licenses.publicDomain;
+ homepage = https://www.drive5.com/muscle/;
+ maintainers = [ maintainers.unode ];
+ # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails.
+ # Anyone with access to these platforms is welcome to give it a try
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch
new file mode 100644
index 000000000000..7f4b2129518d
--- /dev/null
+++ b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch
@@ -0,0 +1,21 @@
+--- a/src/mk 2010-05-02 01:15:42.000000000 +0200
++++ b/src/mk 2018-01-27 17:07:23.539092748 +0100
+@@ -5,14 +5,14 @@
+ rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt
+ for CPPName in $CPPNames
+ do
+- echo $CPPName >> /dev/tty
++ echo $CPPName
+ g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
+ done
+
+ LINK_OPTS=
+-if [ `uname -s` == Linux ] ; then
+- LINK_OPTS=-static
+-fi
++#if [ `uname -s` == Linux ] ; then
++# LINK_OPTS=-static
++#fi
+ g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
+ tail muscle.make.stderr.txt
+
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index 589c2809a931..bfadf9e704a7 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.9c";
+ version = "4.9g";
name = "paml-${version}";
src = fetchurl {
url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
- sha256 = "18a1l47223l7jyjavm8a8la84q9k9kbxwmj7kz4z3pdx70qrl04j";
+ sha256 = "1kxkl47azkrsmdxiymnc76c2ccc514vlfnjvvm7lwch5l43j029h";
};
preBuild = ''
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 3f17825202ea..ddcfbf00bf9e 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 {
name = "picard-tools-${version}";
- version = "2.7.1";
+ version = "2.17.11";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "0rcfcvy9zacqmh7nyqlm93hzsx6gfygmcf8d2p02h5l69gvygnb9";
+ sha256 = "1p50bzkwq5hrwal6i679yrkdqkh5hk4bb9l9gdff2x2i761v9y9b";
};
buildInputs = [ jre makeWrapper ];
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix
new file mode 100644
index 000000000000..0bac6c778049
--- /dev/null
+++ b/pkgs/applications/science/biology/raxml/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, fetchFromGitHub
+, zlib
+, pkgs
+, mpi ? false
+}:
+
+stdenv.mkDerivation rec {
+ pname = "RAxML";
+ version = "8.2.11";
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "stamatak";
+ repo = "standard-${pname}";
+ rev = "v${version}";
+ sha256 = "08fmqrr7y5a2fmmrgfz2p0hmn4mn71l5yspxfcwwsqbw6vmdfkhg";
+ };
+
+ buildInputs = if mpi then [ pkgs.openmpi ] else [];
+
+ # TODO darwin, AVX and AVX2 makefile targets
+ buildPhase = if mpi then ''
+ make -f Makefile.MPI.gcc
+ '' else ''
+ make -f Makefile.SSE3.PTHREADS.gcc
+ '';
+
+ installPhase = if mpi then ''
+ mkdir -p $out/bin && cp raxmlHPC-MPI $out/bin
+ '' else ''
+ mkdir -p $out/bin && cp raxmlHPC-PTHREADS-SSE3 $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A tool for Phylogenetic Analysis and Post-Analysis of Large Phylogenies";
+ license = licenses.gpl3;
+ homepage = https://sco.h-its.org/exelixis/web/software/raxml/;
+ maintainers = [ maintainers.unode ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index 640f32671bbd..365057414e99 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "samtools";
- version = "1.6";
+ version = "1.7";
src = fetchurl {
url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2";
- sha256 = "17p4vdj2j2qr3b2c0v4100h6cg4jj3zrb4dmdnd9d9aqs74d4p7f";
+ sha256 = "e7b09673176aa32937abd80f95f432809e722f141b5342186dfef6a53df64ca1";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch b/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch
new file mode 100644
index 000000000000..a7782a1a0264
--- /dev/null
+++ b/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 2f51bfc..395d6f1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ CC= gcc
+ CFLAGS= -g -Wall -O2
+ #LDFLAGS= -Wl,-rpath,\$$ORIGIN/../lib
+-DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE -D_CURSES_LIB=1
++DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE # -D_CURSES_LIB=1
+ KNETFILE_O= knetfile.o
+ LOBJS= bgzf.o kstring.o bam_aux.o bam.o bam_import.o sam.o bam_index.o \
+ bam_pileup.o bam_lpileup.o bam_md.o razf.o faidx.o bedidx.o \
+@@ -15,7 +15,7 @@ PROG= samtools
+ INCLUDES= -I.
+ SUBDIRS= . bcftools misc
+ LIBPATH=
+-LIBCURSES= -lcurses # -lXCurses
++LIBCURSES= # -lcurses # -lXCurses
+
+ .SUFFIXES:.c .o
+ .PHONY: all lib
diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
new file mode 100644
index 000000000000..a811bc4412f2
--- /dev/null
+++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "samtools";
+ version = "0.1.19";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/samtools/${name}.tar.bz2";
+ sha256 = "d080c9d356e5f0ad334007e4461cbcee3c4ca97b8a7a5a48c44883cf9dee63d4";
+ };
+
+ patches = [
+ ./samtools-0.1.19-no-curses.patch
+ ];
+
+ buildInputs = [ zlib ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share/man
+
+ cp samtools $out/bin
+ cp samtools.1 $out/share/man
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Tools for manipulating SAM/BAM/CRAM format";
+ license = licenses.mit;
+ homepage = http://samtools.sourceforge.net/;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.unode ];
+ };
+}
diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix
index 844374fceb95..9c2d273b0881 100644
--- a/pkgs/applications/science/biology/snpeff/default.nix
+++ b/pkgs/applications/science/biology/snpeff/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "snpeff-${version}";
- version = "4.3p";
+ version = "4.3q";
src = fetchurl {
- url = "mirror://sourceforge/project/snpeff/snpEff_v4_3p_core.zip";
- sha256 = "1xb3k0yxd634znw2q083ligm2ww4p6v64041r9sdy3930lhjvxb1";
+ url = "mirror://sourceforge/project/snpeff/snpEff_v4_3q_core.zip";
+ sha256 = "0sxz8zy8wrzcy01hyb1cirwbxqyjw30a2x3q6p4l7zmw2szi7mn1";
};
buildInputs = [ unzip jre makeWrapper ];
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
new file mode 100644
index 000000000000..1642739140d6
--- /dev/null
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "star-${version}";
+ version = "2.5.3a";
+
+ src = fetchFromGitHub {
+ repo = "STAR";
+ owner = "alexdobin";
+ rev = version;
+ sha256 = "1fd9xl7i1zxgsxn2qf6gz8s42g2djm29qmp6qb35d8nnxh8ns54x";
+ };
+
+ sourceRoot = "source/source";
+
+ postPatch = "sed 's:/bin/rm:rm:g' -i Makefile";
+
+ buildInputs = [ zlib ];
+
+ buildPhase = "make STAR STARlong";
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp STAR STARlong $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Spliced Transcripts Alignment to a Reference";
+ homepage = https://github.com/alexdobin/STAR;
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.arcadio ];
+ };
+}
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix
index 878dfde8f4e2..78cda9d115ce 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, mesa, libX11, doxygen }:
+{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU_combined, libX11, doxygen }:
stdenv.mkDerivation rec {
name = "avogadro-1.1.1";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy";
};
- buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ];
+ buildInputs = [ qt4 eigen zlib openbabel libGLU_combined libX11 ];
nativeBuildInputs = [ cmake pkgconfig doxygen ];
- NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h";
+ NIX_CFLAGS_COMPILE = "-include ${libGLU_combined}/include/GL/glu.h";
meta = {
description = "Molecule editor and visualizer";
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
new file mode 100644
index 000000000000..1472b4b2af9e
--- /dev/null
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, which, gfortran, libGLU, xorg } :
+
+stdenv.mkDerivation rec {
+ version = "5.7";
+ name = "molden-${version}";
+
+ src = fetchurl {
+ url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
+ sha256 = "0gaq11gm09ax25lvgfrvxv9dxvi76hps116fp6k7sqgvdd68vf0s";
+ };
+
+ nativeBuildInputs = [ which ];
+ buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ];
+
+ postPatch = ''
+ substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \
+ --replace '-I/usr/X11R6/include' "" \
+ --replace '/usr/local/' $out/ \
+ --replace 'sudo' "" \
+ --replace '-C surf depend' '-C surf'
+ sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile
+ '';
+
+ preInstall = ''
+ mkdir -p $out/bin
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Display and manipulate molecular structures";
+ homepage = http://www.cmbi.ru.nl/molden/;
+ license = {
+ fullName = "Free for academic/non-profit use";
+ url = http://www.cmbi.ru.nl/molden/CopyRight.html;
+ free = false;
+ };
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ markuskowa ];
+ };
+}
+
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
new file mode 100644
index 000000000000..2ff20fef40e8
--- /dev/null
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, symlinkJoin, gfortran, perl, procps
+, libyaml, libxc, fftw, openblas, gsl
+}:
+
+let
+ version = "7.2";
+ fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
+
+in stdenv.mkDerivation {
+ name = "octopus-${version}";
+
+ src = fetchurl {
+ url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
+ sha256 = "03zzmq72zdnjkhifbmlxs7ig7x6sf6mv8zv9mxhakm9hzwa9yn7m";
+ };
+
+ nativeBuildInputs = [ perl procps fftw.dev ];
+ buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out ];
+
+ configureFlags = ''
+ --with-yaml-prefix=${libyaml}
+ --with-blas=-lopenblas
+ --with-lapack=-lopenblas
+ --with-fftw-prefix=${fftwAll}
+ --with-gsl-prefix=${gsl}
+ --with-libxc-prefix=${libxc}
+ '';
+
+ doCheck = false;
+ checkTarget = "check-short";
+
+ postPatch = ''
+ patchShebangs ./
+ '';
+
+ postConfigure = ''
+ patchShebangs testsuite/oct-run_testsuite.sh
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Real-space time dependent density-functional theory code";
+ homepage = http://octopus-code.org;
+ maintainers = with maintainers; [ markuskowa ];
+ license = licenses.gpl2;
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix
new file mode 100644
index 000000000000..e1db7131a65b
--- /dev/null
+++ b/pkgs/applications/science/electronics/bitscope/common.nix
@@ -0,0 +1,70 @@
+{ atk
+, buildFHSUserEnv
+, cairo
+, dpkg
+, fetchurl
+, gdk_pixbuf
+, glib
+, gtk2-x11
+, makeWrapper
+, pango
+, stdenv
+, writeTextFile
+, xorg
+}:
+
+{ src, toolName, version, ... } @ attrs:
+let
+ wrapBinary = libPaths: binaryName: ''
+ wrapProgram "$out/bin/${binaryName}" \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}"
+ '';
+ pkg = stdenv.mkDerivation (rec {
+ inherit (attrs) version src;
+
+ name = "${toolName}-${version}";
+
+ meta = with stdenv.lib; {
+ homepage = http://bitscope.com/software/;
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [
+ vidbina
+ ];
+ } // (attrs.meta or {});
+
+ buildInputs = [
+ dpkg
+ makeWrapper
+ ];
+
+ libs = attrs.libs or [
+ atk
+ cairo
+ gdk_pixbuf
+ glib
+ gtk2-x11
+ pango
+ xorg.libX11
+ ];
+
+ dontBuild = true;
+
+ unpackPhase = attrs.unpackPhase or ''
+ dpkg-deb -x ${attrs.src} ./
+ '';
+
+ installPhase = attrs.installPhase or ''
+ mkdir -p "$out/bin"
+ cp -a usr/* "$out/"
+ ${(wrapBinary libs) attrs.toolName}
+ '';
+ });
+ fhs = target: buildFHSUserEnv {
+ inherit (pkg) name;
+ runScript = target;
+ };
+in buildFHSUserEnv {
+ name = "${attrs.toolName}-${attrs.version}";
+ runScript = "${pkg.outPath}/bin/${attrs.toolName}";
+} // { inherit (pkg) meta name; }
diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix
new file mode 100644
index 000000000000..c10e9de851a4
--- /dev/null
+++ b/pkgs/applications/science/electronics/bitscope/packages.nix
@@ -0,0 +1,153 @@
+{ buildFHSUserEnv
+, callPackage
+, fetchurl
+, makeWrapper
+, stdenv
+}:
+
+let
+ wrapBinary = libPaths: binaryName: ''
+ wrapProgram "$out/bin/${binaryName}" \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}"
+ '';
+ mkBitscope = callPackage (import ./common.nix) { };
+in {
+ chart = let
+ toolName = "bitscope-chart";
+ version = "2.0.FK22M";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Multi-channel waveform data acquisition and chart recording application";
+ homepage = "http://bitscope.com/software/chart/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "08mc82pjamyyyhh15sagsv0sc7yx5v5n54bg60fpj7v41wdwrzxw";
+ };
+ };
+
+ console = let
+ toolName = "bitscope-console";
+ version = "1.0.FK29A";
+ in mkBitscope {
+ # NOTE: this is meant as a demo by BitScope
+ inherit toolName version;
+
+ meta = {
+ description = "Demonstrative communications program designed to make it easy to talk to any model BitScope";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "00b4gxwz7w6pmfrcz14326b24kl44hp0gzzqcqxwi5vws3f0y49d";
+ };
+ };
+
+ display = let
+ toolName = "bitscope-display";
+ version = "1.0.EC17A";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Display diagnostic application for BitScope";
+ homepage = "http://bitscope.com/software/display/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "05xr5mnka1v3ibcasg74kmj6nlv1nmn3lca1wv77whkq85cmz0s1";
+ };
+ };
+
+ dso = let
+ toolName = "bitscope-dso";
+ version = "2.8.FE22H";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Test and measurement software for BitScope";
+ homepage = "http://bitscope.com/software/dso/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "0fc6crfkprj78dxxhvhbn1dx1db5chm0cpwlqpqv8sz6whp12mcj";
+ };
+ };
+
+ logic = let
+ toolName = "bitscope-logic";
+ version = "1.2.FC20C";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Mixed signal logic timing and serial protocol analysis software for BitScope";
+ homepage = "http://bitscope.com/software/logic/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "0lkb7z9gfkiyxdwh4dq1zxfls8gzdw0na1vrrbgnxfg3klv4xns3";
+ };
+ };
+
+ meter = let
+ toolName = "bitscope-meter";
+ version = "2.0.FK22G";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Automated oscilloscope, voltmeter and frequency meter for BitScope";
+ homepage = "http://bitscope.com/software/logic/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "0nirbci6ymhk4h4bck2s4wbsl5r9yndk2jvvv72zwkg21248mnbp";
+ };
+ };
+
+ proto = let
+ toolName = "bitscope-proto";
+ version = "0.9.FG13B";
+ in mkBitscope rec {
+ inherit toolName version;
+ # NOTE: this is meant as a demo by BitScope
+ # NOTE: clicking on logo produces error
+ # TApplication.HandleException Executable not found: "http://bitscope.com/blog/DK/?p=DK15A"
+
+ meta = {
+ description = "Demonstrative prototype oscilloscope built using the BitScope Library";
+ homepage = "http://bitscope.com/blog/DK/?p=DK15A";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "1ybjfbh3narn29ll4nci4b7rnxy0hj3wdfm4v8c6pjr8pfvv9spy";
+ };
+ };
+
+ server = let
+ toolName = "bitscope-server";
+ version = "1.0.FK26A";
+ in mkBitscope {
+ inherit toolName version;
+
+ meta = {
+ description = "Remote access server solution for any BitScope";
+ homepage = "http://bitscope.com/software/server/";
+ };
+
+ src = fetchurl {
+ url = "http://bitscope.com/download/files/${toolName}_${version}_amd64.deb";
+ sha256 = "1079n7msq6ks0n4aasx40rd4q99w8j9hcsaci71nd2im2jvjpw9a";
+ };
+ };
+}
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index e866b947fbc2..4da7f0f608f7 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gtkwave-${version}";
- version = "3.3.86";
+ version = "3.3.87";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
- sha256 = "1l1hikhhk7drkbpdmj9qg7c3lj1b86z7f5rnwagrql8bss2j80fx";
+ sha256 = "0yjvxvqdl276wv0y55bqxwna6lwc99hy6dkfiy6bij3nd1qm5rf6";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index dc13f751b89f..8e98bad55c3d 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }:
+{ stdenv, fetchurl, fetchbzr, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }:
stdenv.mkDerivation rec {
name = "kicad-${version}";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ];
+ buildInputs = [ cmake libGLU_combined wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ];
# They say they only support installs to /usr or /usr/local,
# so we have to handle this.
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
new file mode 100644
index 000000000000..21eddde82672
--- /dev/null
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -0,0 +1,54 @@
+{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib
+, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
+, doxygen, pcre, libpthreadstubs, libXdmcp
+
+, oceSupport ? true, opencascade_oce
+, ngspiceSupport ? true, ngspice
+, scriptingSupport ? true, swig, python, wxPython
+}:
+
+with lib;
+stdenv.mkDerivation rec {
+ name = "kicad-unstable-${version}";
+ version = "2018-03-10";
+
+ src = fetchFromGitHub {
+ owner = "KICad";
+ repo = "kicad-source-mirror";
+ rev = "17c0917dac12ea0be50ff95cee374a0cd8b7f862";
+ sha256 = "1yn5hj5hjnpb5fkzzlyawg62a96fbfvha49395s22dcp95riqvf0";
+ };
+
+ postPatch = ''
+ substituteInPlace CMakeModules/KiCadVersion.cmake \
+ --replace no-vcs-found ${version}
+ '';
+
+ cmakeFlags =
+ optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ]
+ ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"
+ ++ optionals (scriptingSupport) [
+ "-DKICAD_SCRIPTING=ON"
+ "-DKICAD_SCRIPTING_MODULES=ON"
+ "-DKICAD_SCRIPTING_WXPYTHON=ON"
+ # nix installs wxPython headers in wxPython package, not in wxwidget
+ # as assumed. We explicitely set the header location.
+ "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0"
+ ];
+
+ nativeBuildInputs = [ cmake doxygen pkgconfig ];
+ buildInputs = [
+ libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
+ cairo curl openssl boost
+ ] ++ optional (oceSupport) opencascade_oce
+ ++ optional (ngspiceSupport) ngspice
+ ++ optionals (scriptingSupport) [ swig python wxPython ];
+
+ meta = {
+ description = "Free Software EDA Suite, Nightly Development Build";
+ homepage = http://www.kicad-pcb.org/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ berce ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
new file mode 100644
index 000000000000..ea0ebd52b3eb
--- /dev/null
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, libGLU_combined, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "librepcb-${version}";
+ version = "20171229";
+
+ src = fetchFromGitHub {
+ owner = "LibrePCB";
+ repo = "LibrePCB";
+ fetchSubmodules = true;
+ rev = "4efb06fa42755abc5e606da4669cc17e8de2f8c6";
+ sha256 = "0r33fm1djqpy0dzvnf5gv2dfh5nj2acaxb7w4cn8yxdgrazjf7ak";
+ };
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ qmake qttools ];
+
+ buildInputs = [ qtbase ];
+
+ # LibrePCB still supports QT below 5.9. But some code lines break the build, so they are removed by this patch so that the software builds.
+ patches = [ ./fix-2017-12.patch ];
+
+ qmakeFlags = ["-r"];
+
+ meta = with stdenv.lib; {
+ description = "A free EDA software to develop printed circuit boards";
+ homepage = http://librepcb.org/;
+ maintainers = with maintainers; [ luz ];
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch b/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch
new file mode 100644
index 000000000000..75fc590ad7fe
--- /dev/null
+++ b/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch
@@ -0,0 +1,29 @@
+--- a/libs/librepcb/common/fileio/serializableobjectlist.h
++++ b/libs/librepcb/common/fileio/serializableobjectlist.h
+@@ -374,26 +374,6 @@
+ } // namespace librepcb
+
+ /*****************************************************************************************
+- * Prevent from using SerializableObjectList in a foreach loop because it always would
+- * create a deep copy of the list! You should use C++11 range based for loops instead.
+- ****************************************************************************************/
+-
+-#if (QT_VERSION > QT_VERSION_CHECK(5, 9, 0))
+-#define QFOREACHCONTAINER_TEMPLATE QtPrivate::QForeachContainer
+-#else
+-#define QFOREACHCONTAINER_TEMPLATE QForeachContainer
+-#endif
+-
+-template
+-class QFOREACHCONTAINER_TEMPLATE> { public:
+- ~QForeachContainer() = delete;
+-};
+-template
+-class QFOREACHCONTAINER_TEMPLATE> { public:
+- ~QForeachContainer() = delete;
+-};
+-
+-/*****************************************************************************************
+ * End of File
+ ****************************************************************************************/
+
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index ee7c0a5844d4..114a2eea85f5 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}:
stdenv.mkDerivation {
- name = "ngspice-26";
+ name = "ngspice-27";
src = fetchurl {
- url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
- sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
+ url = "mirror://sourceforge/ngspice/ngspice-27.tar.gz";
+ sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c";
};
buildInputs = [ readline libX11 flex bison libICE libXaw libXext ];
diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix
index 6b792310e8b4..b9bbcd695f17 100644
--- a/pkgs/applications/science/electronics/pcb/default.nix
+++ b/pkgs/applications/science/electronics/pcb/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }:
+{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex
+, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined
+, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg
+}:
stdenv.mkDerivation rec {
name = "pcb-${version}";
@@ -10,7 +13,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ];
+ buildInputs = [
+ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper
+ libGLU_combined tcl shared-mime-info tk
+ gnome2.gtkglext pangox_compat gd xorg.libXmu
+ ];
configureFlags = ["--disable-update-desktop-database"];
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 31c2d4f6475e..75e99dcf6594 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "verilator-${version}";
- version = "3.900";
+ version = "3.922";
src = fetchurl {
url = "http://www.veripool.org/ftp/${name}.tgz";
- sha256 = "0yvbibcysdiw6mphda0lfs56wz6v450px2420x0hbd3rc7k53s2b";
+ sha256 = "1srv8d1w3mwblfydznl3frswg98i3dkylx8x18c4807wsjk8vflg";
};
enableParallelBuilding = true;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Fast and robust (System)Verilog simulator/compiler";
- homepage = "http://www.veripool.org/wiki/verilator";
+ homepage = "https://www.veripool.org/wiki/verilator";
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index bd4ccea231b3..9e6243c54980 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -21,15 +21,17 @@ stdenv.mkDerivation {
};
buildInputs = with ocamlPackages; [
- ocaml findlib camlp4 ansiterminal biniou bolt ocaml_cairo2 dypgen easy-format ocf yojson
+ ocaml findlib camlp4 ansiterminal biniou bolt cairo2 dypgen easy-format ocf yojson
];
patches = [ ./install-emacs-to-site-lisp.patch
./use-nix-ocaml-byteflags.patch ];
- postPatch = stdenv.lib.optionalString (camlp4 != null) ''
+ postPatch = optionalString (camlp4 != null) ''
substituteInPlace src/Makefile.master.in \
--replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/"
+ '' + optionalString (versionAtLeast (stdenv.lib.getVersion ocamlPackages.yojson) "1.4") ''
+ substituteInPlace src/scripting/Makefile.in --replace yojson.cmo yojson.cma
'';
# The bytecode executable is dependent on the dynamic library provided by
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index ee9e580a7b87..5e1a448a7cf9 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -1,34 +1,46 @@
-{ stdenv, fetchFromGitHub, zlib, boost, glucose }:
+{ stdenv, fetchurl, fetchFromGitHub, zlib, boost, glucose }:
+
+let
+ glucose' = fetchurl {
+ url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
+ sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
+ };
+in
+
stdenv.mkDerivation rec {
- name = "aspino-2016-01-31";
+ name = "aspino-unstable-2017-03-09";
src = fetchFromGitHub {
owner = "alviano";
repo = "aspino";
- rev = "d28579b5967988b88bce6d9964a8f0a926286e9c";
- sha256 = "0r9dnkq3rldv5hhnmycmzqyg23hv5w3g3i5a00a8zalnzfiyirnq";
+ rev = "e31c3b4e5791a454e6602439cb26bd98d23c4e78";
+ sha256 = "0annsjs2prqmv1lbs0lxr7yclfzh47xg9zyiq6mdxcc02rxsi14f";
};
buildInputs = [ zlib boost ];
- patchPhase = ''
+ postPatch = ''
substituteInPlace Makefile \
--replace "GCC = g++" "GCC = c++"
+
+ patchShebangs .
'';
preBuild = ''
- cp ${glucose.src} patches/glucose-syrup.tgz
+ cp ${glucose'} patches/glucose-syrup.tgz
./bootstrap.sh
'';
installPhase = ''
+ runHook preInstall
mkdir -p $out/bin
install -m0755 build/release/{aspino,fairino-{bs,ls,ps},maxino-2015-{k16,kdyn}} $out/bin
+ runHook postInstall
'';
meta = with stdenv.lib; {
description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose";
- maintainers = with maintainers; [ gebner ];
+ maintainers = with maintainers; [ gebner ma27 ];
platforms = platforms.unix;
license = licenses.asl20;
homepage = http://alviano.net/software/maxino/;
diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix
index 379224c73f89..218006e15d5c 100644
--- a/pkgs/applications/science/logic/avy/default.nix
+++ b/pkgs/applications/science/logic/avy/default.nix
@@ -12,7 +12,25 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cmake zlib boost.out boost.dev ];
- NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ];
+ NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]
+ # Squelch endless stream of warnings on same few things
+ ++ stdenv.lib.optionals stdenv.cc.isClang [
+ "-Wno-empty-body"
+ "-Wno-tautological-compare"
+ "-Wc++11-compat-deprecated-writable-strings"
+ "-Wno-deprecated"
+ ];
+
+ prePatch = ''
+ sed -i -e '1i#include ' abc/src/bdd/dsd/dsd.h
+ substituteInPlace abc/src/bdd/dsd/dsd.h --replace \
+ '((Child = Dsd_NodeReadDec(Node,Index))>=0);' \
+ '((intptr_t)(Child = Dsd_NodeReadDec(Node,Index))>=0);'
+
+ patch -p1 -d minisat -i ${./minisat-fenv.patch}
+ patch -p1 -d glucose -i ${./glucose-fenv.patch}
+ '';
+
patches =
[ ./0001-no-static-boost-libs.patch
];
diff --git a/pkgs/applications/science/logic/avy/glucose-fenv.patch b/pkgs/applications/science/logic/avy/glucose-fenv.patch
new file mode 100644
index 000000000000..dd19f7ec80e7
--- /dev/null
+++ b/pkgs/applications/science/logic/avy/glucose-fenv.patch
@@ -0,0 +1,65 @@
+From d6e0cb60270e8653bda3f339e3a07ce2cd2d6eb0 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 17 Oct 2017 23:01:36 -0500
+Subject: [PATCH] glucose: use fenv to set double precision
+
+---
+ core/Main.cc | 8 ++++++--
+ simp/Main.cc | 8 ++++++--
+ utils/System.h | 2 +-
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/core/Main.cc b/core/Main.cc
+index c96aadd..994132b 100644
+--- a/core/Main.cc
++++ b/core/Main.cc
+@@ -96,8 +96,12 @@ int main(int argc, char** argv)
+ // printf("This is MiniSat 2.0 beta\n");
+
+ #if defined(__linux__)
+- fpu_control_t oldcw, newcw;
+- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
++ fenv_t fenv;
++
++ fegetenv(&fenv);
++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
++ fesetenv(&fenv);
+ printf("c WARNING: for repeatability, setting FPU to use double precision\n");
+ #endif
+ // Extra options:
+diff --git a/simp/Main.cc b/simp/Main.cc
+index 4f4772d..70c2e4b 100644
+--- a/simp/Main.cc
++++ b/simp/Main.cc
+@@ -97,8 +97,12 @@ int main(int argc, char** argv)
+
+
+ #if defined(__linux__)
+- fpu_control_t oldcw, newcw;
+- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
++ fenv_t fenv;
++
++ fegetenv(&fenv);
++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
++ fesetenv(&fenv);
+ printf("WARNING: for repeatability, setting FPU to use double precision\n");
+ #endif
+ // Extra options:
+diff --git a/utils/System.h b/utils/System.h
+index 004d498..a768e99 100644
+--- a/utils/System.h
++++ b/utils/System.h
+@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
+ #define Glucose_System_h
+
+ #if defined(__linux__)
+-#include
++#include
+ #endif
+
+ #include "glucose/mtl/IntTypes.h"
+--
+2.14.2
+
diff --git a/pkgs/applications/science/logic/avy/minisat-fenv.patch b/pkgs/applications/science/logic/avy/minisat-fenv.patch
new file mode 100644
index 000000000000..686d5a1c5b49
--- /dev/null
+++ b/pkgs/applications/science/logic/avy/minisat-fenv.patch
@@ -0,0 +1,65 @@
+From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 17 Oct 2017 22:57:02 -0500
+Subject: [PATCH] use fenv instead of non-standard fpu_control
+
+---
+ core/Main.cc | 8 ++++++--
+ simp/Main.cc | 8 ++++++--
+ utils/System.h | 2 +-
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/core/Main.cc b/core/Main.cc
+index 2b0d97b..8ad95fb 100644
+--- a/core/Main.cc
++++ b/core/Main.cc
+@@ -78,8 +78,12 @@ int main(int argc, char** argv)
+ // printf("This is MiniSat 2.0 beta\n");
+
+ #if defined(__linux__)
+- fpu_control_t oldcw, newcw;
+- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
++ fenv_t fenv;
++
++ fegetenv(&fenv);
++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
++ fesetenv(&fenv);
+ printf("WARNING: for repeatability, setting FPU to use double precision\n");
+ #endif
+ // Extra options:
+diff --git a/simp/Main.cc b/simp/Main.cc
+index 2804d7f..39bfb71 100644
+--- a/simp/Main.cc
++++ b/simp/Main.cc
+@@ -79,8 +79,12 @@ int main(int argc, char** argv)
+ // printf("This is MiniSat 2.0 beta\n");
+
+ #if defined(__linux__)
+- fpu_control_t oldcw, newcw;
+- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
++ fenv_t fenv;
++
++ fegetenv(&fenv);
++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
++ fesetenv(&fenv);
+ printf("WARNING: for repeatability, setting FPU to use double precision\n");
+ #endif
+ // Extra options:
+diff --git a/utils/System.h b/utils/System.h
+index 1758192..c0ad13a 100644
+--- a/utils/System.h
++++ b/utils/System.h
+@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
+ #define Minisat_System_h
+
+ #if defined(__linux__)
+-#include
++#include
+ #endif
+
+ #include "mtl/IntTypes.h"
+--
+2.14.2
+
diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix
index 2b40995b7433..aa815e48db41 100644
--- a/pkgs/applications/science/logic/boolector/default.nix
+++ b/pkgs/applications/science/logic/boolector/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, writeShellScriptBin }:
stdenv.mkDerivation rec {
name = "boolector-${version}";
@@ -8,6 +8,24 @@ stdenv.mkDerivation rec {
sha256 = "0mdf7hwix237pvknvrpazcx6s3ininj5k7vhysqjqgxa7lxgq045";
};
+ prePatch =
+ let
+ lingelingPatch = writeShellScriptBin "lingeling-patch" ''
+ sed -i -e "1i#include " lingeling/lglib.h
+
+ ${crossFix}/bin/crossFix lingeling
+ '';
+ crossFix = writeShellScriptBin "crossFix" ''
+ # substituteInPlace not available here
+ sed -i $1/makefile.in \
+ -e 's@ar rc@$(AR) rc@' \
+ -e 's@ranlib@$(RANLIB)@'
+ '';
+ in ''
+ sed -i -e 's@mv lingeling\* lingeling@\0 \&\& ${lingelingPatch}/bin/lingeling-patch@' makefile
+ sed -i -e 's@mv boolector\* boolector@\0 \&\& ${crossFix}/bin/crossFix boolector@' makefile
+ '';
+
installPhase = ''
mkdir $out
mv boolector/bin $out
diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix
index 1f7ef571eaf9..64b0f85aed2a 100644
--- a/pkgs/applications/science/logic/coq/8.4.nix
+++ b/pkgs/applications/science/logic/coq/8.4.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
fi
}
- envHooks=(''${envHooks[@]} addCoqPath)
+ addEnvHooks "$targetOffset" addCoqPath
'';
passthru = {
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
deleted file mode 100644
index 968ea74e2960..000000000000
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-# - coqide compilation can be disabled by setting buildIde to false;
-# - The csdp program used for the Micromega tactic is statically referenced.
-# However, coq can build without csdp by setting it to null.
-# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
-
-{stdenv, fetchgit, writeText, pkgconfig, ocamlPackages_4_02, ncurses, buildIde ? true, csdp ? null}:
-
-let
- version = "2017-02-03";
- coq-version = "8.6";
- ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages_4_02.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
- csdpPatch = if csdp != null then ''
- substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
- substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
- '' else "";
- ocaml = ocamlPackages_4_02.ocaml;
- findlib = ocamlPackages_4_02.findlib;
- lablgtk = ocamlPackages_4_02.lablgtk;
- camlp5 = ocamlPackages_4_02.camlp5_transitional;
-in
-
-stdenv.mkDerivation {
- name = "coq-unstable-${version}";
-
- inherit coq-version;
- inherit ocaml camlp5 findlib;
-
- src = fetchgit {
- url = git://scm.gforge.inria.fr/coq/coq.git;
- rev = "078598d029792a3d9a54fae9b9ac189b75bc3b06";
- sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
-
- postPatch = ''
- UNAME=$(type -tp uname)
- RM=$(type -tp rm)
- substituteInPlace configure --replace "/bin/uname" "$UNAME"
- substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
- substituteInPlace configure.ml --replace "\"Darwin\"; \"FreeBSD\"; \"OpenBSD\"" "\"Darwinx\"; \"FreeBSD\"; \"OpenBSD\""
- ${csdpPatch}
- '';
-
- setupHook = writeText "setupHook.sh" ''
- addCoqPath () {
- if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
- export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
- fi
- }
-
- envHooks=(''${envHooks[@]} addCoqPath)
- '';
-
- preConfigure = ''
- configureFlagsArray=(
- -opt
- ${ideFlags}
- )
- '';
-
- prefixKey = "-prefix ";
-
- buildFlags = "revision coq coqide";
-
- meta = with stdenv.lib; {
- description = "Coq proof assistant";
- longDescription = ''
- Coq is a formal proof management system. It provides a formal language
- to write mathematical definitions, executable algorithms and theorems
- together with an environment for semi-interactive development of
- machine-checked proofs.
- '';
- homepage = http://coq.inria.fr;
- license = licenses.lgpl21;
- branch = coq-version;
- maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index cdfd035c7139..fb75a9dc6097 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -9,7 +9,7 @@
, ocamlPackages, ncurses
, buildIde ? true
, csdp ? null
-, version ? "8.6.1"
+, version
}:
let
@@ -19,8 +19,9 @@ let
"8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw";
"8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4";
"8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l";
- "8.7+beta2" = "1r274m44z774xigvj43g211ms9z9bwgyp1g43rvq4fswb3gzxc4b";
"8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m";
+ "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8";
+ "8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w";
}."${version}";
coq-version = builtins.substring 0 3 version;
camlp5 = ocamlPackages.camlp5_strict;
@@ -91,7 +92,8 @@ self = stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ];
+ buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ]
+ ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk;
postPatch = ''
UNAME=$(type -tp uname)
@@ -109,7 +111,7 @@ self = stdenv.mkDerivation {
fi
}
- envHooks=(''${envHooks[@]} addCoqPath)
+ addEnvHooks "$targetOffset" addCoqPath
'';
preConfigure = ''
diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix
index 47077c2e255b..3257977f5b5a 100644
--- a/pkgs/applications/science/logic/cryptoverif/default.nix
+++ b/pkgs/applications/science/logic/cryptoverif/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cryptoverif-${version}";
- version = "1.22";
+ version = "1.28";
src = fetchurl {
url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz";
- sha256 = "17fbmv0askgfnhs5a0ilhizvrr93jkmq82ybm3cgyxhh2zrk0rq1";
+ sha256 = "0vssz751g1nn8wclkiwgghpm475jl00xkivc164vgbr9acxsr7n7";
};
buildInputs = [ ocaml ];
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index 6b213226635d..403eff216f53 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -22,10 +22,17 @@ stdenv.mkDerivation rec {
"--with-boost=${boost.dev}"
];
+ prePatch = ''
+ patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat
+ patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat
+ '';
+
preConfigure = ''
patchShebangs ./src/
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "A high-performance theorem prover and SMT solver";
homepage = http://cvc4.cs.nyu.edu/web/;
diff --git a/pkgs/applications/science/logic/cvc4/minisat-fenv.patch b/pkgs/applications/science/logic/cvc4/minisat-fenv.patch
new file mode 100644
index 000000000000..686d5a1c5b49
--- /dev/null
+++ b/pkgs/applications/science/logic/cvc4/minisat-fenv.patch
@@ -0,0 +1,65 @@
+From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 17 Oct 2017 22:57:02 -0500
+Subject: [PATCH] use fenv instead of non-standard fpu_control
+
+---
+ core/Main.cc | 8 ++++++--
+ simp/Main.cc | 8 ++++++--
+ utils/System.h | 2 +-
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/core/Main.cc b/core/Main.cc
+index 2b0d97b..8ad95fb 100644
+--- a/core/Main.cc
++++ b/core/Main.cc
+@@ -78,8 +78,12 @@ int main(int argc, char** argv)
+ // printf("This is MiniSat 2.0 beta\n");
+
+ #if defined(__linux__)
+- fpu_control_t oldcw, newcw;
+- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
++ fenv_t fenv;
++
++ fegetenv(&fenv);
++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
++ fesetenv(&fenv);
+ printf("WARNING: for repeatability, setting FPU to use double precision\n");
+ #endif
+ // Extra options:
+diff --git a/simp/Main.cc b/simp/Main.cc
+index 2804d7f..39bfb71 100644
+--- a/simp/Main.cc
++++ b/simp/Main.cc
+@@ -79,8 +79,12 @@ int main(int argc, char** argv)
+ // printf("This is MiniSat 2.0 beta\n");
+
+ #if defined(__linux__)
+- fpu_control_t oldcw, newcw;
+- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
++ fenv_t fenv;
++
++ fegetenv(&fenv);
++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
++ fesetenv(&fenv);
+ printf("WARNING: for repeatability, setting FPU to use double precision\n");
+ #endif
+ // Extra options:
+diff --git a/utils/System.h b/utils/System.h
+index 1758192..c0ad13a 100644
+--- a/utils/System.h
++++ b/utils/System.h
+@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
+ #define Minisat_System_h
+
+ #if defined(__linux__)
+-#include
++#include
+ #endif
+
+ #include "mtl/IntTypes.h"
+--
+2.14.2
+
diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix
new file mode 100644
index 000000000000..50454847baf1
--- /dev/null
+++ b/pkgs/applications/science/logic/drat-trim/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "drat-trim-2017-08-31";
+
+ src = fetchFromGitHub {
+ owner = "marijnheule";
+ repo = "drat-trim";
+ rev = "37ac8f874826ffa3500a00698910e137498defac";
+ sha256 = "1m9q47dfnvdli1z3kb1jvvbm0dgaw725k1aw6h9w00bggqb91bqh";
+ };
+
+ postPatch = ''
+ substituteInPlace Makefile --replace gcc cc
+ '';
+
+ installPhase = ''
+ install -Dt $out/bin drat-trim
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A proof checker for unSAT proofs";
+ longDescription = ''
+ DRAT-trim is a satisfiability proof checking and trimming
+ utility designed to validate proofs for all known satisfiability
+ solving and preprocessing techniques. DRAT-trim can also emit
+ trimmed formulas, optimized proofs, and TraceCheck+ dependency
+ graphs.
+
+ DRAT-trim has been used as part of the judging process in the
+ annual SAT Competition in recent years, in order to check
+ competing SAT solvers' work when they claim that a SAT instance
+ is unsatisfiable.
+ '';
+ homepage = https://www.cs.utexas.edu/~marijn/drat-trim/;
+ license = licenses.mit;
+ maintainers = with maintainers; [ kini ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index 79c3b74e496b..44328eeb6bbb 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, which }:
+
stdenv.mkDerivation rec {
name = "eprover-${version}";
version = "2.0";
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ which ];
preConfigure = ''
- sed -e 's/ *CC *= gcc$//' -i Makefile.vars
+ sed -e 's/ *CC *= *gcc$//' -i Makefile.vars
'';
configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man";
diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix
index fd59a53fd2ae..30af3216737c 100644
--- a/pkgs/applications/science/logic/glucose/syrup.nix
+++ b/pkgs/applications/science/logic/glucose/syrup.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, glucose }:
+{ stdenv, zlib, glucose }:
stdenv.mkDerivation rec {
name = "glucose-syrup-${version}";
version = glucose.version;
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index b3f0b3259277..095aa5a7f8c8 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0irh9b4haz0pzzxrb4hwcss91a0xb499kjrcrmr2s59p3zq8bbd9";
};
- buildInputs = [ gmp cmake ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ gmp ];
enableParallelBuilding = true;
preConfigure = ''
diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix
index f0947fa0ed6e..f33152a8767c 100644
--- a/pkgs/applications/science/logic/ltl2ba/default.nix
+++ b/pkgs/applications/science/logic/ltl2ba/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ltl2ba-${version}";
- version = "1.1";
+ version = "1.2b1";
src = fetchurl {
url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${name}.tar.gz";
- sha256 = "16z0gc7a9dkarwn0l6rvg5jdhw1q4qyn4501zlchy0zxqddz0sx6";
+ sha256 = "1f4jnkfkyj8lcc5qfqbiypfc11rhhpqqi6xs9xx5dysg6r6303wm";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
index c9016a5ee0ce..6e8797fcc40b 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost,
+{stdenv, fetchurl, cmake, subversion, libGLU_combined, qt5, boost,
python27, python27Packages}:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m";
};
- buildInputs = [ cmake mesa qt5.qtbase boost ];
+ buildInputs = [ cmake libGLU_combined qt5.qtbase boost ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index b10ec814ff55..6fcc8f9c111f 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -1,18 +1,18 @@
-# - coqide compilation can be disabled by setting lablgtk to null;
-
-{stdenv, fetchurl, pkgconfig, ocaml, camlp5}:
+{ stdenv, fetchFromGitHub, pkgconfig, ocaml }:
stdenv.mkDerivation rec {
name = "ott-${version}";
- version = "0.25";
+ version = "0.27";
- src = fetchurl {
- url = "http://www.cl.cam.ac.uk/~pes20/ott/ott_distro_${version}.tar.gz";
- sha256 = "0i8ad1yrz9nrrgpi8db4z0aii5s0sy35mmzdfw5nq183mvbx8qqd";
+ src = fetchFromGitHub {
+ owner = "ott-lang";
+ repo = "ott";
+ rev = version;
+ sha256 = "12hzpyinswqaxwp6y793h7ywrv6289cw4911ah2yzq04ji095pfb";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ocaml camlp5 ];
+ buildInputs = [ ocaml ];
installPhase = ''
mkdir -p $out/bin
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
ln -s $out/bin/ott.opt $out/bin/ott
mkdir -p $out/share/emacs/site-lisp
- cp emacs/ottmode.el $out/share/emacs/site-lisp
+ cp emacs/ott-mode.el $out/share/emacs/site-lisp
'';
meta = {
diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
index e026cfad218e..db252f97916a 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm";
};
+ prePatch = ''
+ substituteInPlace picosat.c --replace "sys/unistd.h" "unistd.h"
+
+ substituteInPlace makefile.in \
+ --replace 'ar rc' '$(AR) rc' \
+ --replace 'ranlib' '$(RANLIB)'
+ '';
+
configurePhase = "./configure.sh --shared --trace";
installPhase = ''
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index a73feba97b64..6bf19a2a2f4d 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -1,23 +1,26 @@
-{stdenv, fetchurl, cmake}:
+{ stdenv, fetchzip, cmake }:
+
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "clingo";
version = "5.2.2";
- src = fetchurl {
- url = "https://github.com/potassco/clingo/releases/v${version}.tar.gz";
- sha256 = "1kxzb385g8p9mqm1x9wvjrigifa09w6vj0wl7kradibm5qagh7ns";
+ src = fetchzip {
+ url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz";
+ sha256 = "04rjwpna37gzm8vxr09z3z6ay8y8cxbjd8lga7xvqfpn2l178zjm";
};
buildInputs = [];
nativeBuildInputs = [cmake];
+ cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
+
meta = {
inherit version;
description = "ASP system to ground and solve logic programs";
license = stdenv.lib.licenses.mit;
maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
homepage = "https://potassco.org/";
downloadPage = "https://github.com/potassco/clingo/releases/";
};
diff --git a/pkgs/applications/science/logic/sapic/default.nix b/pkgs/applications/science/logic/sapic/default.nix
new file mode 100644
index 000000000000..27efe865a9d9
--- /dev/null
+++ b/pkgs/applications/science/logic/sapic/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip, ocaml }:
+
+stdenv.mkDerivation rec {
+ name = "sapic-${version}";
+ version = "0.9";
+
+ src = fetchurl {
+ url = "http://sapic.gforge.inria.fr/${name}.zip";
+ sha256 = "1ckl090lpyfh90mkjhnpcys5grs3nrl9wlbn9nfkxxnaivn2yx9y";
+ };
+
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ ocaml ];
+ patches = [ ./native.patch ]; # create a native binary, not a bytecode one
+
+ buildPhase = "make depend && make";
+ installPhase = ''
+ mkdir -p $out/bin
+ cp ./sapic $out/bin
+ '';
+
+ meta = {
+ description = "Stateful applied Pi Calculus for protocol verification";
+ homepage = http://sapic.gforge.inria.fr/;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+ };
+}
diff --git a/pkgs/applications/science/logic/sapic/native.patch b/pkgs/applications/science/logic/sapic/native.patch
new file mode 100644
index 000000000000..6e0b98113df2
--- /dev/null
+++ b/pkgs/applications/science/logic/sapic/native.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index a1de94d..f9e2eb8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+ TARGET = sapic
+-OBJS=lexer.cmo apip.cmo firsttranslation.cmo main.cmo #secondtranslation.cmo thirdtranslation.cmo main.cmo
++OBJS=lexer.cmx apip.cmx firsttranslation.cmx main.cmx
+
+ sapic: $(OBJS)
+- ocamlc -o $@ $(OBJS)
++ ocamlopt.opt -o $@ $(OBJS)
+
+ depend:
+ ocamldep *.ml *.mli > .depend
+@@ -13,17 +13,17 @@ clean:
+ rm -rf *.cmi *.cmo $(TARGET)
+ rm -rf apip.ml apip.mli lexer.ml lexer.mli
+
+-.SUFFIXES: .ml .mli .mll .mly .cmo .cmi
++.SUFFIXES: .ml .mli .mll .mly .cmo .cmi .cmx
+
+-.ml.cmo:
+- ocamlc -c $<
++.ml.cmx:
++ ocamlopt.opt -c $<
+ .mli.cmi:
+- ocamlc -c $<
++ ocamlopt.opt -c $<
+ .mll.ml:
+ ocamllex $<
+ .mly.ml:
+ ocamlyacc $<
+ .ml.mli:
+- ocamlc -i $< > $@
++ ocamlopt.opt -i $< > $@
+
+ -include .depend
diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix
index 8c0b82cc549c..081dc788163b 100644
--- a/pkgs/applications/science/logic/stp/default.nix
+++ b/pkgs/applications/science/logic/stp/default.nix
@@ -23,9 +23,13 @@ stdenv.mkDerivation rec {
)
'';
+ # `make -f lib/Interface/CMakeFiles/cppinterface.dir/build.make lib/Interface/CMakeFiles/cppinterface.dir/cpp_interface.cpp.o`:
+ # include/stp/AST/UsefulDefs.h:41:29: fatal error: stp/AST/ASTKind.h: No such file or directory
+ enableParallelBuilding = false;
+
meta = with stdenv.lib; {
description = "Simple Theorem Prover";
- maintainers = with maintainers; [ mornfall ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = licenses.mit;
};
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 53e1a90f5b6a..b6312bfe4668 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "symbiyosys-${version}";
- version = "2017.11.05";
+ version = "2018.03.21";
src = fetchFromGitHub {
- owner = "cliffordwolf";
+ owner = "yosyshq";
repo = "symbiyosys";
- rev = "db9c7e97b8f84ef7e9b18ae630009897c7982a08";
- sha256 = "0pyznkjm0vjmaf6mpwknmh052qrwy2fzi05h80ysx1bxc51ns0m0";
+ rev = "76a624a363bc44df102359595d34f29370c6668b";
+ sha256 = "1ikax1yiqgj5442wcgp1iigw8wiyw7k848z4ykn7k068kbc320bm";
};
buildInputs = [ python3 yosys ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
"sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
'';
meta = {
- description = "Yosys verification tools for Hardware Definition Languages";
+ description = "Tooling for Yosys-based verification flows";
homepage = https://symbiyosys.readthedocs.io/;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
new file mode 100644
index 000000000000..796b36c91735
--- /dev/null
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -0,0 +1,87 @@
+{ haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib
+# the following are non-haskell dependencies
+, makeWrapper, which, maude, graphviz, sapic
+}:
+
+let
+ version = "1.3.1";
+ src = fetchFromGitHub {
+ owner = "tamarin-prover";
+ repo = "tamarin-prover";
+ rev = "120c7e706f3e1d4646b233faf2bc9936834ed9d3";
+ sha256 = "064blwjjwnkycwgsrdn1xkjya976wndpz9h5pjmgjqqirinc8c5x";
+ };
+
+ # tamarin has its own dependencies, but they're kept inside the repo,
+ # no submodules. this factors out the common metadata among all derivations
+ common = pname: src: {
+ inherit pname version src;
+
+ license = lib.licenses.gpl3;
+ homepage = https://tamarin-prover.github.io;
+ description = "Security protocol verification in the symbolic model";
+ maintainers = [ lib.maintainers.thoughtpolice ];
+ };
+
+ # tamarin use symlinks to the LICENSE and Setup.hs files, so for these sublibraries
+ # we set the patchPhase to fix that. otherwise, cabal cries a lot.
+ replaceSymlinks = ''
+ cp --remove-destination ${src}/LICENSE .;
+ cp --remove-destination ${src}/Setup.hs .;
+ '';
+
+ tamarin-prover-utils = mkDerivation (common "tamarin-prover-utils" (src + "/lib/utils") // {
+ patchPhase = replaceSymlinks;
+ libraryHaskellDepends = with haskellPackages; [
+ base base64-bytestring binary blaze-builder bytestring containers
+ deepseq dlist fclabels mtl pretty safe SHA syb time transformers
+ ];
+ });
+
+ tamarin-prover-term = mkDerivation (common "tamarin-prover-term" (src + "/lib/term") // {
+ patchPhase = replaceSymlinks;
+ libraryHaskellDepends = (with haskellPackages; [
+ attoparsec base binary bytestring containers deepseq dlist HUnit
+ mtl process safe
+ ]) ++ [ tamarin-prover-utils ];
+ });
+
+ tamarin-prover-theory = mkDerivation (common "tamarin-prover-theory" (src + "/lib/theory") // {
+ patchPhase = replaceSymlinks;
+ doHaddock = false; # broken
+ libraryHaskellDepends = (with haskellPackages; [
+ aeson aeson-pretty base binary bytestring containers deepseq dlist
+ fclabels mtl parallel parsec process safe text transformers uniplate
+ ]) ++ [ tamarin-prover-utils tamarin-prover-term ];
+ });
+
+in
+mkDerivation (common "tamarin-prover" src // {
+ isLibrary = false;
+ isExecutable = true;
+
+ # strip out unneeded deps manually
+ doHaddock = false;
+ enableSharedExecutables = false;
+ postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
+
+ # wrap the prover to be sure it can find maude, sapic, etc
+ executableToolDepends = [ makeWrapper which maude graphviz sapic ];
+ postInstall = ''
+ wrapProgram $out/bin/tamarin-prover \
+ --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]}
+ '';
+
+ checkPhase = "./dist/build/tamarin-prover/tamarin-prover test";
+
+ executableHaskellDepends = (with haskellPackages; [
+ base binary binary-orphans blaze-builder blaze-html bytestring
+ cmdargs conduit containers deepseq directory fclabels file-embed
+ filepath gitrev http-types HUnit lifted-base mtl parsec process
+ resourcet safe shakespeare tamarin-prover-term
+ template-haskell text threads time wai warp yesod-core yesod-static
+ ]) ++ [ tamarin-prover-utils
+ tamarin-prover-term
+ tamarin-prover-theory
+ ];
+})
diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix
new file mode 100644
index 000000000000..b1eb171b20b1
--- /dev/null
+++ b/pkgs/applications/science/logic/tlaplus/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, makeWrapper
+, jdk, jre, ant
+}:
+
+stdenv.mkDerivation rec {
+ name = "tlaplus-${version}";
+ version = "1.5.6";
+
+ src = fetchFromGitHub {
+ owner = "tlaplus";
+ repo = "tlaplus";
+ rev = "refs/tags/v${version}";
+ sha256 = "0966mvgxamknj4hsp980qbxwda886w1dv309kn7isxn0420lfv4f";
+ };
+
+ buildInputs = [ makeWrapper jdk ant ];
+
+ buildPhase = "ant -f tlatools/customBuild.xml compile dist";
+ installPhase = ''
+ mkdir -p $out/share/java $out/bin
+ cp tlatools/dist/*.jar $out/share/java
+
+ makeWrapper ${jre}/bin/java $out/bin/tlc2 \
+ --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC"
+ makeWrapper ${jre}/bin/java $out/bin/tla2sany \
+ --add-flags "-cp $out/share/java/tla2tools.jar tla2sany.SANY"
+ makeWrapper ${jre}/bin/java $out/bin/pcal \
+ --add-flags "-cp $out/share/java/tla2tools.jar pcal.trans"
+ makeWrapper ${jre}/bin/java $out/bin/tla2tex \
+ --add-flags "-cp $out/share/java/tla2tools.jar tla2tex.TLA"
+ '';
+
+ meta = {
+ description = "An algorithm specification language with model checking tools";
+ homepage = http://lamport.azurewebsites.net/tla/tla.html;
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+ };
+}
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index 16ef277e9300..a1d613e6295e 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "TPTP-${version}";
- version = "7.0.0";
+ version = "7.1.0";
src = fetchurl {
url = [
"http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
"http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}.tgz"
];
- sha256 = "13rm76lqlgbv15p8as0dpc74z2dfv5xydkhnd0hm3hhi3mn39dk9";
+ sha256 = "0slqbqv4y43wz6wnh72s4n540ssapah0d12mndi0c7xr04kf2v2d";
};
buildInputs = [ tcsh yap perl patchelf ];
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 54c8caa99d86..202d52f0cc0e 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "why3-${version}";
- version = "0.88.1";
+ version = "0.88.3";
src = fetchurl {
- url = https://gforge.inria.fr/frs/download.php/file/37185/why3-0.88.1.tar.gz;
- sha256 = "1qj00963si0vdrqjp79ai27g9rr8sqvly6n6nwpga6bnss98xqkw";
+ url = https://gforge.inria.fr/frs/download.php/file/37313/why3-0.88.3.tar.gz;
+ sha256 = "0limdqy9l5bjzwhdalcfdyh0b6laxgiphhvr4bby9p0030agssiy";
};
buildInputs = (with ocamlPackages; [
diff --git a/pkgs/applications/science/logic/z3/4.5.0.nix b/pkgs/applications/science/logic/z3/4.5.0.nix
new file mode 100644
index 000000000000..827cb2cbe3de
--- /dev/null
+++ b/pkgs/applications/science/logic/z3/4.5.0.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }:
+
+let
+ python = python2;
+in stdenv.mkDerivation rec {
+ name = "z3-${version}";
+ version = "4.5.0";
+
+ src = fetchFromGitHub {
+ owner = "Z3Prover";
+ repo = "z3";
+ rev = "z3-4.5.0";
+ sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp";
+ };
+
+ buildInputs = [ python fixDarwinDylibNames ];
+ enableParallelBuilding = true;
+
+ configurePhase = ''
+ ${python.interpreter} scripts/mk_make.py --prefix=$out --python --pypkgdir=$out/${python.sitePackages}
+ cd build
+ '';
+
+ meta = {
+ description = "A high-performance theorem prover and SMT solver";
+ homepage = "https://github.com/Z3Prover/z3";
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+ };
+}
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index be25738a6076..5eda2da60566 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }:
+{ stdenv, fetchFromGitHub, python, fixDarwinDylibNames }:
-let
- python = python2;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "z3-${version}";
- version = "4.5.0-2017-11-06";
+ version = "4.6.0";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = "z3";
- rev = "3350f32e1f2c01c9df63b7d71899796a18ce2272";
- sha256 = "00jn0njn5h9v49pl67yxj6225m6334ndrx6mp37vcqac05pdbpw7";
+ rev = "b0aaa4c6d7a739eb5e8e56a73e0486df46483222";
+ sha256 = "1cgwlmjdbf4rsv2rriqi2sdpz9qxihxrcpm6a4s37ijy437xg78l";
};
buildInputs = [ python fixDarwinDylibNames ];
+ propagatedBuildInputs = [ python.pkgs.setuptools ];
enableParallelBuilding = true;
configurePhase = ''
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index 9d736694cbdc..e33b55503bd6 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig
+{ stdenv, lib, fetchFromGitHub, fetchpatch, ccache, cmake, ctags, swig
# data, compression
, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy
# maths
@@ -14,7 +14,6 @@ assert pythonSupport -> pythonPackages != null;
assert opencvSupport -> opencv != null;
stdenv.mkDerivation rec {
-
pname = "shogun";
version = "6.0.0";
name = pname + "-" + version;
@@ -27,6 +26,18 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ patches = [
+ (fetchpatch {
+ name = "Fix-meta-example-parser-bug-in-parallel-builds.patch";
+ url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch";
+ sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n";
+ })
+ (fetchpatch {
+ url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch";
+ sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s";
+ })
+ ];
+
CCACHE_DIR=".ccache";
buildInputs = with lib; [
@@ -47,5 +58,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ edwtjo ];
};
-
}
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index fd0ff24d58b3..a9b2de1a00c5 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib
, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas
-, curl, Cocoa, Foundation, cf-private, libobjc, tzdata, fetchpatch
+, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch
, withRecommendedPackages ? true
, enableStrictBarrier ? false
}:
stdenv.mkDerivation rec {
- name = "R-3.4.2";
+ name = "R-3.4.4";
src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
- sha256 = "0r0cv2kc3x5z9xycpnxx6fbvv22psw2m342jhpslbxkc8g1307lp";
+ sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk";
};
buildInputs = [
@@ -19,10 +19,14 @@ stdenv.mkDerivation rec {
pango pcre perl readline texLive xz zlib less texinfo graphviz icu
pkgconfig bison imake which jdk openblas curl
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
patches = [ ./no-usr-local-search-paths.patch ];
+ prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib"
+ '';
+
preConfigure = ''
configureFlagsArray=(
--disable-lto
@@ -40,8 +44,8 @@ stdenv.mkDerivation rec {
--enable-R-shlib
AR=$(type -p ar)
AWK=$(type -p gawk)
- CC=$(type -p gcc)
- CXX=$(type -p g++)
+ CC=$(type -p cc)
+ CXX=$(type -p c++)
FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
JAVA_HOME="${jdk}"
RANLIB=$(type -p ranlib)
@@ -50,9 +54,9 @@ stdenv.mkDerivation rec {
--without-tcltk
--without-aqua
--disable-R-framework
- CC="clang"
- CXX="clang++"
OBJC="clang"
+ CPPFLAGS="-isystem ${libcxx}/include/c++/v1"
+ LDFLAGS="-L${libcxx}/lib"
'' + ''
)
echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib"
diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/pkgs/applications/science/math/R/setup-hook.sh
index 09a775db9bf5..6951e2a4b61b 100644
--- a/pkgs/applications/science/math/R/setup-hook.sh
+++ b/pkgs/applications/science/math/R/setup-hook.sh
@@ -1,5 +1,7 @@
addRLibPath () {
- addToSearchPath R_LIBS_SITE $1/library
+ if [[ -d "$1/library" ]]; then
+ addToSearchPath R_LIBS_SITE "$1/library"
+ fi
}
-envHooks+=(addRLibPath)
+addEnvHooks "$targetOffset" addRLibPath
diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix
new file mode 100644
index 000000000000..fb76699b0c83
--- /dev/null
+++ b/pkgs/applications/science/math/almonds/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, ncurses, pillow, pytest }:
+
+let
+ version = "1.25b";
+in
+
+buildPythonApplication {
+ name = "almonds-${version}";
+ src = fetchFromGitHub {
+ owner = "Tenchi2xh";
+ repo = "Almonds";
+ rev = version;
+ sha256 = "0j8d8jizivnfx8lpc4w6sbqj5hq35nfz0vdg7ld80sc5cs7jr3ws";
+ };
+
+ nativeBuildInputs = [ pytest ];
+ buildInputs = [ ncurses ];
+ propagatedBuildInputs = [ pillow ];
+
+ checkPhase = "py.test";
+
+ meta = with stdenv.lib; {
+ description = "Terminal Mandelbrot fractal viewer";
+ homepage = https://github.com/Tenchi2xh/Almonds;
+ # No license has been specified
+ license = licenses.unfree;
+ maintainers = with maintainers; [ infinisil ];
+ };
+}
diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix
new file mode 100644
index 000000000000..8db4bd157df6
--- /dev/null
+++ b/pkgs/applications/science/math/bcal/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "bcal-${version}";
+ version = "1.8";
+
+ src = fetchFromGitHub {
+ owner = "jarun";
+ repo = "bcal";
+ rev = "v${version}";
+ sha256 = "0jdn46wzwq7yn3x6p1xyqarp52pcr0ghnfhkm7nyxv734g1abw7r";
+ };
+
+ nativeBuildInputs = [ python3Packages.pytest ];
+
+ doCheck = true;
+ checkPhase = ''
+ python3 -m pytest test.py
+ '';
+
+ installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+
+ meta = {
+ description = "Storage conversion and expression calculator";
+ homepage = https://github.com/jarun/bcal;
+ license = licenses.gpl3;
+ platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
+ maintainers = with maintainers; [ jfrankenau ];
+ };
+}
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 8dc3e3ce43dc..d7357c5048d5 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -7,17 +7,19 @@
, hdf5-cpp
, leveldb
, lmdb
-, opencv
+, opencv3
, protobuf
, snappy
-, atlas
, doxygen
+, openblas
, cudaSupport ? true, cudatoolkit
, cudnnSupport ? false, cudnn ? null
+, ncclSupport ? false, nccl ? null
, pythonSupport ? false, python ? null, numpy ? null
}:
assert cudnnSupport -> cudaSupport;
+assert ncclSupport -> cudaSupport;
assert pythonSupport -> (python != null && numpy != null);
stdenv.mkDerivation rec {
@@ -35,14 +37,19 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake doxygen ];
- cmakeFlags = [
- "-DCUDA_ARCH_NAME=All"
- (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF")
- ] ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON";
+ cmakeFlags =
+ [ (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF")
+ "-DBLAS=open"
+ ] ++ (if cudaSupport then [
+ "-DCUDA_ARCH_NAME=All"
+ "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
+ ] else [ "-DCPU_ONLY=ON" ])
+ ++ lib.optional ncclSupport "-DUSE_NCCL=ON";
- buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ]
+ buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv3 openblas ]
++ lib.optional cudaSupport cudatoolkit
++ lib.optional cudnnSupport cudnn
+ ++ lib.optional ncclSupport nccl
++ lib.optionals pythonSupport [ python numpy ];
propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf;
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index 5787cb3d6b8b..efd38f053451 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -12,11 +12,11 @@ in
stdenv.mkDerivation rec {
name = "calc-${version}";
- version = "2.12.6.3";
+ version = "2.12.6.6";
src = fetchurl {
url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2";
- sha256 = "01m20s5zs74zyb23x6zg6i13gc30a2ay2iz1rdbkxram01cblzky";
+ sha256 = "03sg1xhin6qsrz82scf96mmzw8lz1yj68rhj4p4npp4s0fawc9d5";
};
buildInputs = [ makeWrapper readline ncurses utillinux ];
diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix
index 7643c912db4b..6de77d81be6f 100644
--- a/pkgs/applications/science/math/cbc/default.nix
+++ b/pkgs/applications/science/math/cbc/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, zlib, bzip2 }:
stdenv.mkDerivation {
- name = "cbc-2.9.5";
+ name = "cbc-2.9.9";
src = fetchurl {
- url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.5.tgz";
- sha256 = "0kmsg9qpajh5jhnql04m6akpdjzlppxfz99q320vw5bkzgl3i18w";
+ url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz";
+ sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a";
};
configureFlags = "-C";
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index 89ed0582b37e..07740f4c8aea 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -12,28 +12,22 @@ let
cub = fetchFromGitHub {
owner = "NVlabs";
repo = "cub";
- rev = "1.4.1";
- sha256 = "1lcdwblz03c0yq1lxndg566kg14b5qm14x5qixjbmz6wq85kgmqc";
+ rev = "1.7.4";
+ sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66";
};
in stdenv.mkDerivation rec {
name = "CNTK-${version}";
- version = "2.2";
+ version = "2.4";
# Submodules
src = fetchgit {
url = "https://github.com/Microsoft/CNTK";
rev = "v${version}";
- sha256 = "0q4knrwiyphb2fbqf9jzqvkz2jzj6jmbmang3lavdvsh7z0n8zz9";
+ sha256 = "0m28wb0ljixcpi14g3gcfiraimh487yxqhd9yrglgyvjb69x597y";
};
- patches = [
- # Fix "'exp' was not declared"
- (fetchpatch {
- url = "https://github.com/imriss/CNTK/commit/ef1cca6df95cc507deb8471df2c0dd8cbfeef23b.patch";
- sha256 = "0z7xyrxwric0c4h7rfs05f544mcq6d10wgs0vvfcyd2pcf410hy7";
- })
- ];
+ patches = [ ./fix_std_bind.patch ];
nativeBuildInputs = [ cmake ];
@@ -48,8 +42,10 @@ in stdenv.mkDerivation rec {
"--with-boost=${boost.dev}"
"--with-protobuf=${protobuf}"
"--with-mpi=${openmpi}"
+ "--cuda=${if cudaSupport then "yes" else "no"}"
+ # FIXME
+ "--asgd=no"
] ++ lib.optionals cudaSupport [
- "--cuda=yes"
"--with-cuda=${cudatoolkit}"
"--with-gdk-include=${cudatoolkit}/include"
"--with-gdk-nvml-lib=${nvidia_x11}/lib"
@@ -85,13 +81,10 @@ in stdenv.mkDerivation rec {
cp bin/cntk $out/bin
'';
- hardeningDisable = [ "format" ];
-
- # on 2.2: fatal error: tensorboard/tensorboard.pb.h: No such file or directory
- enableParallelBuilding = false;
+ enableParallelBuilding = true;
meta = with lib; {
- homepage = "https://github.com/Microsoft/CNTK";
+ homepage = https://github.com/Microsoft/CNTK;
description = "An open source deep-learning toolkit";
license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/science/math/cntk/fix_std_bind.patch b/pkgs/applications/science/math/cntk/fix_std_bind.patch
new file mode 100644
index 000000000000..df97a0c66669
--- /dev/null
+++ b/pkgs/applications/science/math/cntk/fix_std_bind.patch
@@ -0,0 +1,11 @@
+diff -ru3 CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h
+--- CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 1970-01-01 03:00:01.000000000 +0300
++++ CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 2018-02-25 18:16:16.330269647 +0300
+@@ -9,6 +9,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "CNTKLibrary.h"
+ #include "CNTKLibraryC.h"
diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix
index 44dc7af98c1a..7b768f7077e7 100644
--- a/pkgs/applications/science/math/ecm/default.nix
+++ b/pkgs/applications/science/math/ecm/default.nix
@@ -2,7 +2,7 @@
let
pname = "ecm";
- version = "6.4.4";
+ version = "7.0.4";
name = "${pname}-${version}";
in
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
inherit name;
src = fetchurl {
- url = http://gforge.inria.fr/frs/download.php/file/32159/ecm-6.4.4.tar.gz;
- sha256 = "0v5h2nicz9yx78c2d72plbhi30iq4nxbvphja1s9501db4aah4y8";
+ url = "http://gforge.inria.fr/frs/download.php/file/36224/ecm-${version}.tar.gz";
+ sha256 = "0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc";
};
# See https://trac.sagemath.org/ticket/19233
diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
index ccdd666e90bd..553905c21957 100644
--- a/pkgs/applications/science/math/fricas/default.nix
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:
let
- version = "1.3.1";
+ version = "1.3.3";
name = "fricas-" + version;
in
stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://sourceforge.net/projects/fricas/files/fricas/${version}/${name}-full.tar.bz2";
- sha256 = "0c2wgj1c3mh5f8msx1ckxpnhm0dyq7dqf1wk6aiyysh8xn57cjkx";
+ sha256 = "1avp9mbl5yn192c7kz5c2d18k33hay9lwii363b0v5hj3qgq2hhl";
};
buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];
diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
index 9a9a1ff762f1..65d551f39a71 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "gfan";
- version = "0.6";
+ version = "0.6.2";
src = fetchurl {
url = "http://home.math.au.dk/jensen/software/gfan/gfan${version}.tar.gz";
- sha256 = "02d6dvzfwy0lnidfgf98052jfqwy285nfm1h5nnx7jbgic1nnpgz";
+ sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56";
};
makeFlags = ''PREFIX=$(out) CC=cc CXX=c++ cddnoprefix=1'';
diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index 4ef00d56f182..e29ff24e250f 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, texlive, bison, flex
, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas
, readline, gettext, libpng, libao, gfortran, perl
-, enableGUI ? false, mesa ? null, xorg ? null, fltk ? null
+, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
}:
-assert enableGUI -> mesa != null && xorg != null && fltk != null;
+assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null;
stdenv.mkDerivation rec {
name = "${attr}-${version}";
@@ -29,9 +29,12 @@ stdenv.mkDerivation rec {
# perl is only needed for patchShebangs fixup.
buildInputs = [
gmp mpfr pari ntl gsl blas mpfi liblapackWithAtlas
- readline gettext libpng libao gfortran perl
+ readline gettext libpng libao perl
+ # gfortran.cc default output contains static libraries compiled without -fPIC
+ # we want libgfortran.so.3 instead
+ (stdenv.lib.getLib gfortran.cc)
] ++ stdenv.lib.optionals enableGUI [
- mesa fltk xorg.libX11
+ libGLU_combined fltk xorg.libX11
];
outputs = [ "out" ];
diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 1956ebdcb0f1..944460de9c75 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:
stdenv.mkDerivation rec {
- name = "ginac-1.7.2";
+ name = "ginac-1.7.4";
src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
- sha256 = "1dyq47gc97jn1r5sy0klxs5b4lzhckyjqgsvwcs2a9ybqmhmpdr4";
+ sha256 = "1vvqv73yk9klbq0mz239zzw77rlp72qcvzci4j1v6rafvji1616n";
};
propagatedBuildInputs = [ cln ];
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 3e4c8c702869..798141b6b438 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocamlPackages, mesa, freeglut
+{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut
, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib
}:
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
};
- buildInputs = [ freeglut mesa mysql.lib mpfr gmp
+ buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp
libtiff libjpeg libpng giflib ]
++ (with ocamlPackages; [
ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index bb24ac9bd499..33b458ba30a3 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
-, zlib, mesa, mesa_glu, xorg }:
+, zlib, libGLU_combined, libGLU, xorg }:
-let version = "3.0.5"; in
+let version = "3.0.6"; in
stdenv.mkDerivation {
name = "gmsh-${version}";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "ae39ed81178d94b76990b8c89b69a5ded8910fd8f7426b800044d00373d12a93";
+ sha256 = "0ywqhr0zmdhn8dvi6l8z1vkfycyv67fdrz6b95mb39np832bq04p";
};
# The original CMakeLists tries to use some version of the Lapack lib
# that is supposed to work without Fortran but didn't for me.
patches = [ ./CMakeLists.txt.patch ];
- buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa
- mesa_glu xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
+ buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib libGLU_combined
+ libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
];
diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix
index a30343dd0b9e..2925e601e32b 100644
--- a/pkgs/applications/science/math/jags/default.nix
+++ b/pkgs/applications/science/math/jags/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl, gfortran, openblas}:
stdenv.mkDerivation rec {
- name = "JAGS-4.1.0";
+ name = "JAGS-4.3.0";
src = fetchurl {
url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";
- sha256 = "08pmrnbwibc0brgn5cx860jcl0s2xaw4amw7g45649r1bcdz7v25";
+ sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica";
};
buildInputs = [gfortran openblas];
configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ];
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index efa0c1751d4c..0cf834c8cdea 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "lp_solve-${version}";
- version = "5.5.2.0";
+ version = "5.5.2.5";
src = fetchurl {
url = "mirror://sourceforge/project/lpsolve/lpsolve/${version}/lp_solve_${version}_source.tar.gz";
- sha256 = "176c7f023mb6b8bfmv4rfqnrlw88lsg422ca74zjh19i2h5s69sq";
+ sha256 = "12pj1idjz31r7c2mb5w03vy1cmvycvbkx9z29s40qdmkp1i7q6i0";
};
patches = [ ./isnan.patch ];
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index d2f3d0c5f337..ce9c214b3f0c 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -8,7 +8,7 @@ assert cudnnSupport -> cudaSupport;
stdenv.mkDerivation rec {
name = "mxnet-${version}";
- version = "0.11.0";
+ version = "1.1.0";
# Submodules needed
src = fetchgit {
@@ -23,9 +23,12 @@ stdenv.mkDerivation rec {
++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
++ lib.optional cudnnSupport cudnn;
- cmakeFlags = [
- (if cudaSupport then "-DCUDA_ARCH_NAME=All" else "-DUSE_CUDA=OFF")
- ] ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
+ cmakeFlags =
+ (if cudaSupport then [
+ "-DCUDA_ARCH_NAME=All"
+ "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
+ ] else [ "-DUSE_CUDA=OFF" ])
+ ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
installPhase = ''
install -Dm755 libmxnet.so $out/lib/libmxnet.so
@@ -36,7 +39,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler";
- homepage = "https://mxnet.incubator.apache.org/";
+ homepage = https://mxnet.incubator.apache.org/;
maintainers = with maintainers; [ abbradar ];
license = licenses.asl20;
platforms = platforms.linux;
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
new file mode 100644
index 000000000000..8efe8d9da941
--- /dev/null
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -0,0 +1,71 @@
+{ stdenv
+, bash
+, gnused
+, fetchFromGitHub
+, gettext
+, pkgconfig
+, gtk3
+, granite
+, gnome3
+, cmake
+, ninja
+, vala
+, libqalculate
+, elementary-cmake-modules
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "nasc-${version}";
+ version = "0.4.6";
+
+ src = fetchFromGitHub {
+ owner = "parnold-x";
+ repo = "nasc";
+ rev = version;
+ sha256 = "01n4ldj5phrsv97vb04qvs9c1ip6v8wygx9llj704hly1il9fb54";
+ };
+
+ XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
+ "${granite}/share"
+ "${gnome3.libgee}/share"
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ wrapGAppsHook
+ vala
+ cmake
+ gettext
+ ];
+ buildInputs = [
+ libqalculate
+ gtk3
+ granite
+ gnome3.libgee
+ gnome3.libsoup
+ gnome3.gtksourceview
+ ];
+
+ prePatch = ''
+ substituteInPlace ./libqalculatenasc/libtool \
+ --replace "/bin/bash" "${bash}/bin/bash" \
+ --replace "/bin/sed" "${gnused}/bin/sed"
+ substituteInPlace ./libqalculatenasc/configure.inc \
+ --replace 'ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"' 'ac_default_path=$PATH'
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Do maths like a normal person";
+ longDescription = ''
+ It’s an app where you do maths like a normal person. It lets you
+ type whatever you want and smartly figures out what is math and
+ spits out an answer on the right pane. Then you can plug those
+ answers in to future equations and if that answer changes, so does
+ the equations it’s used in.
+ '';
+ homepage = https://github.com/parnold-x/nasc;
+ maintainers = with maintainers; [ samdroid-apps ];
+ platforms = platforms.linux;
+ license = licenses.gpl3Plus;
+ };
+}
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 0bae80782059..a1ddbd9ab17d 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "pari-${version}";
- version = "2.9.3";
+ version = "2.9.4";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
- sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7";
+ sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g";
};
buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ];
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index 007514e65528..b3e36b6bf206 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gp2c-${version}";
- version = "0.0.10";
+ version = "0.0.10pl1";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
- sha256 = "1xhpz5p81iw261ay1kip283ggr0ir8ydz8qx3v24z8jfms1r3y70";
+ sha256 = "16hgmdvzxbmv63x1f72q1xgfyh0qhx7kaf9nbaamy0gdawxjxcav";
};
buildInputs = [ pari perl ];
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 278194d57fa4..b02a65532577 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "qalculate-gtk-${version}";
- version = "2.1.0";
+ version = "2.2.1";
src = fetchurl {
url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz";
- sha256 = "14q89l6laa7v7d9qx7v71a0r2m65saxqgr9r871fasm400a9x8pw";
+ sha256 = "0sf4ywz8hsszaf0yr0ncdlp7mwjk6b276bwl0j9vf1j925c89pbn";
};
patchPhase = ''
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 24dc4436b0fd..b74bcc3d6377 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -18,21 +18,28 @@
# - https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath
{ stdenv
+, bash
, fetchurl
, perl
-, gfortran
+, gfortran6
, python
, autoreconfHook
, gettext
, which
, texlive
+, texinfo
, hevea
+, buildDocs ? false
+, optimize ? false # optimize sage to the current system (obviously impure)
}:
stdenv.mkDerivation rec {
- version = "8.0";
+ version = "8.1";
name = "sage-${version}";
+ # Modified version of patchShebangs that patches to the sage-internal version if possible
+ # and falls back to the system version if not.
+ patchSageShebangs = ./patchSageShebangs.sh;
src = fetchurl {
# Note that the source is *not* fetched from github, since that doesn't
# the upstream folder with all the source tarballs of the spkgs.
@@ -70,28 +77,31 @@ stdenv.mkDerivation rec {
"http://www-ftp.lip6.fr/pub/math/sagemath/src/sage-${version}.tar.gz"
"http://ftp.ntua.gr/pub/sagemath/src/sage-${version}.tar.gz"
];
- sha256 = "1a9rhb8jby6fdqa2s7n2fl9jwqqlsl7qz7dbpbwvg6jwlrvni7fg";
+ sha256 = "1cpcs1mr0yii64s152xmxyd450bfzjb22jjj0zh9y3n6g9alzpyq";
};
postPatch = ''
substituteAllInPlace src/bin/sage-env
+ bash=${bash} substituteAllInPlace build/bin/sage-spkg
'';
installPhase = ''
# Sage installs during first `make`, `make install` is no-op and just takes time.
'';
- outputs = [ "out" "doc" ];
+ outputs = [ "out" ] ++ stdenv.lib.optionals (buildDocs) [ "doc" ];
buildInputs = [
+ bash # needed for the build
perl # needed for the build
python # needed for the build
- gfortran # needed to build giac
+ gfortran6 # needed to build giac, openblas
autoreconfHook # needed to configure sage with prefix
gettext # needed to build the singular spkg
- hevea # needed to build the docs of the giac spkg
which # needed in configure of mpir
- # needed to build the docs of the giac spkg
+ texinfo # needed to build maxima
+ ] ++ stdenv.lib.optionals(buildDocs) [
+ hevea # needed to build the docs of the giac spkg
(texlive.combine { inherit (texlive)
scheme-basic
collection-pstricks # needed by giac
@@ -102,18 +112,22 @@ stdenv.mkDerivation rec {
})
];
+ nativeBuildInputs = [ gfortran6 perl which ];
+
patches = [
# fix usages of /bin/rm
./spkg-singular.patch
# help python find the crypt library
- ./spkg-python2.patch
- ./spkg-python3.patch
+ # patches python3 and indirectly python2, since those installation files are symlinked
+ ./spkg-python.patch
# fix usages of /usr/bin/perl
./spkg-git.patch
# fix usages of /bin/cp and add necessary argument to function call
./spkg-giac.patch
# environment
./env.patch
+ # adjust wrapper shebang and patch shebangs after each spkg build
+ ./shebangs.patch
];
enableParallelBuilding = true;
@@ -123,13 +137,15 @@ stdenv.mkDerivation rec {
# TODO could be patched with `sed s|printf(ctime(\(.*\)))|%s... or fixed upstream
];
+ configureFlags = stdenv.lib.optionals(buildDocs) [ "--docdir=$(doc)" ];
preConfigure = ''
- export SAGE_NUM_THREADS=$NIX_BUILD_CORES
- export SAGE_ATLAS_ARCH=fast
+ export SAGE_NUM_THREADS="$NIX_BUILD_CORES"
- export HOME=$out/sage-home
- mkdir -p $out/sage-home
+ export HOME=/tmp/sage-home
+ export SAGE_ROOT="$PWD"
+ export SAGE_SRC="$PWD"
+ mkdir -p "$HOME"
mkdir -p "$out"
# we need to keep the source around
@@ -137,25 +153,56 @@ stdenv.mkDerivation rec {
cd ..
mv "$dir" "$out/sage-root"
+ export SAGE_SPKG_INSTALL_DOCS='no'
cd "$out/sage-root" # build in target dir, since `make` is also `make install`
+ ''
+ + stdenv.lib.optionalString (buildDocs) ''
+ mkdir -p "$doc"
+ export SAGE_DOC="$doc"
+ export SAGE_DOCBUILD_OPTS="--no-pdf-links -k"
+ ''
+ + stdenv.lib.optionalString (!optimize) ''
+ export SAGE_FAT_BINARY=yes
'';
+ buildFlags = if (buildDocs) then "doc" else "build";
+
# for reference: http://doc.sagemath.org/html/en/installation/source.html
preBuild = ''
- # TODO do this conditionally
- export SAGE_SPKG_INSTALL_DOCS='no'
- patchShebangs build
+ # symlink python to make sure the shebangs are patched to the sage path
+ # while still being able to use python before building it
+ # (this is important because otherwise sage will try to install python
+ # packages globally later on)
+ ln -s "${python}/bin/python2" $out/bin/python2
+ ln -s "$out/bin/python2" $out/bin/python
+ touch $out/bin/python3
+ bash $patchSageShebangs .
'';
postBuild = ''
+ # Clean up
rm -r "$out/sage-root/upstream" # don't keep the sources of all the spkgs
- rm -r "$out/sage-root/src/build"
- rm -rf "$out/sage-root/src/.git"
+ rm -rf "$out/sage-root/src/build"
+ rm -rf "$out/sage-root/src/autom4te.cache"
+ rm -rf "$out/sage-root/src/config"
+ rm -rf "$out/sage-root/src/m4"
+ rm -rf "$out/sage-root/.git"
rm -r "$out/sage-root/logs"
+ rm -r "$out"/lib/python*/test
# Fix dependency cycle between out and doc
+ rm -f "$out/sage-root/config.log"
rm -f "$out/sage-root/config.status"
rm -f "$out/sage-root/build/make/Makefile-auto"
rm -f "$out/sage-home/.sage/gap/libgap-workspace-"*
+ # Make sure unnessessary packages don't end up in the build closure
+ find "$out" \
+ -iname 'config.log' \
+ -delete \
+ -or -iname 'Makefile' \
+ -delete
+ rm -f "$out/lib/R/etc/Renviron"
+ # Make sure all shebangs are properly patched
+ bash $patchSageShebangs $out
'';
# TODO there are some doctest failures, which seem harmless.
@@ -177,7 +224,7 @@ stdenv.mkDerivation rec {
Mission: Creating a viable free open source alternative to Magma, Maple, Mathematica and Matlab.
'';
license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
+ platforms = ["x86_64-linux" "i686-linux"];
maintainers = with stdenv.lib.maintainers; [ timokau ];
};
}
diff --git a/pkgs/applications/science/math/sage/patchSageShebangs.sh b/pkgs/applications/science/math/sage/patchSageShebangs.sh
new file mode 100644
index 000000000000..6ddf93af0114
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patchSageShebangs.sh
@@ -0,0 +1,51 @@
+# This is a slightly modified version of nix's default patchShebangs
+
+dir="$1"
+
+echo "patching sage internal script interpreter paths in $( readlink -f "$dir")"
+
+find "$dir" -type f -perm -0100 | while read f; do
+ if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then
+ # missing shebang => not a script
+ continue
+ fi
+
+ oldInterpreterLine=$(head -1 "$f" | tail -c+3)
+ read -r oldPath arg0 args <<< "$oldInterpreterLine"
+
+ if $(echo "$oldPath" | grep -q "/bin/env$"); then
+ # Check for unsupported 'env' functionality:
+ # - options: something starting with a '-'
+ # - environment variables: foo=bar
+ if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
+ echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
+ exit 1
+ fi
+ executable="$arg0"
+ else
+ if [ "$oldPath" = "" ]; then
+ # If no interpreter is specified linux will use /bin/sh. Set
+ # oldpath="/bin/sh" so that we get /nix/store/.../sh.
+ oldPath="/bin/sh"
+ fi
+ executable="$(basename "$oldPath")"
+ args="$arg0 $args"
+ fi
+
+ newPath="$(echo "$out/bin/$executable $args" | sed 's/[[:space:]]*$//')"
+ if [[ ! -x "$newPath" ]] ; then
+ newPath="$(command -v "$executable" || true)"
+ fi
+
+ # Strip trailing whitespace introduced when no arguments are present
+ newInterpreterLine="$(echo "$newPath $args" | sed 's/[[:space:]]*$//')"
+
+ if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then
+ if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then
+ echo "$f: sage interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""
+ # escape the escape chars so that sed doesn't interpret them
+ escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g')
+ sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"
+ fi
+ fi
+done
diff --git a/pkgs/applications/science/math/sage/shebangs.patch b/pkgs/applications/science/math/sage/shebangs.patch
new file mode 100644
index 000000000000..96ed5a4bc6c3
--- /dev/null
+++ b/pkgs/applications/science/math/sage/shebangs.patch
@@ -0,0 +1,36 @@
+diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg
+index 83e61a7e0d..942ba206c7 100755
+--- a/build/bin/sage-spkg
++++ b/build/bin/sage-spkg
+@@ -648,8 +648,12 @@ if ! sage-apply-patches; then
+ error_msg "Error applying patches"
+ exit 1
+ fi
++
++@bash@/bin/bash @patchSageShebangs@ .
++
+ cd ..
+
++
+ ##################################################################
+ # The package has been extracted, prepare for installation
+ ##################################################################
+@@ -671,7 +675,7 @@ write_script_wrapper() {
+ local tmpscript="$(dirname "$script")/.tmp-${script##*/}"
+
+ cat > "$tmpscript" <<__EOF__
+-#!/usr/bin/env bash
++#! @bash@/bin/bash
+
+ export SAGE_ROOT="$SAGE_ROOT"
+ export SAGE_SRC="$SAGE_SRC"
+@@ -833,6 +837,9 @@ if [ "$UNAME" = "CYGWIN" ]; then
+ sage-rebase.sh "$SAGE_LOCAL" 2>/dev/null
+ fi
+
++@bash@/bin/bash @patchSageShebangs@ .
++@bash@/bin/bash @patchSageShebangs@ "$out/bin"
++
+ echo "Successfully installed $PKG_NAME"
+
+ if [ "$SAGE_CHECK" = "yes" ]; then
diff --git a/pkgs/applications/science/math/sage/spkg-giac.patch b/pkgs/applications/science/math/sage/spkg-giac.patch
index 15b91433d254..c79d4422133d 100644
--- a/pkgs/applications/science/math/sage/spkg-giac.patch
+++ b/pkgs/applications/science/math/sage/spkg-giac.patch
@@ -1,10 +1,19 @@
---- old/build/pkgs/giac/spkg-install 2017-07-21 14:10:00.000000000 -0500
-+++ new/build/pkgs/giac/spkg-install 2017-10-15 15:55:55.321237645 -0500
-@@ -4,6 +4,8 @@
+diff --git a/build/pkgs/giac/spkg-install b/build/pkgs/giac/spkg-install
+index bdd8df6cb8..3fd7a3ef8a 100644
+--- a/build/pkgs/giac/spkg-install
++++ b/build/pkgs/giac/spkg-install
+@@ -2,6 +2,15 @@
## Giac
###########################################
-+find . -type f -exec sed -e 's@/bin/cp@cp@g' -i '{}' ';' && echo "Patching input parser" && find . -iname 'input_parser.cc'
++# Fix hardcoded paths, while making sure to only update timestamps of actually
++# changed files (otherwise confuses make)
++grep -rlF '/bin/cp' . | while read file
++do
++ sed -e 's@/bin/cp@cp@g' -i "$file"
++done
++
++# Fix input parser syntax
+sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc'
if [ "$SAGE_LOCAL" = "" ]; then
diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch
index ff9a7b2e491a..74f552dd3c36 100644
--- a/pkgs/applications/science/math/sage/spkg-git.patch
+++ b/pkgs/applications/science/math/sage/spkg-git.patch
@@ -1,12 +1,17 @@
diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install
-index 8469cb58c2..d0dc9a1db9 100755
+index 87874de3d8..b0906245fa 100644
--- a/build/pkgs/git/spkg-install
+++ b/build/pkgs/git/spkg-install
-@@ -35,6 +35,8 @@ fi
+@@ -33,6 +33,13 @@ fi
cd src
-+find . -type f -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';'
++# Fix hardcoded paths, while making sure to only update timestamps of actually
++# changed files (otherwise confuses make)
++grep -rlF '/usr/bin/perl' . | while read file
++do
++ sed -e 's@/usr/bin/perl@perl@g' -i "$file"
++done
+
# We don't want to think about Fink or Macports
export NO_FINK=1
diff --git a/pkgs/applications/science/math/sage/spkg-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch
new file mode 100644
index 000000000000..e39981b6552a
--- /dev/null
+++ b/pkgs/applications/science/math/sage/spkg-python.patch
@@ -0,0 +1,13 @@
+diff --git a/build/pkgs/python3/spkg-build b/build/pkgs/python3/spkg-build
+index 56db087ae5..b450703c5f 100644
+--- a/build/pkgs/python3/spkg-build
++++ b/build/pkgs/python3/spkg-build
+@@ -27,6 +27,8 @@ fi
+ export EXTRA_CFLAGS="`testcflags.sh -Wno-unused` $CFLAGS"
+ unset CFLAGS
+
++export LDFLAGS="$LDFLAGS -lcrypt"
++
+ if [ "$UNAME" = Darwin ]; then
+ PYTHON_CONFIGURE="--disable-toolbox-glue $PYTHON_CONFIGURE"
+
diff --git a/pkgs/applications/science/math/sage/spkg-python2.patch b/pkgs/applications/science/math/sage/spkg-python2.patch
deleted file mode 100644
index 5d92d3f8beaf..000000000000
--- a/pkgs/applications/science/math/sage/spkg-python2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- old/build/pkgs/python2/spkg-install 2017-07-21 14:10:00.000000000 -0500
-+++ new/build/pkgs/python2/spkg-install 2017-10-15 11:26:54.823134067 -0500
-@@ -22,6 +22,9 @@
-
- cd src
-
-+LDFLAGS="-lcrypt $LDFLAGS"
-+export LDFLAGS
-+
- if [ "$SAGE_DEBUG" = "yes" ]; then
- echo "Building Python with pydebug"
- PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug"
diff --git a/pkgs/applications/science/math/sage/spkg-python3.patch b/pkgs/applications/science/math/sage/spkg-python3.patch
deleted file mode 100644
index 51827fd11be0..000000000000
--- a/pkgs/applications/science/math/sage/spkg-python3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- old/build/pkgs/python3/spkg-install 2017-07-21 14:10:00.000000000 -0500
-+++ new/build/pkgs/python3/spkg-install 2017-10-15 13:11:17.769261404 -0500
-@@ -22,6 +22,9 @@
-
- cd src
-
-+LDFLAGS="-lcrypt $LDFLAGS"
-+export LDFLAGS
-+
- if [ "$SAGE_DEBUG" = "yes" ]; then
- echo "Building Python with pydebug"
- PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug"
diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch
index d561768600b4..606ffcd3ad4e 100644
--- a/pkgs/applications/science/math/sage/spkg-singular.patch
+++ b/pkgs/applications/science/math/sage/spkg-singular.patch
@@ -1,11 +1,17 @@
---- old/build/pkgs/singular/spkg-install 2017-10-15 10:35:41.826540964 -0500
-+++ new/build/pkgs/singular/spkg-install 2017-10-15 10:36:40.613743443 -0500
-@@ -4,6 +4,9 @@
+diff --git a/build/pkgs/singular/spkg-install b/build/pkgs/singular/spkg-install
+index 8caafb1699..3c34e6608a 100644
+--- a/build/pkgs/singular/spkg-install
++++ b/build/pkgs/singular/spkg-install
+@@ -2,6 +2,13 @@
## Singular
###########################################
-+find . -type f -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';'
-+#echo '#!/usr/bin/env bash\nIgnoring missing $1' > src/build-aux/missing
++# Fix hardcoded paths, while making sure to only update timestamps of actually
++# changed files (otherwise confuses make)
++grep -rlF '/bin/rm' . | while read file
++do
++ sed -e 's@/bin/rm@rm@g' -i "$file"
++done
+
if [ -z "$SAGE_LOCAL" ]; then
echo >&2 "Error: SAGE_LOCAL undefined -- exiting..."
diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix
index f6e255ee46e4..154f1ba39e3c 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, xlibs }:
+{ stdenv, fetchurl, lib, xorg }:
let
name = "scilab-bin-${ver}";
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
libPath = lib.makeLibraryPath [
stdenv.cc.cc
- xlibs.libX11
- xlibs.libXext
- xlibs.libXi
- xlibs.libXrender
- xlibs.libXtst
- xlibs.libXxf86vm
+ xorg.libX11
+ xorg.libXext
+ xorg.libXi
+ xorg.libXrender
+ xorg.libXtst
+ xorg.libXxf86vm
];
phases = [ "unpackPhase" "fixupPhase" "installPhase" ];
diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index 18cb26890634..6a692e07c433 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "weka-${version}";
- version = "3.8.1";
+ version = "3.8.2";
src = fetchurl {
url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip";
- sha256 = "16n1a74d1cispp0a22zyiivi78izi354y67gmbyvv2lv9sc45wmk";
+ sha256 = "0p353lhhcv3swwn1bl64vkyjk480vv9ghhlyqjxiar4p3xifjayb";
};
buildInputs = [ unzip ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
homepage = http://www.cs.waikato.ac.nz/ml/weka/;
description = "Collection of machine learning algorithms for data mining tasks";
license = stdenv.lib.licenses.gpl2Plus;
- maintainer = [stdenv.lib.maintainers.mimadrid];
+ maintainers = [ stdenv.lib.maintainers.mimadrid ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 6c866a8d2164..67cdaa4055ac 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -1,28 +1,26 @@
{ stdenv, fetchFromGitHub
-, wrapGAppsHook, autoreconfHook, gettext
+, wrapGAppsHook, cmake, gettext
, maxima, wxGTK, gnome3 }:
stdenv.mkDerivation rec {
name = "wxmaxima-${version}";
- version = "17.10.1";
+ version = "18.02.0";
src = fetchFromGitHub {
owner = "andrejv";
repo = "wxmaxima";
rev = "Version-${version}";
- sha256 = "088h8dlc9chkppwl4ck9i0fgf2d1dcpi5kq8qbpr5w75vhwsb6qm";
+ sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa";
};
buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ];
- nativeBuildInputs = [ wrapGAppsHook autoreconfHook gettext ];
+ nativeBuildInputs = [ wrapGAppsHook cmake gettext ];
preConfigure = ''
gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin)
'';
- doCheck = true;
-
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix
index d8e8d49bb706..ff25bc974900 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, mesa }:
+{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU_combined }:
with stdenv.lib;
stdenv.mkDerivation {
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
'';
postInstall = let
- libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ];
+ libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU_combined ];
in ''
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 716d6d9687c5..a1b8769617c9 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,
-mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
+libGLU_combined, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
let
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ];
buildInputs = [
- curl mesa libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver
+ curl libGLU_combined libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver
libnotify patchelf libX11 libxcb xcbutil
];
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index d5ffe9cd9ba8..0194ee0b83c0 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cytoscape-${version}";
- version = "3.5.1";
+ version = "3.6.0";
src = fetchurl {
url = "http://chianti.ucsd.edu/${name}/${name}.tar.gz";
- sha256 = "1dvv0f7sc7q7lwmpd7xkcx86dd8lxh2il3wiwkij44gh7ni1qkfm";
+ sha256 = "13q8caksbzi6j7xy8v5f0pi6766yfawys6jcm50ng78mnhrv2v97";
};
buildInputs = [jre makeWrapper];
diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix
index 6736ce758973..3a0bcb66813e 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@@ -1,37 +1,64 @@
-{stdenv, fetchurl, jdk}:
+{ stdenv, fetchFromGitHub, callPackage, jdk, maven, javaPackages }:
-with stdenv.lib;
+let
+ version = "0.9.2";
-let version = "0.9.1"; in
-stdenv.mkDerivation {
- name = "gephi-${version}";
-
- src = fetchurl {
- url = "https://github.com/gephi/gephi/releases/download/v${version}/gephi-${version}-linux.tar.gz";
- sha256 = "f1d54157302df05a53b94e1518880c949c43ba4ab21e52d57f3edcbdaa06c7ee";
+ src = fetchFromGitHub {
+ owner = "gephi";
+ repo = "gephi";
+ rev = "v${version}";
+ sha256 = "0kqp2nvnsb55j1axb6hk0mlw5alyaiyb70z0mdybhpqqxyw2da2r";
};
- meta = {
- inherit version;
+ # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
+ deps = stdenv.mkDerivation {
+ name = "gephi-${version}-deps";
+ inherit src;
+ buildInputs = [ jdk maven ];
+ buildPhase = ''
+ while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
+ echo "timeout, restart maven to continue downloading"
+ done
+ '';
+ # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
+ installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif";
+ };
+in
+stdenv.mkDerivation rec {
+ name = "gephi-${version}";
+
+ inherit src;
+
+ buildInputs = [ jdk maven ];
+
+ buildPhase = ''
+ # 'maven.repo.local' must be writable so copy it out of nix store
+ mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
+ '';
+
+ installPhase = ''
+ cp -r modules/application/target/gephi $out
+
+ # remove garbage
+ find $out -type f -name .lastModified -delete
+ find $out -type f -regex '.+\.exe' -delete
+
+ # use self-compiled JOGL to avoid patchelf'ing .so inside jars
+ rm $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-{jogl,gluegen}/*.jar
+ cp ${javaPackages.jogl_2_3_2}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/
+ cp ${javaPackages.jogl_2_3_2}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/
+
+ echo "jdkhome=${jdk}" >> $out/etc/gephi.conf
+ '';
+
+ meta = with stdenv.lib; {
description = "A platform for visualizing and manipulating large graphs";
homepage = https://gephi.org;
license = licenses.gpl3;
- maintainers = [maintainers.taeer];
- platforms = platforms.linux;
+ maintainers = [ maintainers.taeer ];
+ platforms = [ "x86_64-linux" ];
};
-
- buildInputs = [jdk];
-
- configurePhase = "
- echo \"jdkhome=${jdk}\" >> etc/gephi.conf
- ";
-
- dontBuild = true;
-
- installPhase = "
- mkdir $out
- for a in ./*; do
- mv $a $out
- done
- ";
}
diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix
index 5fe72e44842d..5b210fa4bf6b 100644
--- a/pkgs/applications/science/misc/golly/beta.nix
+++ b/pkgs/applications/science/misc/golly/beta.nix
@@ -1,5 +1,5 @@
{stdenv, fetchurl, fetchgit
-, wxGTK, perl, python2, zlib, mesa, libX11
+, wxGTK, perl, python2, zlib, libGLU_combined, libX11
, automake, autoconf
}:
let
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [autoconf automake];
buildInputs = [
- wxGTK perl python2 zlib mesa libX11
+ wxGTK perl python2 zlib libGLU_combined 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 f4bf24a73433..8ecbf656a821 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, mesa, libX11}:
+{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}:
stdenv.mkDerivation rec {
baseName="golly";
version = "3.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- wxGTK perl python2 zlib mesa libX11
+ wxGTK perl python2 zlib libGLU_combined libX11
];
setSourceRoot = ''
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index c8f89c398b12..8b6c7497e547 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, mesa, glew, gdal_1_11, cgal
+{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU_combined, 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 mesa glew gdal_1_11 cgal proj boost cmake python2
+ qt4 qwt6_qt4 libGLU_combined glew gdal_1_11 cgal proj boost cmake python2
doxygen graphviz gmp
];
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 676395d03d53..00ca1d2c7abe 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
-, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lz4, lzma, gsl, xxHash
+, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash
, Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
name = "root-${version}";
- version = "6.10.08";
+ version = "6.12.06";
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
- sha256 = "12mddl6pqwwc9nr4jqzp6h1jm4zycazd3v88dz306m1nmk97dlic";
+ sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ]
- ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ]
+ ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
;
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 8a3645705ab5..34ff510e1d8b 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -1,75 +1,106 @@
-{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_3, graphviz, libsigcxx
-, libunwind, elfutils, python3, doxygen
+{ stdenv, fetchFromGitHub, cmake, elfutils, perl, python3, boost, valgrind
+# Optional requirements
+# Lua 5.3 needed and not available now
+#, luaSupport ? false, lua5
+, fortranSupport ? false, gfortran
+, buildDocumentation ? false, transfig, ghostscript, doxygen
+, buildJavaBindings ? false, openjdk
+, modelCheckingSupport ? false, libunwind, libevent # Inside elfutils - , libelf, libevent, libdw
+, debug ? false
+, moreTests ? false
}:
-stdenv.mkDerivation rec {
- version = "3.15";
- name = "simgrid-${version}";
+# helpers for options
+let optionals = stdenv.lib.optionals;
+ optionalString = stdenv.lib.optionalString;
+ optionOnOff = option: "${if option then "on" else "off"}";
+in
- src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/36621/${name}.tar.gz";
- sha256 = "1s595wc4z8hkvim3ypfdxy16pply6ckjg10v84cc0lx9pz6i3r6i";
+stdenv.mkDerivation rec {
+ major_version = "3";
+ minor_version = "17";
+ version = "v${major_version}.${minor_version}";
+ tagged_version = "${major_version}_${minor_version}";
+ name = "simgrid";
+
+ src = fetchFromGitHub {
+ owner = "simgrid";
+ repo = "simgrid";
+ rev = "v3_17";
+ sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4";
+ #rev = "master";
+ #sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm";
};
- buildInputs = [ cmake perl ruby boost lua5_3 graphviz libsigcxx libunwind
- elfutils python3 doxygen
- ];
+ nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind]
+ ++ optionals fortranSupport [gfortran]
+ ++ optionals buildJavaBindings [openjdk]
+ ++ optionals buildDocumentation [transfig ghostscript doxygen]
+ ++ optionals modelCheckingSupport [libunwind libevent];
+
+ #buildInputs = optional luaSupport lua5;
preConfigure =
# Make it so that libsimgrid.so will be found when running programs from
# the build dir.
- '' export LD_LIBRARY_PATH="$PWD/src/.libs"
- export cmakeFlags="-Dprefix=$out"
-
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
- -isystem $(echo "${libsigcxx}/lib/"sigc++*/include)
- -isystem $(echo "${libsigcxx}/include"/sigc++* )
- "
- export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${libsigcxx}/lib/"sigc++*)"
-
- # Enable more functionality.
- export cmakeFlags="$cmakeFlags -Denable_tracing=on -Denable_jedule=on
- -Denable_latency_bound_tracking=on -Denable_lua=on
- -Denable_ns3=off -Denable_gtnets=on
- "
+ ''
+ export LD_LIBRARY_PATH="$PWD/build/lib"
'';
- makeFlags = "VERBOSE=1";
+ # Release mode is not supported in SimGrid
+ cmakeBuildType = "Debug";
+
+ # Disable/Enable functionality
+ # Note: those packages are not packaged in Nixpkgs yet so some options
+ # are disabled:
+ # - papi: for enable_smpi_papi
+ # - ns3: for enable_ns3
+ # - lua53: for enable_lua
+ #
+ # For more information see:
+ # http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list
+ cmakeFlags= ''
+ -Denable_documentation=${optionOnOff buildDocumentation}
+ -Denable_java=${optionOnOff buildJavaBindings}
+ -Denable_fortran=${optionOnOff fortranSupport}
+ -Denable_model-checking=${optionOnOff modelCheckingSupport}
+ -Denable_ns3=off
+ -Denable_lua=off
+ -Denable_lib_in_jar=off
+ -Denable_maintainer_mode=off
+ -Denable_mallocators=on
+ -Denable_debug=on
+ -Denable_smpi=on
+ -Denable_smpi_ISP_testsuite=${optionOnOff moreTests}
+ -Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}
+ -Denable_compile_warnings=${optionOnOff debug}
+ -Denable_compile_optimizations=${optionOnOff (!debug)}
+ -Denable_lto=${optionOnOff (!debug)}
+ '';
+ #-Denable_lua=${optionOnOff luaSupport}
+ #-Denable_smpi_papi=${optionOnOff moreTests}
+
+ makeFlags = optionalString debug "VERBOSE=1";
preBuild =
- /* Work around this:
-
- [ 20%] Generating _msg_handle_simulator.c, _msg_handle_client.c, _msg_handle_server.c
- cd /tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/build/teshsuite/gras/msg_handle && ../../../bin/gras_stub_generator msg_handle /tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/teshsuite/gras/msg_handle/msg_handle.xml
- ../../../bin/gras_stub_generator: error while loading shared libraries: libsimgrid.so.3.5: cannot open shared object file: No such file or directory
- make[2]: *** [teshsuite/gras/msg_handle/_msg_handle_simulator.c] Error 127
- make[2]: Leaving directory `/tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/build'
-
- */
- '' export LD_LIBRARY_PATH="$PWD/lib:$LD_LIBRARY_PATH"
- echo "\$LD_LIBRARY_PATH is \`$LD_LIBRARY_PATH'"
+ ''
+ # Some perl scripts are called to generate test during build which
+ # is before the fixupPhase of nix, so do this manualy here:
+ patchShebangs ..
'';
- patchPhase =
- '' for i in "src/smpi/"*
- do
- test -f "$i" &&
- sed -i "$i" -e's|/bin/bash|/bin/sh|g'
- done
+ doCheck = true;
+ checkPhase = ''
+ runHook preCheck
- for i in $(grep -rl /usr/bin/perl .)
- do
- sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g'
- done
- patchShebangs ./tools/
+ ctest --output-on-failure -E smpi-replay-multiple
+
+ runHook postCheck
'';
+ enableParallelBuilding = true;
- # Fixing the few tests that fail is left as an exercise to the reader.
- doCheck = false;
-
- meta = {
- description = "Simulator for distributed applications in heterogeneous environments";
-
+ meta = with stdenv.lib; {
+ description = "Framework for the simulation of distributed applications";
longDescription =
'' SimGrid is a toolkit that provides core functionalities for the
simulation of distributed applications in heterogeneous distributed
@@ -78,12 +109,9 @@ stdenv.mkDerivation rec {
scheduling on distributed computing platforms ranging from simple
network of workstations to Computational Grids.
'';
-
homepage = http://simgrid.gforge.inria.fr/;
-
- license = stdenv.lib.licenses.lgpl2Plus;
-
- maintainers = [ ];
- platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ maintainers = with maintainers; [ mickours ];
+ platforms = platforms.x86_64;
+ license = licenses.lgpl2Plus;
};
}
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 9b8035fcefe7..8560d900a4fa 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -1,16 +1,16 @@
-{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4
+{ fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4
, cmake, makeWrapper, libjpeg, python }:
-let version = "4.9.0"; in
+let version = "5.1.0"; in
stdenv.mkDerivation rec {
name = "tulip-${version}";
src = fetchurl {
url = "mirror://sourceforge/auber/${name}_src.tar.gz";
- sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3";
+ sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h";
};
- buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ];
+ buildInputs = [ libxml2 freetype glew libGLU_combined 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 510c56b66c88..64482ddd74bc 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, mesa }:
+{ fetchsvn, stdenv, cmake, qt4, libGLU_combined }:
# 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 mesa ];
+ buildInputs = [ cmake qt4 libGLU_combined ];
NIX_LDFLAGS = "-lGLU";
diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix
index 8ed8e0e73b00..3bfb70f5ce8e 100644
--- a/pkgs/applications/science/programming/fdr/default.nix
+++ b/pkgs/applications/science/programming/fdr/default.nix
@@ -1,9 +1,9 @@
{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}:
stdenv.mkDerivation {
- name = "fdr-4.2.0";
+ name = "fdr-4.2.3";
src = fetchurl {
- url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3754-linux-x86_64.tar.gz;
- sha256 = "d24492485db9b8b95c62c53a6396094f836ee079cfc743688a397503c3ec9bf8";
+ url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz;
+ sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88";
};
libPath = stdenv.lib.makeLibraryPath [
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
cp -r * "$out"
# Hack around lack of libtinfo in NixOS
ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
- ln -s ${qtbase.out}/$qtPluginPrefix $out/lib/qt_plugins
+ ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins
ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof
diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix
index eb157e8b99f5..f46f7afb659c 100644
--- a/pkgs/applications/science/programming/plm/default.nix
+++ b/pkgs/applications/science/programming/plm/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Free cross-platform programming exerciser";
- Homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/;
+ homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/;
license = licenses.gpl3;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 98ec39eb2064..087969fe61a0 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake
+{ stdenv, fetchgit, git, espeak, SDL2, udev, doxygen, cmake
, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake
, makeWrapper, lndir
, gst_all_1, qt-gstreamer1, pkgconfig, glibc
-, version ? "2.9.4"
}:
stdenv.mkDerivation rec {
name = "qgroundcontrol-${version}";
+ version = "3.2.7";
qtInputs = [
qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg
@@ -19,72 +19,54 @@ stdenv.mkDerivation rec {
];
enableParallelBuilding = true;
- buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs;
+ buildInputs = [ SDL2 udev doxygen git ] ++ gstInputs ++ qtInputs;
nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
- patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
- postPatch = ''
- sed '1i#include ' -i src/Vehicle/Vehicle.cc \
- -i src/comm/{QGCFlightGearLink,QGCJSBSimLink}.cc \
- -i src/{uas/UAS,ui/QGCDataPlot2D}.cc
- '';
-
preConfigure = ''
mkdir build
cd build
'';
- qmakeFlags = [ "../qgroundcontrol.pro" ];
+ qmakeFlags = [
+ # Default install tries to copy Qt files into package
+ "CONFIG+=QGC_DISABLE_BUILD_SETUP"
+ "../qgroundcontrol.pro"
+ ];
installPhase = ''
cd ..
+
mkdir -p $out/share/applications
- cp -v qgroundcontrol.desktop $out/share/applications
-
+ cp -v deploy/qgroundcontrol.desktop $out/share/applications
+
mkdir -p $out/bin
- cp -v build/release/qgroundcontrol "$out/bin/"
-
+ cp -v build/release/QGroundControl "$out/bin/"
+
mkdir -p $out/share/qgroundcontrol
cp -rv resources/ $out/share/qgroundcontrol
-
+
mkdir -p $out/share/pixmaps
cp -v resources/icons/qgroundcontrol.png $out/share/pixmaps
-
- # we need to link to our Qt deps in our own output if we want
- # this package to work without being installed as a system pkg
- mkdir -p $out/lib/qt-$qtCompatVersion $out/etc/xdg
- for pkg in $qtInputs; do
- if [[ -d $pkg/lib/qt-$qtCompatVersion ]]; then
- for dir in lib/qt-$qtCompatVersion share etc/xdg; do
- if [[ -d $pkg/$dir ]]; then
- ${lndir}/bin/lndir "$pkg/$dir" "$out/$dir"
- fi
- done
- fi
- done
'';
-
postInstall = ''
wrapProgram "$out/bin/qgroundcontrol" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
'';
-
# TODO: package mavlink so we can build from a normal source tarball
src = fetchgit {
url = "https://github.com/mavlink/qgroundcontrol.git";
rev = "refs/tags/v${version}";
- sha256 = "0isr0zamhvr853c94lblazkilil6zzmvf7afs3mxgn07jn9wrqz3";
+ sha256 = "1sla3sgj2p3h87d7kcaj53f8z5xzyadvsqlqzgh4d2n1f7sikdc5";
fetchSubmodules = true;
};
- meta = {
+ meta = with stdenv.lib; {
description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
homepage = http://qgroundcontrol.org/;
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = with stdenv.lib.platforms; linux;
- maintainers = with stdenv.lib.maintainers; [ pxc ];
- broken = true; # relies improperly on private Qt 5.5 headers
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ pxc ];
};
}
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 76b05c8a3a71..98576cfd0917 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "yarp-${version}";
- version = "2.3.68";
+ version = "2.3.70.2";
src = fetchFromGitHub {
owner = "robotology";
repo = "yarp";
rev = "v${version}";
- sha256 = "1ksz2kv4v14fqgz3fsvvmdk2sikhnxr11jhhf7c2547x6jbzhda6";
+ sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a";
};
buildInputs = [ cmake ace ];
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 0952b61551e3..ed6e6334a5d7 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchPypi, unzip, buildPythonApplication, makeDesktopItem
# mandatory
-, qtpy, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil
-, pyflakes, rope, sphinx, nbconvert, mccabe
+, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil
+, pyflakes, rope, sphinx, nbconvert, mccabe, pyopengl, cloudpickle
# optional
, numpy ? null, scipy ? null, matplotlib ? null
# optional
@@ -10,17 +10,21 @@
buildPythonApplication rec {
pname = "spyder";
- version = "3.2.4";
- namePrefix = "";
+ version = "3.2.7";
src = fetchPypi {
inherit pname version;
- sha256 = "028hg71gfq2yrplwhhl7hl4rbwji1l0zxzghblwmb0i443ki10v3";
+ sha256 = "b5bb8fe0a556930dc09b68fa2741a0de3da6488843ec960e0c62f1f3b2e08e2f";
};
+ # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
+ postPatch = ''
+ substituteInPlace setup.py --replace 'pyqt5;python_version>="3"' ' '
+ '';
+
propagatedBuildInputs = [
- jedi pycodestyle psutil qtpy pyflakes rope numpy scipy matplotlib pylint
- numpydoc qtconsole qtawesome nbconvert mccabe
+ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
+ numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
];
# There is no test for spyder
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix
index f6df5fc496d7..79af80ea75f5 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils,
- gnome3, pythonPackages, wrapGAppsHook }:
+{ stdenv, fetchurl, file, which, intltool, gobjectIntrospection,
+ findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme,
+ wrapGAppsHook
+}:
pythonPackages.buildPythonApplication rec {
majorver = "1.4";
- minorver = "2";
+ minorver = "4";
version = "${majorver}.${minorver}";
- name = "catfish-${version}";
+ pname = "catfish";
src = fetchurl {
- url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${name}.tar.bz2";
- sha256 = "0j3by9yfs4j9za3s5qdxrsm7idmps69pimc9d0mjyakvviy0izm3";
+ url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${pname}-${version}.tar.gz";
+ sha256 = "1mw7py6si6y88jblmzm04hf049bpww7h87k2wypq07zm1dw55m52";
};
nativeBuildInputs = [
@@ -17,6 +19,7 @@ pythonPackages.buildPythonApplication rec {
file
which
intltool
+ gobjectIntrospection
wrapGAppsHook
];
@@ -26,6 +29,7 @@ pythonPackages.buildPythonApplication rec {
pythonPackages.pyxdg
pythonPackages.ptyprocess
pythonPackages.pycairo
+ hicolor-icon-theme
];
propagatedBuildInputs = [
@@ -35,17 +39,20 @@ pythonPackages.buildPythonApplication rec {
findutils
];
- preFixup = ''
- rm "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.pyc"
- for f in \
- "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \
- "$out/share/applications/catfish.desktop"
- do
- substituteInPlace $f --replace "${pythonPackages.python}" "$out"
- done
+ # Explicitly set the prefix dir in "setup.py" because setuptools is
+ # not using "$out" as the prefix when installing catfish data. In
+ # particular the variable "__catfish_data_directory__" in
+ # "catfishconfig.py" is being set to a subdirectory in the python
+ # path in the store.
+ postPatch = ''
+ sed -i "/^ if self.root/i\\ self.prefix = \"$out\"" setup.py
'';
+ # Disable check because there is no test in the source distribution
+ doCheck = false;
+
meta = with stdenv.lib; {
+ homepage = https://launchpad.net/catfish-search;
description = "A handy file search tool";
longDescription = ''
Catfish is a handy file searching tool. The interface is
@@ -53,7 +60,6 @@ pythonPackages.buildPythonApplication rec {
You can configure it to your needs by using several command line
options.
'';
- homepage = https://launchpad.net/catfish-search;
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix
index 3a9df1505742..ba9fbee5d969 100644
--- a/pkgs/applications/search/doodle/default.nix
+++ b/pkgs/applications/search/doodle/default.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation rec {
buildInputs = [ libextractor gettext ];
src = fetchurl {
- url = "http://grothoff.org/christian/doodle/download/${name}.tar.gz";
+ url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz";
sha256 = "0ayx5q7chzll9sv3miq35xl36r629cvgdzphf379kxzlzhjldy3j";
};
meta = {
- homepage = http://grothoff.org/christian/doodle/;
+ homepage = https://grothoff.org/christian/doodle/;
description = "Tool to quickly index and search documents on a computer";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 649b34e75692..ade8af254496 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -7,45 +7,54 @@
assert stdenv.system != "powerpc-linux";
stdenv.mkDerivation rec {
- ver = "1.23.1";
+ ver = "1.23.7";
name = "recoll-${ver}";
src = fetchurl {
url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
- sha256 = "0si407qm47ndy0l6zv57lqb5za4aiv0lyghnzb211g03szjkfpg8";
+ sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn";
};
- configureFlags = [ "--with-inotify" ];
+ configureFlags = [ "--enable-recollq" ] ++
+ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);
- buildInputs = [ qt4 xapian file python bison];
+ buildInputs = [ qt4 xapian file python bison ];
+
+ patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+ sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am
+ sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.in
+ '';
# the filters search through ${PATH} using a sh proc 'checkcmds' for the
# filtering utils. Short circuit this by replacing the filtering command with
# the absolute path to the filtering command.
postInstall = ''
for f in $out/share/recoll/filters/* ; do
- substituteInPlace $f --replace antiword ${lib.getBin antiword}/bin/antiword
- substituteInPlace $f --replace awk ${lib.getBin gawk}/bin/awk
- substituteInPlace $f --replace catppt ${lib.getBin catdoc}/bin/catppt
- substituteInPlace $f --replace djvused ${lib.getBin djvulibre}/bin/djvused
- substituteInPlace $f --replace djvutxt ${lib.getBin djvulibre}/bin/djvutxt
- substituteInPlace $f --replace egrep ${lib.getBin gnugrep}/bin/egrep
- substituteInPlace $f --replace groff ${lib.getBin groff}/bin/groff
- substituteInPlace $f --replace gunzip ${lib.getBin gzip}/bin/gunzip
- substituteInPlace $f --replace iconv ${lib.getBin libiconv}/bin/iconv
- substituteInPlace $f --replace lyx ${lib.getBin lyx}/bin/lyx
- substituteInPlace $f --replace pdftotext ${lib.getBin poppler_utils}/bin/pdftotext
- substituteInPlace $f --replace pstotext ${lib.getBin ghostscript}/bin/ps2ascii
- substituteInPlace $f --replace sed ${lib.getBin gnused}/bin/sed
- substituteInPlace $f --replace tar ${lib.getBin gnutar}/bin/tar
- substituteInPlace $f --replace unzip ${lib.getBin unzip}/bin/unzip
- substituteInPlace $f --replace xls2csv ${lib.getBin catdoc}/bin/xls2csv
- substituteInPlace $f --replace xsltproc ${lib.getBin libxslt}/bin/xsltproc
- substituteInPlace $f --replace unrtf ${lib.getBin unrtf}/bin/unrtf
- substituteInPlace $f --replace untex ${lib.getBin untex}/bin/untex
- substituteInPlace $f --replace wpd2html ${lib.getBin libwpd}/bin/wpd2html
- substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl
+ if [[ ! "$f" =~ \.zip$ ]]; then
+ substituteInPlace $f --replace '"antiword"' '"${lib.getBin antiword}/bin/antiword"'
+ substituteInPlace $f --replace '"awk"' '"${lib.getBin gawk}/bin/awk"'
+ substituteInPlace $f --replace '"catppt"' '"${lib.getBin catdoc}/bin/catppt"'
+ substituteInPlace $f --replace '"djvused"' '"${lib.getBin djvulibre}/bin/djvused"'
+ substituteInPlace $f --replace '"djvutxt"' '"${lib.getBin djvulibre}/bin/djvutxt"'
+ substituteInPlace $f --replace '"egrep"' '"${lib.getBin gnugrep}/bin/egrep"'
+ substituteInPlace $f --replace '"groff"' '"${lib.getBin groff}/bin/groff"'
+ substituteInPlace $f --replace '"gunzip"' '"${lib.getBin gzip}/bin/gunzip"'
+ substituteInPlace $f --replace '"iconv"' '"${lib.getBin libiconv}/bin/iconv"'
+ substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"'
+ substituteInPlace $f --replace '"pstotext"' '"${lib.getBin ghostscript}/bin/ps2ascii"'
+ substituteInPlace $f --replace '"sed"' '"${lib.getBin gnused}/bin/sed"'
+ substituteInPlace $f --replace '"tar"' '"${lib.getBin gnutar}/bin/tar"'
+ substituteInPlace $f --replace '"unzip"' '"${lib.getBin unzip}/bin/unzip"'
+ substituteInPlace $f --replace '"xls2csv"' '"${lib.getBin catdoc}/bin/xls2csv"'
+ substituteInPlace $f --replace '"xsltproc"' '"${lib.getBin libxslt}/bin/xsltproc"'
+ substituteInPlace $f --replace '"unrtf"' '"${lib.getBin unrtf}/bin/unrtf"'
+ substituteInPlace $f --replace '"untex"' '"${lib.getBin untex}/bin/untex"'
+ substituteInPlace $f --replace '"wpd2html"' '"${lib.getBin libwpd}/bin/wpd2html"'
+ substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl
+ fi
done
+ '' + stdenv.lib.optionalString stdenv.isLinux ''
+ substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"'
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix
index 72d6999fa1d7..5883e51f712e 100644
--- a/pkgs/applications/taxes/aangifte-2006/default.nix
+++ b/pkgs/applications/taxes/aangifte-2006/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2006";
- url = "http://www.belastingdienst.nl/download/1341.html";
+ homepage = "http://www.belastingdienst.nl/download/1341.html";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix
index 15c826feb6e7..43fb26d811a3 100644
--- a/pkgs/applications/taxes/aangifte-2007/default.nix
+++ b/pkgs/applications/taxes/aangifte-2007/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2007";
- url = "http://www.belastingdienst.nl/download/1341.html";
+ homepage = "http://www.belastingdienst.nl/download/1341.html";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix
index 905471cb76b8..b9fad2fa10bd 100644
--- a/pkgs/applications/taxes/aangifte-2008/default.nix
+++ b/pkgs/applications/taxes/aangifte-2008/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html;
+ homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix
index c944fc3d68b3..d4230d426ece 100644
--- a/pkgs/applications/taxes/aangifte-2009/default.nix
+++ b/pkgs/applications/taxes/aangifte-2009/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+ homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix
index b5a85415c376..602368d2017b 100644
--- a/pkgs/applications/taxes/aangifte-2010/default.nix
+++ b/pkgs/applications/taxes/aangifte-2010/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+ homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix
index a38bc4254bbe..80c772705142 100644
--- a/pkgs/applications/taxes/aangifte-2011/default.nix
+++ b/pkgs/applications/taxes/aangifte-2011/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+ homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix
index 2e51ef9ed4cf..8066c86742c1 100644
--- a/pkgs/applications/taxes/aangifte-2012/default.nix
+++ b/pkgs/applications/taxes/aangifte-2012/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
+ homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix
index 5ee0edb4b5e5..6f8e6d6429d3 100644
--- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix
+++ b/pkgs/applications/taxes/aangifte-2013-wa/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
+ homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix
index 3cf85961a9bb..d75b60c83673 100644
--- a/pkgs/applications/taxes/aangifte-2013/default.nix
+++ b/pkgs/applications/taxes/aangifte-2013/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
+ homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix
index 78bb8214257f..38124677f9a5 100644
--- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix
+++ b/pkgs/applications/taxes/aangifte-2014-wa/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
+ homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix
index 0151cca52b2c..33b6f8853aa2 100644
--- a/pkgs/applications/taxes/aangifte-2014/default.nix
+++ b/pkgs/applications/taxes/aangifte-2014/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = {
description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)";
- url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
+ homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 80c4401f1708..cadc72f0f87b 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "fossil-${version}";
- version = "2.3";
+ version = "2.5";
src = fetchurl {
urls =
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${name}.tar.gz";
- sha256 = "0paalvb4rdyr79v6rwspaha5n4dqb92df9irijha13m3apsanwzh";
+ sha256 = "1lxawkhr1ki9fqw8076fxib2b1w673449yzb6vxjshqzh5h77c7r";
};
buildInputs = [ zlib openssl readline sqlite which ed ]
diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix
index 54693f3c5f01..0475a8ae76ca 100644
--- a/pkgs/applications/version-management/gerrit/default.nix
+++ b/pkgs/applications/version-management/gerrit/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "gerrit-${version}";
- version = "2.14.3";
+ version = "2.14.6";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
- sha256 = "1hxrlhp5l5q4lp5b5bq8va7856cnm4blfv01rgqq3yhvn432sq6v";
+ sha256 = "0fsqwfsnyb4nbxgb1i1mp0vshl0mk8bwqlddzqr9x2v99mbca28q";
};
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "1j1afxv7yj2fxaw0wy8kmxi6sl9fwj8xsxs5kzg9qz5gzayb26kp";
+ outputHash = "1qrmvqqnlbabqz4yx06vi030ci12v0063iq2palxmbj3whrzv9la";
buildCommand = ''
mkdir -p "$out"/webapps/
diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
index b2a4bc66c699..7bf83b5621b5 100644
--- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:
let
- version = "1.12.15";
+ version = "1.13.0";
jarName = "bfg-${version}.jar";
mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}";
in
@@ -12,7 +12,7 @@ in
src = fetchurl {
url = mavenUrl;
- sha256 = "17dh25jambkk55khknlhy8wa9s1i1xmh9hdgj72j1lzyl0ag42ik";
+ sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz";
};
buildInputs = [ jre makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 3c7d0a86be04..d890001489ff 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xml_xslt, pkgconfig, luajit
, gzip, bzip2, xz
+, python, wrapPython, pygments, markdown
}:
stdenv.mkDerivation rec {
@@ -20,10 +21,11 @@ stdenv.mkDerivation rec {
sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
buildInputs = [
openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit
];
+ pythonPath = [ pygments markdown ];
postPatch = ''
sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
@@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
a2x --no-xmllint -f manpage cgitrc.5.txt
mkdir -p "$out/share/man/man5"
cp cgitrc.5 "$out/share/man/man5"
+
+ wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
'';
meta = {
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 75b53d2cfe09..e5e36e998ace 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -51,6 +51,10 @@ rec {
git-annex = pkgs.haskellPackages.git-annex;
gitAnnex = git-annex;
+ git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui {
+ inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
+ };
+
git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { };
git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { };
@@ -96,6 +100,8 @@ rec {
gitflow = callPackage ./gitflow { };
+ grv = callPackage ./grv { };
+
hub = callPackage ./hub {
inherit (darwin) Security;
};
@@ -111,7 +117,7 @@ rec {
git = gitSVN;
};
- svn2git_kde = callPackage ./svn2git-kde { };
+ svn_all_fast_export = libsForQt5.callPackage ./svn-all-fast-export { };
tig = callPackage ./tig { };
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index 5878f3a8b74c..988911d2eb7b 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "diff-so-fancy-${version}";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${version}";
- sha256 = "1hgppp8ngjbjzbi96529p36hzi0ysdndrh6d6m71gs21am8v4m9r";
+ sha256 = "0j8dxfl4js7agwdpcvxwigzpp0lik33h7s3vsjg0pd413h2j4mvz";
};
# Perl is needed here for patchShebangs
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
new file mode 100644
index 000000000000..ba64a065d281
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }:
+
+buildPythonApplication rec {
+ name = "git-annex-metadata-gui-${version}";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "alpernebbi";
+ repo = "git-annex-metadata-gui";
+ rev = "v${version}";
+ sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam";
+ };
+
+ prePatch = ''
+ substituteInPlace setup.py --replace "'PyQt5', " ""
+ '';
+
+ propagatedBuildInputs = [ pyqt5 git-annex-adapter ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/alpernebbi/git-annex-metadata-gui;
+ description = "Graphical interface for git-annex metadata commands";
+ maintainers = with maintainers; [ dotlambda ];
+ license = licenses.gpl3Plus;
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
index d38529e92e60..c368dcd487e8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "git-annex-remote-rclone-${version}";
- version = "0.5";
+ version = "0.6";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "DanielDent";
repo = "git-annex-remote-rclone";
- sha256 = "1353b6q3lnxhpdfy9yd2af65v7aypdhyvgn7ziksmsrbi12lb74i";
+ sha256 = "0j0hlxji8d974fq7zd4xc02n0jpi31ylhxc7z4zp8iiwad5mkpxp";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index 4ed9c5c0509c..c14a027b4abe 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
homepage = http://git.fishsoup.net/cgit/git-bz/;
- maintainers = with maintainers; [ nckx ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
index 07e0ce80c5d6..206a4af91212 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
name = "git-codeowners-${version}";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "softprops";
repo = "git-codeowners";
rev = "v${version}";
- sha256 = "0imxbi6y1165bi2rik0n98v79fkgp8alb615qh41idg1p2krzyy5";
+ sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
};
- cargoSha256 = "0h831rf5vlvpzfm4sr3fvwlc0ys776fqis90y414mczphkxvz437";
+ cargoSha256 = "0rdmv9s86xba1zkl2j5rgix6k7pkkxqmpar03sak2fjrd7mh8iz0";
meta = with lib; {
homepage = "https://github.com/softprops/git-codeowners";
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 8e3c6b8d9d02..31504d542d26 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -4,13 +4,13 @@ let
inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
in buildPythonApplication rec {
name = "git-cola-${version}";
- version = "2.11";
+ version = "3.0";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
- sha256 = "1prv8ib9jdkj5rgixj3hvkivwmbz5xvh8bmllrb1sb301yzi1s0g";
+ sha256 = "0jc360agrlhp1w9i725ffksvc6v95jnzzppjvza7ssip65gplrkx";
};
buildInputs = [ git gettext ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 6fb9f5e36f1a..d81049951522 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -41,6 +41,6 @@ buildRustPackage rec {
inherit (src.meta) homepage;
description = "Decentralized Issue Tracking for git";
license = licenses.gpl2;
- maintainers = with maintainers; [ profpatsch matthiasbeyer ];
+ maintainers = with maintainers; [ Profpatsch matthiasbeyer ];
};
}
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 4ec83af91607..b4c3baecd417 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- substituteInPlace Makefile --replace rst2man rst2man.py
patchShebangs .
'';
@@ -40,7 +39,6 @@ stdenv.mkDerivation rec {
directly through the Git command line.
'';
license = licenses.gpl3Plus;
- platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
index 1bf7a14932ec..d72df8028759 100644
--- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "git-radar-${version}";
- version = "0.5";
+ version = "0.6";
src = fetchFromGitHub {
owner = "michaeldfallen";
repo = "git-radar";
rev = "v${version}";
- sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9";
+ sha256 = "0c3zp8s4w7m4s71qgwk1jyfc8yzw34f2hi43x1w437ypgabwg81j";
};
dontBuild = true;
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index ba2b71138067..1208afa19630 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -14,12 +14,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
- buildInputs = [ docutils makeWrapper ];
-
- # The install.sh script expects rst2man, but here it's named rst2man.py
- patchPhase = ''
- sed -i 's/rst2man/rst2man.py/g' install.sh
- '';
+ nativeBuildInputs = [ docutils makeWrapper ];
installPhase = ''
prefix="$out" ./install.sh
diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
index 3f64d9d86bb6..02dc7f86fb3f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }:
let
- version = "0.2.2";
+ version = "0.2.3";
repo = "git-secret";
in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
inherit repo;
owner = "sobolevn";
rev = "v${version}";
- sha256 = "0vn9jibp97z7kc828wka1k0d7a9wx4skd6cnqy60kagfc00l0bzh";
+ sha256 = "1swgw91zzs9n582500a34cppyngrqrqrnl80d1vd7i93xx1lkmv6";
};
buildInputs = [ makeWrapper ];
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 5e42992cbe22..e545cb33befe 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -13,7 +13,7 @@
}:
let
- version = "2.15.0";
+ version = "2.16.2";
svn = subversionClient.override { perlBindings = true; };
in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h";
+ sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m";
};
hardeningDisable = [ "format" ];
@@ -32,6 +32,7 @@ stdenv.mkDerivation {
./symlinks-in-bin.patch
./git-sh-i18n.patch
./ssh-path.patch
+ ./git-send-email-honor-PATH.patch
];
postPatch = ''
@@ -56,7 +57,10 @@ stdenv.mkDerivation {
makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+ (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
+ (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
- + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ");
+ + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ")
+ # XXX: USE_PCRE2 might be useful in general, look into it
+ # XXX other alpine options?
+ + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else "");
# build git-credential-osxkeychain if darwin
postBuild = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
new file mode 100644
index 000000000000..9a484262b7b2
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
@@ -0,0 +1,28 @@
+diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
+index 8060ea35c..c81067a19 100644
+--- a/Documentation/git-send-email.txt
++++ b/Documentation/git-send-email.txt
+@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'.
+ specify a full pathname of a sendmail-like program instead;
+ the program must support the `-i` option. Default value can
+ be specified by the `sendemail.smtpServer` configuration
+- option; the built-in default is to search for `sendmail` in
+- `/usr/sbin`, `/usr/lib` and $PATH if such program is
++ option; the built-in default is to search in $PATH if such program is
+ available, falling back to `localhost` otherwise.
+
+ --smtp-server-port=::
+diff --git a/git-send-email.perl b/git-send-email.perl
+index edcc6d346..8e357aeab 100755
+--- a/git-send-email.perl
++++ b/git-send-email.perl
+@@ -885,8 +885,7 @@ if (defined $initial_reply_to) {
+ }
+
+ if (!defined $smtp_server) {
+- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail );
+- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH};
++ my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH};
+ foreach (@sendmail_paths) {
+ if (-x $_) {
+ $smtp_server = $_;
diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
index 5e24c19f0fee..addb1dbc5e06 100644
--- a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
@@ -1,21 +1,21 @@
diff --git a/connect.c b/connect.c
-index fd7ffe1..20cd992 100644
+index c3a014c5b..fbca3262b 100644
--- a/connect.c
+++ b/connect.c
-@@ -768,7 +768,7 @@
+@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
+
+ ssh = getenv("GIT_SSH");
+ if (!ssh)
+- ssh = "ssh";
++ ssh = "@ssh@";
+ variant = determine_ssh_variant(ssh, 0);
+ }
- ssh = getenv("GIT_SSH");
- if (!ssh)
-- ssh = "ssh";
-+ ssh = "@ssh@";
- else
- handle_ssh_variant(ssh, 0,
- &port_option,
diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
-index 50029d0..17b9594 100644
+index 480a6b30d..781720424 100644
--- a/git-gui/lib/remote_add.tcl
+++ b/git-gui/lib/remote_add.tcl
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@ method _add {} {
# Parse the location
if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]
|| [regexp {([^:][^:]+):(.+)} $location xx host path]} {
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
new file mode 100644
index 000000000000..be5b58c57334
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }:
+let
+ version = "0.1.2";
+in
+buildGoPackage {
+ name = "grv-${version}";
+
+ buildInputs = [ ncurses readline curl libgit2_0_25 ];
+ nativeBuildInputs = [ pkgconfig ];
+
+ goPackagePath = "github.com/rgburke/grv";
+
+ src = fetchFromGitHub {
+ owner = "rgburke";
+ repo = "grv";
+ rev = "v${version}";
+ sha256 = "1i8cr5xxdacpby60nqfyj8ijyc0h62029kbds2lq26rb8nn9qih2";
+ fetchSubmodules = true;
+ };
+
+ buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
+
+ meta = with stdenv.lib; {
+ description = " GRV is a terminal interface for viewing git repositories";
+ homepage = https://github.com/rgburke/grv;
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ andir ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 7da45e2d3f96..188e5a4faafa 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, cmake, qtbase }:
+{ stdenv, fetchgit, cmake, qtbase }:
stdenv.mkDerivation rec {
- name = "qgit-2.6";
+ name = "qgit-2.7";
- src = fetchurl {
- url = "http://libre.tibirna.org/attachments/download/12/${name}.tar.gz";
- sha256 = "1brrhac6s6jrw3djhgailg5d5s0vgrfvr0sczqgzpp3i6pxf8qzl";
+ src = fetchgit {
+ url = "http://repo.or.cz/qgit4/redivivus.git";
+ rev = name;
+ sha256 = "0c0zxykpgkxb8gpgzz5i6b8nrzg7cdxikvpg678x7gsnxhlwjv3a";
};
buildInputs = [ qtbase ];
nativeBuildInputs = [ cmake ];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
license = licenses.gpl2;
homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit;
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
new file mode 100644
index 000000000000..fbafc5257d7b
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }:
+
+let
+ version = "1.0.11";
+in
+stdenv.mkDerivation {
+ name = "svn-all-fast-export-${version}";
+
+ src = fetchFromGitHub {
+ owner = "svn-all-fast-export";
+ repo = "svn2git";
+ rev = version;
+ sha256 = "0lhnw8f15j4wkpswhrjd7bp9xkhbk32zmszaxayzfhbdl0g7pzwj";
+ };
+
+ # https://github.com/svn-all-fast-export/svn2git/pull/40
+ patches = [
+ (fetchpatch {
+ name = "pr40.patch";
+ sha256 = "1qndhk5csf7kddk3giailx7r0cdipq46lj73nkcws43n4n93synk";
+ url = https://github.com/svn-all-fast-export/svn2git/pull/40.diff;
+ })
+ ];
+
+ nativeBuildInputs = [ qmake qttools ];
+ buildInputs = [ apr.dev subversion.dev qtbase ];
+
+ qmakeFlags = [
+ "VERSION=${version}"
+ "APR_INCLUDE=${apr.dev}/include/apr-1"
+ "SVN_INCLUDE=${subversion.dev}/include/subversion-1"
+ ];
+
+ installPhase = "make install INSTALL_ROOT=$out";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/svn-all-fast-export/svn2git;
+ description = "A fast-import based converter for an svn repo to git repos";
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.flokli ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
deleted file mode 100644
index e52fdb6375bf..000000000000
--- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchgit, qt4, qmake4Hook, subversion, apr }:
-
-stdenv.mkDerivation rec {
- name = "svn2git-kde-1.0.5";
-
- src = fetchgit {
- url = http://git.gitorious.org/svn2git/svn2git.git;
- rev = "149d6c6e14a1724c96999328683a9264fc508264";
- sha256 = "0gjxhnraizlwyidn66rczwc01f6sfx4ndmsj86ssqml3p0d4sl6q";
- };
-
- NIX_CFLAGS_COMPILE = [ "-I${apr.dev}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ];
-
- patchPhase = ''
- sed -i 's|/bin/cat|cat|' ./src/repository.cpp
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp svn-all-fast-export $out/bin
- '';
-
- buildInputs = [ subversion apr qt4 ];
-
- nativeBuildInputs = [ qmake4Hook ];
-
- meta.broken = true;
-}
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index d613e97d550c..d00fdd0c29e0 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, ruby, makeWrapper, git }:
let
- version = "2.3.2";
+ version = "2.4.0";
in
stdenv.mkDerivation {
name = "svn2git-${version}";
src = fetchurl {
url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
- sha256 = "1484mpcabqf9kr6xdpdgb1npkqav1bcah3w5lxj2djjx4bjf2g3y";
+ sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41";
};
buildInputs = [ ruby makeWrapper ];
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 bed0ef358271..597429c0cc7a 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "tig";
- version = "2.3.0";
+ version = "2.3.3";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "jonas";
repo = pname;
rev = name;
- sha256 = "04qw3fyamm1lka9vh7adrkr2mcnwcch9ya5sph51jx6d4jz1lih5";
+ sha256 = "1gw5ia6cl5b0q91kv4vfg35my2p49np23aikxqf5gn00zhqrkfap";
};
nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index 6238cf9c9754..d04f0d5792b2 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "transcrypt-${version}";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "elasticdog";
repo = "transcrypt";
rev = "v${version}";
- sha256 = "05q0rgcsphrkavmcsm3qghsl1pkgshvhdf6zpwkn1qcj288h8gkc";
+ sha256 = "1hvg4ipsxm27n5yn5jpk43qyvvx5gx3z3cczw1z3r6hrs4n8d5rz";
};
buildInputs = [ git makeWrapper openssl ];
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index c9251b987e93..21ceccf9f351 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -2,7 +2,7 @@
pythonPackages.buildPythonApplication rec {
name = "git-review-${version}";
- version = "1.25.0";
+ version = "1.26.0";
# Manually set version because prb wants to get it from the git
# upstream repository (and we are installing from tarball instead)
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
src = fetchurl rec {
url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz";
- sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce";
+ sha256 = "106nk6p7byf5vi68b2fvmwma5nk7qrv39nfj9p1bfxmb1gjdixhc";
};
propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ];
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
new file mode 100644
index 000000000000..a0d7382de341
--- /dev/null
+++ b/pkgs/applications/version-management/git-sizer/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ pname = "git-sizer";
+ name = "${pname}-${version}";
+ version = "1.0.0";
+
+ goPackagePath = "github.com/github/git-sizer";
+
+ src = fetchFromGitHub {
+ owner = "github";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "11rvqpsyl41ph0fgm62k5q2p33zgnwj1jd91rd4lkaarpcd1sg5h";
+ };
+
+ meta = with lib; {
+ description = "Compute various size metrics for a Git repository";
+ license = licenses.mit;
+ maintainers = with maintainers; [ matthewbauer ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index 4b6ba9398b48..45c97868c4bf 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -31,5 +31,6 @@ python2Packages.buildPythonApplication rec {
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
+ broken = true; # Incompatible with Git 2.15 object store.
};
}
diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index 7e8f9f2b2557..2b95446161b8 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -1,9 +1,18 @@
source 'https://rubygems.org'
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
-gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly'
-gem 'activesupport'
+gem 'gitlab-markup', '~> 1.6.2'
+gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly'
+gem 'activesupport', '~> 5.0.2'
+gem 'rdoc', '~> 4.2'
+gem 'gollum-lib', '~> 4.2', require: false
+gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
+gem 'grpc', '~> 1.8.0'
+
+# Locked until https://github.com/google/protobuf/issues/4210 is closed
+gem 'google-protobuf', '= 3.5.1'
group :development, :test do
gem 'gitlab-styles', '~> 2.0.0', require: false
+ gem 'rspec', require: false
end
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index 5ea14855b97f..cb53bb10122a 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -1,20 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (5.0.0.1)
+ activesupport (5.0.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.2)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
ast (2.3.0)
charlock_holmes (0.7.5)
concurrent-ruby (1.0.5)
+ diff-lcs (1.3)
escape_utils (1.1.1)
- faraday (0.12.2)
+ faraday (0.14.0)
multipart-post (>= 1.2, < 3)
- gitaly-proto (0.37.0)
+ gemojione (3.3.0)
+ json
+ gitaly-proto (0.83.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -22,24 +25,48 @@ GEM
escape_utils (~> 1.1.0)
mime-types (>= 1.19)
rugged (>= 0.23.0b)
+ github-markup (1.6.1)
+ gitlab-grit (2.8.2)
+ charlock_holmes (~> 0.6)
+ diff-lcs (~> 1.1)
+ mime-types (>= 1.16)
+ posix-spawn (~> 0.3)
+ gitlab-markup (1.6.3)
gitlab-styles (2.0.0)
rubocop (~> 0.49)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.15)
- google-protobuf (3.4.0.2)
- googleauth (0.5.3)
+ gollum-grit_adapter (1.0.1)
+ gitlab-grit (~> 2.7, >= 2.7.1)
+ gollum-lib (4.2.7)
+ gemojione (~> 3.2)
+ github-markup (~> 1.6)
+ gollum-grit_adapter (~> 1.0)
+ nokogiri (>= 1.6.1, < 2.0)
+ rouge (~> 2.1)
+ sanitize (~> 2.1)
+ stringex (~> 2.6)
+ gollum-rugged_adapter (0.4.4)
+ mime-types (>= 1.15)
+ rugged (~> 0.25)
+ google-protobuf (3.5.1)
+ googleapis-common-protos-types (1.0.1)
+ google-protobuf (~> 3.0)
+ googleauth (0.6.2)
faraday (~> 0.12)
- jwt (~> 1.4)
+ jwt (>= 1.4, < 3.0)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
- grpc (1.6.0)
+ grpc (1.8.7)
google-protobuf (~> 3.1)
- googleauth (~> 0.5.1)
+ googleapis-common-protos-types (~> 1.0.0)
+ googleauth (>= 0.5.1, < 0.7)
i18n (0.8.1)
- jwt (1.5.6)
+ json (2.1.0)
+ jwt (2.1.0)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
@@ -48,18 +75,37 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
+ mini_portile2 (2.3.0)
minitest (5.9.1)
- multi_json (1.12.1)
+ multi_json (1.13.1)
multipart-post (2.0.0)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
os (0.9.6)
parallel (1.12.0)
parser (2.4.0.0)
ast (~> 2.2)
+ posix-spawn (0.3.13)
powerpack (0.1.1)
- public_suffix (2.0.5)
+ public_suffix (3.0.1)
rainbow (2.2.2)
rake
rake (12.1.0)
+ rdoc (4.3.0)
+ rouge (2.2.1)
+ rspec (3.6.0)
+ rspec-core (~> 3.6.0)
+ rspec-expectations (~> 3.6.0)
+ rspec-mocks (~> 3.6.0)
+ rspec-core (3.6.0)
+ rspec-support (~> 3.6.0)
+ rspec-expectations (3.6.0)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.6.0)
+ rspec-mocks (3.6.0)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.6.0)
+ rspec-support (3.6.0)
rubocop (0.50.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
@@ -73,11 +119,14 @@ GEM
rubocop (>= 0.50.0)
ruby-progressbar (1.8.3)
rugged (0.26.0)
- signet (0.7.3)
+ sanitize (2.1.0)
+ nokogiri (>= 1.4.4)
+ signet (0.8.1)
addressable (~> 2.3)
faraday (~> 0.9)
- jwt (~> 1.5)
+ jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
+ stringex (2.7.1)
thread_safe (0.3.6)
tzinfo (1.2.2)
thread_safe (~> 0.1)
@@ -87,10 +136,17 @@ PLATFORMS
ruby
DEPENDENCIES
- activesupport
- gitaly-proto (~> 0.37.0)
+ activesupport (~> 5.0.2)
+ gitaly-proto (~> 0.83.0)
github-linguist (~> 4.7.0)
+ gitlab-markup (~> 1.6.2)
gitlab-styles (~> 2.0.0)
+ gollum-lib (~> 4.2)
+ gollum-rugged_adapter (~> 0.4.4)
+ google-protobuf (= 3.5.1)
+ grpc (~> 1.8.0)
+ rdoc (~> 4.2)
+ rspec
BUNDLED WITH
- 1.15.4
+ 1.16.1
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 63e5758107f7..7a8ba0fda744 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
- version = "0.43.1";
+ version = "0.81.0";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq";
+ sha256 = "01sw5y201xbd21k9r7xmzqiiypb924ac95nqqfhzplqnssa98n9y";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix
index 57480f3f337e..efe786216628 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -3,19 +3,19 @@
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vgjr48yiynwf9rh2nsxa8w134na0805l40chf9g9scii9k70rj9";
+ sha256 = "0g85lqq0smj71g8a2dxb54ajjzw59c9snana4p61knryc83q3yg6";
type = "gem";
};
- version = "5.0.0.1";
+ version = "5.0.6";
};
addressable = {
dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh";
+ sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
type = "gem";
};
- version = "2.5.1";
+ version = "2.5.2";
};
ast = {
source = {
@@ -41,6 +41,14 @@
};
version = "1.0.5";
};
+ diff-lcs = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
+ type = "gem";
+ };
+ version = "1.3";
+ };
escape_utils = {
source = {
remotes = ["https://rubygems.org"];
@@ -53,19 +61,28 @@
dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2";
+ sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr";
type = "gem";
};
- version = "0.12.2";
+ version = "0.14.0";
+ };
+ gemojione = {
+ dependencies = ["json"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
+ type = "gem";
+ };
+ version = "3.3.0";
};
gitaly-proto = {
dependencies = ["google-protobuf" "grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nqp9ib00q55ig8zf1r6ldf3xkqw0874ra1mbcsm8sl46l84lx11";
+ sha256 = "0z3asy104q36sshq9zhmgcm32sg8qr8jvy0mi19nakkq7prrkwqv";
type = "gem";
};
- version = "0.37.0";
+ version = "0.83.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -76,6 +93,31 @@
};
version = "4.7.6";
};
+ github-markup = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
+ type = "gem";
+ };
+ version = "1.6.1";
+ };
+ gitlab-grit = {
+ dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
+ type = "gem";
+ };
+ version = "2.8.2";
+ };
+ gitlab-markup = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki";
+ type = "gem";
+ };
+ version = "1.6.3";
+ };
gitlab-styles = {
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
source = {
@@ -85,31 +127,67 @@
};
version = "2.0.0";
};
+ gollum-grit_adapter = {
+ dependencies = ["gitlab-grit"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ gollum-lib = {
+ dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
+ type = "gem";
+ };
+ version = "4.2.7";
+ };
+ gollum-rugged_adapter = {
+ dependencies = ["mime-types" "rugged"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0khfmakp65frlaj7ajs6ihqg4xi7yc9z96kpsf1b7giqi3fqhhv4";
+ type = "gem";
+ };
+ version = "0.4.4";
+ };
google-protobuf = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl";
+ sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
type = "gem";
};
- version = "3.4.0.2";
+ version = "3.5.1";
+ };
+ googleapis-common-protos-types = {
+ dependencies = ["google-protobuf"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
+ type = "gem";
+ };
+ version = "1.0.1";
};
googleauth = {
dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli";
+ sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
type = "gem";
};
- version = "0.5.3";
+ version = "0.6.2";
};
grpc = {
- dependencies = ["google-protobuf" "googleauth"];
+ dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";
+ sha256 = "02b80pyg4rgkiafyh1jqnfh6xp9abpd1x0a9c2h98f0851scw28b";
type = "gem";
};
- version = "1.6.0";
+ version = "1.8.7";
};
i18n = {
source = {
@@ -119,13 +197,21 @@
};
version = "0.8.1";
};
+ json = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+ type = "gem";
+ };
+ version = "2.1.0";
+ };
jwt = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4";
+ sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky";
type = "gem";
};
- version = "1.5.6";
+ version = "2.1.0";
};
little-plugger = {
source = {
@@ -169,6 +255,14 @@
};
version = "3.2016.0521";
};
+ mini_portile2 = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ type = "gem";
+ };
+ version = "2.3.0";
+ };
minitest = {
source = {
remotes = ["https://rubygems.org"];
@@ -180,10 +274,10 @@
multi_json = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
+ sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
type = "gem";
};
- version = "1.12.1";
+ version = "1.13.1";
};
multipart-post = {
source = {
@@ -193,6 +287,15 @@
};
version = "2.0.0";
};
+ nokogiri = {
+ dependencies = ["mini_portile2"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
+ type = "gem";
+ };
+ version = "1.8.1";
+ };
os = {
source = {
remotes = ["https://rubygems.org"];
@@ -218,6 +321,14 @@
};
version = "2.4.0.0";
};
+ posix-spawn = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
+ type = "gem";
+ };
+ version = "0.3.13";
+ };
powerpack = {
source = {
remotes = ["https://rubygems.org"];
@@ -229,10 +340,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+ sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637";
type = "gem";
};
- version = "2.0.5";
+ version = "3.0.1";
};
rainbow = {
dependencies = ["rake"];
@@ -251,6 +362,66 @@
};
version = "12.1.0";
};
+ rdoc = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c";
+ type = "gem";
+ };
+ version = "4.3.0";
+ };
+ rouge = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs";
+ type = "gem";
+ };
+ version = "2.2.1";
+ };
+ rspec = {
+ dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ rspec-core = {
+ dependencies = ["rspec-support"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18np8wyw2g79waclpaacba6nd7x60ixg07ncya0j0qj1z9b37grd";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ rspec-expectations = {
+ dependencies = ["diff-lcs" "rspec-support"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "028ifzf9mqp3kxx40q1nbwj40g72g9zk0wr78l146phblkv96w0a";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ rspec-mocks = {
+ dependencies = ["diff-lcs" "rspec-support"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nv6jkxy24sag1i9w9wi3850k6skk2fm6yhcrgnmlz6vmwxvizp8";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ rspec-support = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "050paqqpsml8w88nf4a15zbbj3vvm471zpv73sjfdnz7w21wnypb";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
rubocop = {
dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
source = {
@@ -294,14 +465,31 @@
};
version = "0.26.0";
};
+ sanitize = {
+ dependencies = ["nokogiri"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+ type = "gem";
+ };
+ version = "2.1.0";
+ };
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6";
+ sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
type = "gem";
};
- version = "0.7.3";
+ version = "0.8.1";
+ };
+ stringex = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv";
+ type = "gem";
+ };
+ version = "2.7.1";
};
thread_safe = {
source = {
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index d4afdd7b3cd4..8fcc3e7e9270 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
buildGoPackage rec {
name = "gitea-${version}";
- version = "1.2.3";
+ version = "1.3.3";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
- sha256 = "0v24q14xzmqgwk10m7rqyn6pahd630v3bnc646ij4w8fbgr8hzja";
+ sha256 = "0ikkpvarp6mzsqk56ihw72fbv7r98g5v5i83rxq8dk709fdqplm6";
};
patches = [ ./static-root-path.patch ];
@@ -43,7 +43,7 @@ buildGoPackage rec {
meta = {
description = "Git with a cup of tea";
- homepage = http://gitea.io;
+ homepage = https://gitea.io;
license = licenses.mit;
maintainers = [ maintainers.disassembler ];
};
diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch
index 06ce521e9e8d..7c36afdff84c 100644
--- a/pkgs/applications/version-management/gitea/static-root-path.patch
+++ b/pkgs/applications/version-management/gitea/static-root-path.patch
@@ -2,12 +2,12 @@ diff --git i/modules/setting/setting.go w/modules/setting/setting.go
index aafe2d1b..1e4a8064 100644
--- i/modules/setting/setting.go
+++ w/modules/setting/setting.go
-@@ -683,7 +683,7 @@ func NewContext() {
+@@ -730,7 +730,7 @@ func NewContext() {
LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL)
OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
-- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir)
+- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath)
+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@")
- AppDataPath = sec.Key("APP_DATA_PATH").MustString("data")
+ AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data"))
EnableGzip = sec.Key("ENABLE_GZIP").MustBool()
EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false)
diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix
index eea5242e6bcc..2428c6cebddd 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/pkgs/applications/version-management/gitinspector/default.nix
@@ -11,6 +11,10 @@ python2Packages.buildPythonApplication rec {
name = name + "-src";
};
+ checkInputs = with python2Packages; [
+ unittest2
+ ];
+
meta = with stdenv.lib; {
homepage = https://github.com/ejwa/gitinspector;
description = "Statistical analysis tool for git repositories";
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index c7f7a4b02e4d..1e29b458a314 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,29 +1,33 @@
-{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib
+{ stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
, libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
-, libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
+, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
, dpkg, makeDesktopItem
}:
with stdenv.lib;
+let
+ curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
+in
stdenv.mkDerivation rec {
name = "gitkraken-${version}";
- version = "2.7.0";
+ version = "3.4.0";
src = fetchurl {
url = "https://release.gitkraken.com/linux/v${version}.deb";
- sha256 = "0088vdn47563f0v9zhk1vggn3c2cfg8rhmifc6nw4zbss49si5gp";
+ sha256 = "0jj3a02bz30xa7p4migyhvxd9s0cllymsp1rdh2pbh40p79g1fp1";
};
libPath = makeLibraryPath [
stdenv.cc.cc.lib
- curl
+ curlWithGnuTls
udev
libX11
libXext
libXcursor
libXi
+ libxcb
glib
libXScrnSaver
libxkbfile
@@ -47,7 +51,7 @@ stdenv.mkDerivation rec {
libXrender
gtk2
gnome2.GConf
- libgnome_keyring
+ libgnome-keyring
];
nativeBuildInputs = [ makeWrapper ];
@@ -66,27 +70,25 @@ stdenv.mkDerivation rec {
buildInputs = [ dpkg ];
- unpackPhase = "dpkg-deb -x $src .";
+ unpackPhase = "true";
+ buildCommand = ''
+ mkdir -p $out
+ dpkg -x $src $out
+ substituteInPlace $out/usr/share/applications/gitkraken.desktop \
+ --replace /usr/share/gitkraken $out/bin
+ cp -av $out/usr/* $out
+ rm -rf $out/etc $out/usr $out/share/lintian
+ chmod -R g-w $out
- installPhase = ''
- mkdir -p "$out/opt/gitkraken"
- cp -r usr/share/gitkraken/* "$out/opt/gitkraken"
+ for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+ patchelf --set-rpath ${libPath}:$out/share/gitkraken $file || true
+ done
- mkdir -p "$out/share/applications"
- cp $desktopItem/share/applications/* "$out/share/applications"
+ find $out/share/gitkraken -name "*.node" -exec patchelf --set-rpath "${libPath}:$out/share/gitkraken" {} \;
- mkdir -p "$out/share/pixmaps"
- cp usr/share/pixmaps/app.png "$out/share/pixmaps"
- '';
-
- postFixup = ''
- patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
- --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken"
- wrapProgram $out/opt/gitkraken/gitkraken \
- --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \
- --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0"
- mkdir "$out/bin"
- ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken"
+ rm $out/bin/gitkraken
+ ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken
'';
meta = {
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index ac05ca4c4847..ca5b8a84fbf9 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,19 +1,17 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec {
- version = "5.9.3";
+ version = "6.0.3";
name = "gitlab-shell-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
- sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p";
+ sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk";
};
- buildInputs = [
- ruby bundler go
- ];
+ buildInputs = [ ruby bundler go ];
patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ];
@@ -32,29 +30,9 @@ stdenv.mkDerivation rec {
# code by default which doesn't work in nixos because it's a
# read-only filesystem
postPatch = ''
- substituteInPlace lib/gitlab_config.rb --replace\
- "File.join(ROOT_PATH, 'config.yml')"\
- "ENV['GITLAB_SHELL_CONFIG_PATH']"
-
- # Note that we're running gitlab-shell from current-system/sw
- # because otherwise updating gitlab-shell won't be reflected in
- # the hardcoded path of the authorized-keys file:
- substituteInPlace lib/gitlab_keys.rb --replace\
- "\"#{ROOT_PATH}/bin/gitlab-shell"\
- "\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} /run/current-system/sw/bin/gitlab-shell"
-
- # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key
- # environment because we need it in gitlab_configrb
- # . unsetenv_others will remove that so we're not doing it for
- # now.
- #
- # TODO: Are there any security implications? The commit adding
- # unsetenv_others didn't mention anything...
- #
- # Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'GL_ID' => ENV['GL_ID']}, *args, unsetenv_others: true)
- substituteInPlace lib/gitlab_shell.rb --replace\
- " *args, unsetenv_others: true)"\
- " *args)"
+ substituteInPlace lib/gitlab_config.rb --replace \
+ "File.join(ROOT_PATH, 'config.yml')" \
+ "'/run/gitlab/shell-config.yml'"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch
index 1c694266e470..b0ee31cf39dd 100644
--- a/pkgs/applications/version-management/gitlab-shell/fixes.patch
+++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch
@@ -1,12 +1,11 @@
diff --git a/support/go_build.rb b/support/go_build.rb
-index 82f94d2..40ba35e 100644
+index 30a6b71..46b4dfa 100644
--- a/support/go_build.rb
+++ b/support/go_build.rb
-@@ -25,9 +25,8 @@ module GoBuild
- def run!(env, cmd)
+@@ -26,8 +26,8 @@ module GoBuild
raise "env must be a hash" unless env.is_a?(Hash)
raise "cmd must be an array" unless cmd.is_a?(Array)
--
+
- if !system(env, *cmd)
- abort "command failed: #{env.inspect} #{cmd.join(' ')}"
- end
diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
index dd1ecafb8bf8..bc1aa8583867 100644
--- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
@@ -1,26 +1,26 @@
-diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
-index 0b11ce3..ffc3faf 100644
---- a/lib/gitlab_projects.rb
-+++ b/lib/gitlab_projects.rb
-@@ -8,7 +8,7 @@ require_relative 'gitlab_metrics'
- require_relative 'gitlab_metrics'
+diff --git a/go/internal/config/config.go b/go/internal/config/config.go
+index c57b4de..88cfc95 100644
+--- a/go/internal/config/config.go
++++ b/go/internal/config/config.go
+@@ -27,7 +27,7 @@ func New() (*Config, error) {
+ }
+ cfg.RootDir = dir
- class GitlabProjects
-- GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks')
-+ GLOBAL_HOOKS_DIRECTORY = ENV['GITLAB_SHELL_HOOKS_PATH'] || File.join(ROOT_PATH, 'hooks')
-
- # Project name is a directory name for repository with .git at the end
- # It may be namespaced or not. Like repo.git or gitlab/repo.git
+- configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile))
++ configBytes, err := ioutil.ReadFile("/run/gitlab/shell-config.yml")
+ if err != nil {
+ return nil, err
+ }
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
-index e7d0254..181ec8a 100644
+index 1452f95..2b40327 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
-@@ -188,7 +188,8 @@ class GitlabShell
+@@ -180,7 +180,8 @@ class GitlabShell
end
# We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
- Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
-+ # Except we don't, because we're already in the right directory on nixos !
++ # Except we don't, because we're already in the right directory on nixos!
+ Kernel::exec(env, *args, unsetenv_others: true)
end
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 1f3407eddcf5..6bb696406c9d 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitLab, git, go }:
stdenv.mkDerivation rec {
- version = "3.2.0";
+ version = "3.6.0";
name = "gitlab-workhorse-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r";
+ sha256 = "1vcxm9m82m1dcc86r29k5v8cp3zvpby4kszbkavl3frm3ws0w9lz";
};
buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index b4a457bff6e5..97d40857e117 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '4.2.8'
+gem 'rails', '4.2.10'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with
@@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', '~> 3.0.0'
# Supported DBs
-gem 'mysql2', '~> 0.4.5', group: :mysql
+gem 'mysql2', '~> 0.4.10', group: :mysql
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.26.0'
@@ -25,7 +25,7 @@ gem 'devise', '~> 4.2'
gem 'doorkeeper', '~> 4.2.0'
gem 'doorkeeper-openid_connect', '~> 1.2.0'
gem 'omniauth', '~> 1.4.2'
-gem 'omniauth-auth0', '~> 1.4.1'
+gem 'omniauth-auth0', '~> 2.0.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
@@ -69,7 +69,15 @@ gem 'net-ldap'
# Git Wiki
# Required manually in config/initializers/gollum.rb to control load order
+# Before updating this gem, check if
+# https://github.com/gollum/gollum-lib/pull/292 has been merged.
+# If it has, then remove the monkey patch for update_page, rename_page and raw_data_in_committer
+# in config/initializers/gollum.rb
gem 'gollum-lib', '~> 4.2', require: false
+
+# Before updating this gem, check if
+# https://github.com/gollum/rugged_adapter/pull/28 has been merged.
+# If it has, then remove the monkey patch for tree_entry in config/initializers/gollum.rb
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
# Language detection
@@ -78,7 +86,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
# API
gem 'grape', '~> 1.0'
gem 'grape-entity', '~> 0.6.0'
-gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
+gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -90,7 +98,7 @@ gem 'kaminari', '~> 1.0'
gem 'hamlit', '~> 2.6.1'
# Files attachments
-gem 'carrierwave', '~> 1.1'
+gem 'carrierwave', '~> 1.2'
# Drag and Drop UI
gem 'dropzonejs-rails', '~> 0.7.1'
@@ -102,7 +110,7 @@ gem 'fog-google', '~> 0.5'
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
-gem 'fog-aliyun', '~> 0.1.0'
+gem 'fog-aliyun', '~> 0.2.0'
# for Google storage
gem 'google-api-client', '~> 0.13.6'
@@ -111,7 +119,7 @@ gem 'google-api-client', '~> 0.13.6'
gem 'unf', '~> 0.1.4'
# Seed data
-gem 'seed-fu', '~> 2.3.5'
+gem 'seed-fu', '~> 2.3.7'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
@@ -128,7 +136,7 @@ gem 'asciidoctor-plantuml', '0.0.7'
gem 'rouge', '~> 2.0'
gem 'truncato', '~> 0.7.9'
gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.1'
+gem 'nokogiri', '~> 1.8.2'
# Diffs
gem 'diffy', '~> 3.1.0'
@@ -171,7 +179,7 @@ gem 're2', '~> 1.1.1'
gem 'version_sorter', '~> 2.1.0'
# Cache
-gem 'redis-rails', '~> 5.0.1'
+gem 'redis-rails', '~> 5.0.2'
# Redis
gem 'redis', '~> 3.2'
@@ -229,6 +237,9 @@ gem 'charlock_holmes', '~> 0.7.5'
# Faster JSON
gem 'oj', '~> 2.17.4'
+# Faster blank
+gem 'fast_blank'
+
# Parse time & duration
gem 'chronic', '~> 0.10.2'
gem 'chronic_duration', '~> 0.10.6'
@@ -245,7 +256,7 @@ gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.1.0'
gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails', '~> 4.1.0'
+gem 'jquery-rails', '~> 4.3.1'
gem 'request_store', '~> 1.3'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
@@ -263,6 +274,8 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.2.0'
gem 'gettext', '~> 3.2.2', require: false, group: :development
+gem 'batch-loader', '~> 1.2.1'
+
# Perf bar
gem 'peek', '~> 1.0.1'
gem 'peek-gc', '~> 0.0.2'
@@ -281,7 +294,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
- gem 'prometheus-client-mmap', '~>0.7.0.beta18'
+ gem 'prometheus-client-mmap', '~> 0.9.1'
gem 'raindrops', '~> 0.18'
end
@@ -309,14 +322,14 @@ group :development, :test do
gem 'fuubar', '~> 2.2.0'
gem 'database_cleaner', '~> 1.5.0'
- gem 'factory_girl_rails', '~> 4.7.0'
+ gem 'factory_bot_rails', '~> 4.8.2'
gem 'rspec-rails', '~> 3.6.0'
gem 'rspec-retry', '~> 0.4.5'
gem 'spinach-rails', '~> 0.2.1'
gem 'spinach-rerun-reporter', '~> 0.0.2'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
- gem 'rspec-parameterized'
+ gem 'rspec-parameterized', require: false
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.7.0'
@@ -324,26 +337,28 @@ group :development, :test do
# Generate Fake data
gem 'ffaker', '~> 2.4'
- gem 'capybara', '~> 2.15.0'
+ gem 'capybara', '~> 2.15'
gem 'capybara-screenshot', '~> 1.0.0'
- gem 'poltergeist', '~> 1.9.0'
+ gem 'selenium-webdriver', '~> 3.5'
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'spring-commands-spinach', '~> 1.1.0'
- gem 'rubocop', '~> 0.49.1', require: false
- gem 'rubocop-rspec', '~> 1.15.1', require: false
- gem 'rubocop-gitlab-security', '~> 0.1.0', require: false
- gem 'scss_lint', '~> 0.54.0', require: false
+ gem 'gitlab-styles', '~> 2.3', require: false
+ # Pin these dependencies, otherwise a new rule could break the CI pipelines
+ gem 'rubocop', '~> 0.52.1'
+ gem 'rubocop-rspec', '~> 1.22.1'
+
+ gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.26.0', require: false
gem 'simplecov', '~> 0.14.0', require: false
- gem 'flay', '~> 2.8.0', require: false
+ gem 'flay', '~> 2.10.0', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
gem 'benchmark-ips', '~> 2.3.0', require: false
- gem 'license_finder', '~> 2.1.0', require: false
+ gem 'license_finder', '~> 3.1', require: false
gem 'knapsack', '~> 1.11.0'
gem 'activerecord_sane_schema_dumper', '0.2'
@@ -377,9 +392,6 @@ gem 'ruby-prof', '~> 0.16.2'
# OAuth
gem 'oauth2', '~> 1.4'
-# Soft deletion
-gem 'paranoia', '~> 2.3.1'
-
# Health check
gem 'health_check', '~> 2.6.0'
@@ -398,16 +410,20 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly'
+# Locked until https://github.com/google/protobuf/issues/4210 is closed
+gem 'google-protobuf', '= 3.5.1'
gem 'toml-rb', '~> 0.3.15', require: false
# Feature toggles
-gem 'flipper', '~> 0.10.2'
-gem 'flipper-active_record', '~> 0.10.2'
+gem 'flipper', '~> 0.11.0'
+gem 'flipper-active_record', '~> 0.11.0'
+gem 'flipper-active_support_cache_store', '~> 0.11.0'
# Structured logging
gem 'lograge', '~> 0.5'
gem 'grape_logging', '~> 1.7'
-gem 'activerecord-nulldb-adapter'
+# Asset synchronization
+gem 'asset_sync', '~> 2.2.0'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index fd3aab2d54ad..4022e2896116 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -4,40 +4,38 @@ GEM
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
- actionmailer (4.2.8)
- actionpack (= 4.2.8)
- actionview (= 4.2.8)
- activejob (= 4.2.8)
+ actionmailer (4.2.10)
+ actionpack (= 4.2.10)
+ actionview (= 4.2.10)
+ activejob (= 4.2.10)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.8)
- actionview (= 4.2.8)
- activesupport (= 4.2.8)
+ actionpack (4.2.10)
+ actionview (= 4.2.10)
+ activesupport (= 4.2.10)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.8)
- activesupport (= 4.2.8)
+ actionview (4.2.10)
+ activesupport (= 4.2.10)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (4.2.8)
- activesupport (= 4.2.8)
+ activejob (4.2.10)
+ activesupport (= 4.2.10)
globalid (>= 0.3.0)
- activemodel (4.2.8)
- activesupport (= 4.2.8)
+ activemodel (4.2.10)
+ activesupport (= 4.2.10)
builder (~> 3.1)
- activerecord (4.2.8)
- activemodel (= 4.2.8)
- activesupport (= 4.2.8)
+ activerecord (4.2.10)
+ activemodel (= 4.2.10)
+ activesupport (= 4.2.10)
arel (~> 6.0)
- activerecord-nulldb-adapter (0.3.7)
- activerecord (>= 2.0.0)
activerecord_sane_schema_dumper (0.2)
rails (>= 4, < 5)
- activesupport (4.2.8)
+ activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
@@ -60,6 +58,11 @@ GEM
asciidoctor (1.5.3)
asciidoctor-plantuml (0.0.7)
asciidoctor (~> 1.5)
+ asset_sync (2.2.0)
+ activemodel (>= 4.1.0)
+ fog-core
+ mime-types (>= 2.99)
+ unf
ast (2.3.0)
atomic (1.1.99)
attr_encrypted (3.0.3)
@@ -75,6 +78,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
babosa (1.0.2)
base32 (0.3.2)
+ batch-loader (1.2.1)
bcrypt (3.1.11)
bcrypt_pbkdf (1.0.0)
benchmark-ips (2.3.0)
@@ -85,6 +89,7 @@ GEM
bindata (2.4.1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
+ blankslate (2.1.2.4)
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
@@ -109,18 +114,19 @@ GEM
capybara-screenshot (1.0.14)
capybara (>= 1.0, < 3)
launchy
- carrierwave (1.1.0)
+ carrierwave (1.2.1)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
cause (0.1)
charlock_holmes (0.7.5)
+ childprocess (0.7.0)
+ ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
chronic_duration (0.10.6)
numerizer (~> 0.1.1)
chunky_png (1.3.5)
citrus (3.0.2)
- cliver (0.3.2)
coderay (1.1.1)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
@@ -189,10 +195,10 @@ GEM
excon (0.57.1)
execjs (2.6.0)
expression_parser (0.9.0)
- factory_girl (4.7.0)
+ factory_bot (4.8.2)
activesupport (>= 3.0.0)
- factory_girl_rails (4.7.0)
- factory_girl (~> 4.7.0)
+ factory_bot_rails (4.8.2)
+ factory_bot (~> 4.8.2)
railties (>= 3.0.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
@@ -201,22 +207,26 @@ GEM
faraday_middleware-multi_json (0.0.6)
faraday_middleware
multi_json
+ fast_blank (1.0.0)
fast_gettext (1.4.0)
ffaker (2.4.0)
ffi (1.9.18)
- flay (2.8.1)
+ flay (2.10.0)
erubis (~> 2.7.0)
path_expander (~> 1.0)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
- flipper (0.10.2)
- flipper-active_record (0.10.2)
+ flipper (0.11.0)
+ flipper-active_record (0.11.0)
activerecord (>= 3.2, < 6)
- flipper (~> 0.10.2)
+ flipper (~> 0.11.0)
+ flipper-active_support_cache_store (0.11.0)
+ activesupport (>= 3.2, < 6)
+ flipper (~> 0.11.0)
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
- fog-aliyun (0.1.0)
+ fog-aliyun (0.2.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
ipaddress (~> 0.8)
@@ -275,7 +285,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly-proto (0.39.0)
+ gitaly-proto (0.84.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -293,14 +303,18 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
- gitlab-markup (1.6.2)
+ gitlab-markup (1.6.3)
+ gitlab-styles (2.3.2)
+ rubocop (~> 0.51)
+ rubocop-gitlab-security (~> 0.1.0)
+ rubocop-rspec (~> 1.19)
gitlab_omniauth-ldap (2.0.4)
net-ldap (~> 0.16)
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
- globalid (0.3.7)
- activesupport (>= 4.1.0)
+ globalid (0.4.1)
+ activesupport (>= 4.2.0)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gollum-lib (4.2.7)
@@ -326,7 +340,9 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.4.0.2)
+ google-protobuf (3.5.1)
+ googleapis-common-protos-types (1.0.1)
+ google-protobuf (~> 3.0)
googleauth (0.5.3)
faraday (~> 0.12)
jwt (~> 1.4)
@@ -353,9 +369,10 @@ GEM
rake
grape_logging (1.7.0)
grape
- grpc (1.6.0)
+ grpc (1.8.3)
google-protobuf (~> 3.1)
- googleauth (~> 0.5.1)
+ googleapis-common-protos-types (~> 1.0.0)
+ googleauth (>= 0.5.1, < 0.7)
haml (4.0.7)
tilt
haml_lint (0.26.0)
@@ -396,7 +413,8 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.2)
- i18n (0.8.6)
+ i18n (0.9.1)
+ concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
influxdb (0.2.3)
cause
@@ -407,7 +425,7 @@ GEM
multipart-post
oauth (~> 0.5, >= 0.5.0)
jquery-atwho-rails (1.3.2)
- jquery-rails (4.1.1)
+ jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@@ -449,11 +467,13 @@ GEM
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
- license_finder (2.1.0)
+ license_finder (3.1.1)
bundler
httparty
rubyzip
thor
+ toml (= 0.1.2)
+ with_env (> 1.0)
xml-simple
licensee (8.7.0)
rugged (~> 0.24)
@@ -468,8 +488,8 @@ GEM
railties (>= 4, < 5.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
- mail (2.6.6)
- mime-types (>= 1.16, < 4)
+ mail (2.7.0)
+ mini_mime (>= 0.1.1)
mail_room (0.9.1)
memoist (0.16.0)
memoizable (0.4.2)
@@ -482,7 +502,6 @@ GEM
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minitest (5.7.0)
- mmap2 (2.2.7)
mousetrap-rails (1.4.6)
multi_json (1.12.2)
multi_xml (0.6.0)
@@ -490,11 +509,11 @@ GEM
mustermann (1.0.0)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
- mysql2 (0.4.5)
+ mysql2 (0.4.10)
net-ldap (0.16.0)
net-ssh (4.1.0)
netrc (0.11.0)
- nokogiri (1.8.1)
+ nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
numerizer (0.1.1)
oauth (0.5.1)
@@ -510,8 +529,8 @@ GEM
omniauth (1.4.2)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
- omniauth-auth0 (1.4.1)
- omniauth-oauth2 (~> 1.1)
+ omniauth-auth0 (2.0.0)
+ omniauth-oauth2 (~> 1.4)
omniauth-authentiq (0.3.1)
omniauth-oauth2 (~> 1.3, >= 1.3.1)
omniauth-azure-oauth2 (0.0.9)
@@ -564,12 +583,12 @@ GEM
rubypants (~> 0.2)
orm_adapter (0.5.0)
os (0.9.6)
- parallel (1.12.0)
- paranoia (2.3.1)
- activerecord (>= 4.0, < 5.2)
- parser (2.4.0.0)
- ast (~> 2.2)
- path_expander (1.0.1)
+ parallel (1.12.1)
+ parser (2.4.0.2)
+ ast (~> 2.3)
+ parslet (1.5.0)
+ blankslate (~> 2.0)
+ path_expander (1.0.2)
peek (1.0.1)
concurrent-ruby (>= 0.9.0)
concurrent-ruby-ext (>= 0.9.0)
@@ -603,11 +622,6 @@ GEM
pg (0.18.4)
po_to_json (1.0.1)
json (>= 1.6.0)
- poltergeist (1.9.0)
- capybara (~> 2.1)
- cliver (~> 0.3.1)
- multi_json (~> 1.0)
- websocket-driver (>= 0.2.0)
posix-spawn (0.3.13)
powerpack (0.1.1)
premailer (1.10.4)
@@ -622,8 +636,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.7.0.beta18)
- mmap2 (~> 2.2, >= 2.2.7)
+ prometheus-client-mmap (0.9.1)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
@@ -640,7 +653,7 @@ GEM
rack (>= 0.4)
rack-attack (4.4.1)
rack
- rack-cors (0.4.0)
+ rack-cors (1.0.2)
rack-oauth2 (1.2.3)
activesupport (>= 2.3)
attr_required (>= 0.0.5)
@@ -653,16 +666,16 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.8)
- actionmailer (= 4.2.8)
- actionpack (= 4.2.8)
- actionview (= 4.2.8)
- activejob (= 4.2.8)
- activemodel (= 4.2.8)
- activerecord (= 4.2.8)
- activesupport (= 4.2.8)
+ rails (4.2.10)
+ actionmailer (= 4.2.10)
+ actionpack (= 4.2.10)
+ actionview (= 4.2.10)
+ activejob (= 4.2.10)
+ activemodel (= 4.2.10)
+ activerecord (= 4.2.10)
+ activesupport (= 4.2.10)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.8)
+ railties (= 4.2.10)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -675,15 +688,18 @@ GEM
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
- railties (4.2.8)
- actionpack (= 4.2.8)
- activesupport (= 4.2.8)
+ railties (4.2.10)
+ actionpack (= 4.2.10)
+ activesupport (= 4.2.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rake
raindrops (0.18.0)
- rake (12.1.0)
+ rake (12.3.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
rbnacl (4.0.2)
@@ -697,25 +713,25 @@ GEM
json
recursive-open-struct (1.0.0)
redcarpet (3.4.0)
- redis (3.3.3)
- redis-actionpack (5.0.1)
+ redis (3.3.5)
+ redis-actionpack (5.0.2)
actionpack (>= 4.0, < 6)
redis-rack (>= 1, < 3)
- redis-store (>= 1.1.0, < 1.4.0)
- redis-activesupport (5.0.1)
+ redis-store (>= 1.1.0, < 2)
+ redis-activesupport (5.0.4)
activesupport (>= 3, < 6)
- redis-store (~> 1.2.0)
+ redis-store (>= 1.3, < 2)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
- redis-rack (1.6.0)
- rack (~> 1.5)
- redis-store (~> 1.2.0)
- redis-rails (5.0.1)
- redis-actionpack (~> 5.0.0)
- redis-activesupport (~> 5.0.0)
- redis-store (~> 1.2.0)
- redis-store (1.2.0)
- redis (>= 2.2)
+ redis-rack (2.0.4)
+ rack (>= 1.5, < 3)
+ redis-store (>= 1.2, < 2)
+ redis-rails (5.0.2)
+ redis-actionpack (>= 5.0, < 6)
+ redis-activesupport (>= 5.0, < 6)
+ redis-store (>= 1.2, < 2)
+ redis-store (1.4.1)
+ redis (>= 2.2, < 5)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@@ -770,21 +786,21 @@ GEM
pg
rails
sqlite3
- rubocop (0.49.1)
+ rubocop (0.52.1)
parallel (~> 1.10)
- parser (>= 2.3.3.1, < 3.0)
+ parser (>= 2.4.0.2, < 3.0)
powerpack (~> 0.1)
- rainbow (>= 1.99.1, < 3.0)
+ rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
- rubocop-gitlab-security (0.1.0)
- rubocop (>= 0.47.1)
- rubocop-rspec (1.15.1)
- rubocop (>= 0.42.0)
+ rubocop-gitlab-security (0.1.1)
+ rubocop (>= 0.51)
+ rubocop-rspec (1.22.1)
+ rubocop (>= 0.52.1)
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-prof (0.16.2)
- ruby-progressbar (1.8.1)
+ ruby-progressbar (1.9.0)
ruby-saml (1.4.1)
nokogiri (>= 1.5.10)
ruby_parser (3.9.0)
@@ -798,7 +814,11 @@ GEM
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
- sass (3.4.22)
+ sass (3.5.5)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
@@ -808,15 +828,18 @@ GEM
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
- scss_lint (0.54.0)
+ scss_lint (0.56.0)
rake (>= 0.9, < 13)
- sass (~> 3.4.20)
+ sass (~> 3.5.3)
securecompare (1.0.0)
- seed-fu (2.3.6)
+ seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
select2-rails (3.5.9.3)
thor (~> 0.14)
+ selenium-webdriver (3.5.0)
+ childprocess (~> 0.5)
+ rubyzip (~> 1.0)
sentry-raven (2.5.3)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
@@ -825,11 +848,11 @@ GEM
rack
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
- sidekiq (5.0.4)
+ sidekiq (5.0.5)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
- redis (~> 3.3, >= 3.3.3)
+ redis (>= 3.3.4, < 5)
sidekiq-cron (0.6.0)
rufus-scheduler (>= 3.3.0)
sidekiq (>= 4.2.1)
@@ -867,7 +890,7 @@ GEM
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.2.0)
+ sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
@@ -898,12 +921,14 @@ GEM
tilt (2.0.6)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
+ toml (0.1.2)
+ parslet (~> 1.5.0)
toml-rb (0.3.15)
citrus (~> 3.0, > 3.0)
truncato (0.7.10)
htmlentities (~> 4.3.1)
nokogiri (~> 1.8.0, >= 1.7.0)
- tzinfo (1.2.3)
+ tzinfo (1.2.4)
thread_safe (~> 0.1)
u2f (0.2.1)
uber (0.1.0)
@@ -948,13 +973,11 @@ GEM
hashdiff
webpack-rails (0.9.10)
railties (>= 3.2.0)
- websocket-driver (0.6.3)
- websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.2)
wikicloth (0.8.1)
builder
expression_parser
rinku
+ with_env (1.1.0)
xml-simple (1.1.5)
xpath (2.1.0)
nokogiri (~> 1.3)
@@ -965,7 +988,6 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0)
- activerecord-nulldb-adapter
activerecord_sane_schema_dumper (= 0.2)
acts-as-taggable-on (~> 4.0)
addressable (~> 2.5.2)
@@ -974,10 +996,12 @@ DEPENDENCIES
asana (~> 0.6.0)
asciidoctor (~> 1.5.2)
asciidoctor-plantuml (= 0.0.7)
+ asset_sync (~> 2.2.0)
attr_encrypted (~> 3.0.0)
awesome_print (~> 1.2.0)
babosa (~> 1.0.2)
base32 (~> 0.3.0)
+ batch-loader (~> 1.2.1)
bcrypt_pbkdf (~> 1.0)
benchmark-ips (~> 2.3.0)
better_errors (~> 2.1.0)
@@ -988,9 +1012,9 @@ DEPENDENCIES
browser (~> 2.2)
bullet (~> 5.5.0)
bundler-audit (~> 0.5.0)
- capybara (~> 2.15.0)
+ capybara (~> 2.15)
capybara-screenshot (~> 1.0.0)
- carrierwave (~> 1.1)
+ carrierwave (~> 1.2)
charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2)
chronic_duration (~> 0.10.6)
@@ -1009,13 +1033,15 @@ DEPENDENCIES
dropzonejs-rails (~> 0.7.1)
email_reply_trimmer (~> 0.1)
email_spec (~> 1.6.0)
- factory_girl_rails (~> 4.7.0)
+ factory_bot_rails (~> 4.8.2)
faraday (~> 0.12)
+ fast_blank
ffaker (~> 2.4)
- flay (~> 2.8.0)
- flipper (~> 0.10.2)
- flipper-active_record (~> 0.10.2)
- fog-aliyun (~> 0.1.0)
+ flay (~> 2.10.0)
+ flipper (~> 0.11.0)
+ flipper-active_record (~> 0.11.0)
+ flipper-active_support_cache_store (~> 0.11.0)
+ fog-aliyun (~> 0.2.0)
fog-aws (~> 1.4)
fog-core (~> 1.44)
fog-google (~> 0.5)
@@ -1030,15 +1056,17 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
- gitaly-proto (~> 0.39.0)
+ gitaly-proto (~> 0.84.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)
+ gitlab-styles (~> 2.3)
gitlab_omniauth-ldap (~> 2.0.4)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.4)
gon (~> 6.1.0)
google-api-client (~> 0.13.6)
+ google-protobuf (= 3.5.1)
gpgme
grape (~> 1.0)
grape-entity (~> 0.6.0)
@@ -1055,14 +1083,14 @@ DEPENDENCIES
influxdb (~> 0.2)
jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2)
- jquery-rails (~> 4.1.0)
+ jquery-rails (~> 4.3.1)
json-schema (~> 2.8.0)
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.11.0)
kubeclient (~> 2.2.0)
letter_opener_web (~> 1.3.0)
- license_finder (~> 2.1.0)
+ license_finder (~> 3.1)
licensee (~> 8.7.0)
lograge (~> 0.5)
loofah (~> 2.0.3)
@@ -1070,15 +1098,15 @@ DEPENDENCIES
method_source (~> 0.8)
minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6)
- mysql2 (~> 0.4.5)
+ mysql2 (~> 0.4.10)
net-ldap
net-ssh (~> 4.1.0)
- nokogiri (~> 1.8.1)
+ nokogiri (~> 1.8.2)
oauth2 (~> 1.4)
octokit (~> 4.6.2)
oj (~> 2.17.4)
omniauth (~> 1.4.2)
- omniauth-auth0 (~> 1.4.1)
+ omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.1)
omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4)
@@ -1093,7 +1121,6 @@ DEPENDENCIES
omniauth-twitter (~> 1.2.0)
omniauth_crowd (~> 2.2.0)
org-ruby (~> 0.9.12)
- paranoia (~> 2.3.1)
peek (~> 1.0.1)
peek-gc (~> 0.0.2)
peek-host (~> 1.0.0)
@@ -1104,16 +1131,15 @@ DEPENDENCIES
peek-redis (~> 1.2.0)
peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
- poltergeist (~> 1.9.0)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.7.0.beta18)
+ prometheus-client-mmap (~> 0.9.1)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
- rack-cors (~> 0.4.0)
+ rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
- rails (= 4.2.8)
+ rails (= 4.2.10)
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 4.0.9)
rainbow (~> 2.2)
@@ -1127,7 +1153,7 @@ DEPENDENCIES
redcarpet (~> 3.4)
redis (~> 3.2)
redis-namespace (~> 1.5.2)
- redis-rails (~> 5.0.1)
+ redis-rails (~> 5.0.2)
request_store (~> 1.3)
responders (~> 2.0)
rouge (~> 2.0)
@@ -1137,9 +1163,8 @@ DEPENDENCIES
rspec-retry (~> 0.4.5)
rspec-set (~> 0.1.3)
rspec_profiling (~> 0.0.5)
- rubocop (~> 0.49.1)
- rubocop-gitlab-security (~> 0.1.0)
- rubocop-rspec (~> 1.15.1)
+ rubocop (~> 0.52.1)
+ rubocop-rspec (~> 1.22.1)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.16.2)
ruby_parser (~> 3.8)
@@ -1147,9 +1172,10 @@ DEPENDENCIES
rugged (~> 0.26.0)
sanitize (~> 2.0)
sass-rails (~> 5.0.6)
- scss_lint (~> 0.54.0)
- seed-fu (~> 2.3.5)
+ scss_lint (~> 0.56.0)
+ seed-fu (~> 2.3.7)
select2-rails (~> 3.5.9)
+ selenium-webdriver (~> 3.5)
sentry-raven (~> 2.5.3)
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
@@ -1189,4 +1215,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.15.4
+ 1.16.1
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index bc3ca9192bcb..1c3d1928a8b0 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -18,11 +18,11 @@ let
};
};
- version = "10.1.1";
+ version = "10.5.6";
gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
- sha256 = "0xvzxcygy6ffqm24rk6v9gs6g9r744vpwwvk9d00wjla7hwmq3w2";
+ sha256 = "1kml7iz4q9g5gcfqqarivlnkmkmq9250wgm95yi4rgzynb5jndd0";
};
in
@@ -30,20 +30,19 @@ in
stdenv.mkDerivation rec {
name = "gitlab-${version}";
- buildInputs = [
- rubyEnv ruby bundler tzdata git procps dpkg nettools
- ];
-
src = fetchFromGitHub {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
- sha256 = "0p118msad6l12pd4q3vkvjggiiasbkh6pnl94riqyb5zkb7yrb1a";
+ sha256 = "059h63jn552fcir2dgsjv85zv1ihbyiwzws4h2j15mwj2cdpjkh0";
};
+ buildInputs = [
+ rubyEnv ruby bundler tzdata git procps dpkg nettools
+ ];
+
patches = [
./remove-hardcoded-locations.patch
- ./nulladapter.patch
./fix-36783.patch
];
@@ -59,6 +58,8 @@ stdenv.mkDerivation rec {
substituteInPlace app/controllers/admin/background_jobs_controller.rb \
--replace "ps -U" "${procps}/bin/ps -U"
+ sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
+
# required for some gems:
cat > config/database.yml < gitlab-deb-data.tar
+ tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu
+ tar -xf gitlab-deb-data.tar
+
mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public
rm -rf opt
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 4fb4c48b0dee..4a021f5f2d97 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -19,64 +19,55 @@
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pr3cmr0bpgg5d0f6wy1z6r45n14r9yin8jnr4hi3ssf402xpc0q";
+ sha256 = "1ivyjsapqgn1xfb2p8yqjrg2jldqm5r7hxrjxq6kdr05gk4fsg59";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09fbazl0ja80na2wadfp3fzmdmdy1lsb4wd2yg7anbj0zk0ap7a9";
+ sha256 = "0l6agrxdaishxjx2zc2x8md95plfp39bfskzgs6v9gsdp2y2arpx";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
actionview = {
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mg4a8143q2wjhjq4mngl69jkv249z5jvg0jkdribdv4zkg586rp";
+ sha256 = "1jrx2pmkywk70z7n17gw3jrcdw3n03wdzvg45bnq8wxshl1lmbhv";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
activejob = {
dependencies = ["activesupport" "globalid"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kazbpfgzz6cdmwjnlb9m671ps4qgggwv2hy8y9xi4h96djyyfqz";
+ sha256 = "10jsa5pqklcsd2npicqxr5abjlwi53di2brpzgz35k557fkpc1z8";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
activemodel = {
dependencies = ["activesupport" "builder"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11vhh7zmp92880s5sx8r32v2p0b7xg039mfr92pjynpkz4q901ld";
+ sha256 = "0c4vj9xajxa906bqbcjpni74nya6rh2nbb15gl8xm0vl9zf3ll9v";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kk4dhn8jfhqfsf1dmb3a183gix6k46xr6cjkxj0rp51w2za1ns0";
+ sha256 = "1lws9y4p9c2vnmv3ddfpv8jh6azlddppl3fi31vahaz14ifxjk5s";
type = "gem";
};
- version = "4.2.8";
- };
- activerecord-nulldb-adapter = {
- dependencies = ["activerecord"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1dxk26drn3s0mpyk8ir30k1pg5fqndrnsdjkkncn0acylq4ja27z";
- type = "gem";
- };
- version = "0.3.7";
+ version = "4.2.10";
};
activerecord_sane_schema_dumper = {
dependencies = ["rails"];
@@ -91,10 +82,10 @@
dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wibdzd2f5l5rlsw1a1y3j3fhw2imrrbkxggdraa6q9qbdnc66hi";
+ sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
@@ -173,6 +164,15 @@
};
version = "0.0.7";
};
+ asset_sync = {
+ dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "044nqqnbib1bpld33j5jxcql06d6fr6zmhq8hlm69zqd0xd509p0";
+ type = "gem";
+ };
+ version = "2.2.0";
+ };
ast = {
source = {
remotes = ["https://rubygems.org"];
@@ -248,6 +248,14 @@
};
version = "0.3.2";
};
+ batch-loader = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nvmwzn8q6dkp2n8wz47z7gldj3yrj7h6syy0cwrkzi19bfvxba2";
+ type = "gem";
+ };
+ version = "1.2.1";
+ };
bcrypt = {
source = {
remotes = ["https://rubygems.org"];
@@ -298,6 +306,14 @@
};
version = "0.7.2";
};
+ blankslate = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx";
+ type = "gem";
+ };
+ version = "2.1.2.4";
+ };
bootstrap-sass = {
dependencies = ["autoprefixer-rails" "sass"];
source = {
@@ -387,10 +403,10 @@
dependencies = ["activemodel" "activesupport" "mime-types"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nms4w6vkm7djghdxwi9qzykhc2ynjwblgqwk87w61fhispqlq2c";
+ sha256 = "012b5jks7hxis1agiy7rbra5h4zhmwhy95gck3kr22nwdxfk71ii";
type = "gem";
};
- version = "1.1.0";
+ version = "1.2.1";
};
cause = {
source = {
@@ -408,6 +424,15 @@
};
version = "0.7.5";
};
+ childprocess = {
+ dependencies = ["ffi"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rqf595gv0bb48awck2cvipk78jy5pj08p1r4xbrfpd0i60jb9hd";
+ type = "gem";
+ };
+ version = "0.7.0";
+ };
chronic = {
source = {
remotes = ["https://rubygems.org"];
@@ -441,14 +466,6 @@
};
version = "3.0.2";
};
- cliver = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7";
- type = "gem";
- };
- version = "0.3.2";
- };
coderay = {
source = {
remotes = ["https://rubygems.org"];
@@ -786,23 +803,23 @@
};
version = "0.9.0";
};
- factory_girl = {
+ factory_bot = {
dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xzl4z9z390fsnyxp10c9if2n46zan3n6zwwpfnwc33crv4s410i";
+ sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx";
type = "gem";
};
- version = "4.7.0";
+ version = "4.8.2";
};
- factory_girl_rails = {
- dependencies = ["factory_girl" "railties"];
+ factory_bot_rails = {
+ dependencies = ["factory_bot" "railties"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hzpirb33xdqaz44i1mbcfv0icjrghhgaz747llcfsflljd4pa4r";
+ sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2";
type = "gem";
};
- version = "4.7.0";
+ version = "4.8.2";
};
faraday = {
dependencies = ["multipart-post"];
@@ -831,6 +848,14 @@
};
version = "0.0.6";
};
+ fast_blank = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
fast_gettext = {
source = {
remotes = ["https://rubygems.org"];
@@ -859,27 +884,36 @@
dependencies = ["erubis" "path_expander" "ruby_parser" "sexp_processor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x563gyx292ka3awps6h6hmswqf71zdxnzw0pfv6p2mhd2zwxaba";
+ sha256 = "0rzggr9w6z2jvs3mv0bp7d64yjivpp93ww9g4j9azzcfjqnh9hn3";
type = "gem";
};
- version = "2.8.1";
+ version = "2.10.0";
};
flipper = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gbvd4j0rkr7qc3mnjdw4r9p6lffnwv7rvm1cyr8a0avjky34n8p";
+ sha256 = "0j3zn54x0a6vvjmyhggl992df7zpcrhzv9ibr6af5gkcx502pg87";
type = "gem";
};
- version = "0.10.2";
+ version = "0.11.0";
};
flipper-active_record = {
dependencies = ["activerecord" "flipper"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "053lq791z8bf3xv6kb14nq3yrzjpmlyhzq3kvys978dc8yw78ld7";
+ sha256 = "0bm1wh1nrl6zbrcqk1nyqbrpddd5fvi72jyqv1j7y2df5sqwfj91";
type = "gem";
};
- version = "0.10.2";
+ version = "0.11.0";
+ };
+ flipper-active_support_cache_store = {
+ dependencies = ["activesupport" "flipper"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18w11dmby55cyd4azic1nsb7h632y6nx3ka8ndlrd1g6g28afvfb";
+ type = "gem";
+ };
+ version = "0.11.0";
};
flowdock = {
dependencies = ["httparty" "multi_json"];
@@ -894,10 +928,10 @@
dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i76g8sdskyfc0gcnd6n9i757s7dmwg3wf6spcr2xh8wzyxkm1pj";
+ sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
type = "gem";
};
- version = "0.1.0";
+ version = "0.2.0";
};
fog-aws = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
@@ -1071,10 +1105,10 @@
dependencies = ["google-protobuf" "grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0irc3yfyr5li2ki6w03znsklnk0qx3srk4wrb7jav042c4kw325k";
+ sha256 = "05ql75gbcw8px03y4pjvbnfy272mh68777f4m3sfajr1jjjp4lw8";
type = "gem";
};
- version = "0.39.0";
+ version = "0.84.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1114,10 +1148,19 @@
gitlab-markup = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "114jfbyyfwad609k1l1fcmbzszb3frdchh83gdwndkglllvprhjz";
+ sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki";
type = "gem";
};
- version = "1.6.2";
+ version = "1.6.3";
+ };
+ gitlab-styles = {
+ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m0ihbp7kjis03pcdx5310j7nzsxh22hfailnz0j467zab9jiap0";
+ type = "gem";
+ };
+ version = "2.3.2";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
@@ -1132,10 +1175,10 @@
dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11plkgyl3w9k4y2scc1igvpgwyz4fnmsr63h2q4j8wkb48nlnhak";
+ sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";
type = "gem";
};
- version = "0.3.7";
+ version = "0.4.1";
};
gollum-grit_adapter = {
dependencies = ["gitlab-grit"];
@@ -1185,10 +1228,19 @@
google-protobuf = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl";
+ sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
type = "gem";
};
- version = "3.4.0.2";
+ version = "3.5.1";
+ };
+ googleapis-common-protos-types = {
+ dependencies = ["google-protobuf"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
+ type = "gem";
+ };
+ version = "1.0.1";
};
googleauth = {
dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
@@ -1245,13 +1297,13 @@
version = "1.7.0";
};
grpc = {
- dependencies = ["google-protobuf" "googleauth"];
+ dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";
+ sha256 = "0fpbxzqacmc78m7whbv3vyfsfyk3cnfbppsy4789mwrlnbnfnp1j";
type = "gem";
};
- version = "1.6.0";
+ version = "1.8.3";
};
haml = {
dependencies = ["tilt"];
@@ -1401,12 +1453,13 @@
version = "2.8.2";
};
i18n = {
+ dependencies = ["concurrent-ruby"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3aqvzfsj786kwjj70jsjpxm6ffw5pwhalzr2abjfv2bdc7k9kw";
+ sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s";
type = "gem";
};
- version = "0.8.6";
+ version = "0.9.1";
};
ice_nine = {
source = {
@@ -1454,10 +1507,10 @@
dependencies = ["rails-dom-testing" "railties" "thor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1asbrr9hqf43q9qbjf87f5lm7fp12pndh76z89ks6jwxf1350fj1";
+ sha256 = "02ii77vwxc49f2lrkbdzww2168bp5nihwzakc9mqyrsbw394w7ki";
type = "gem";
};
- version = "4.1.1";
+ version = "4.3.1";
};
json = {
source = {
@@ -1582,13 +1635,13 @@
version = "1.3.0";
};
license_finder = {
- dependencies = ["httparty" "rubyzip" "thor" "xml-simple"];
+ dependencies = ["httparty" "rubyzip" "thor" "toml" "with_env" "xml-simple"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "092rwf1yjq1l63zbqanmbnbky8g5pj7c3g30mcqbyppbqrsflx80";
+ sha256 = "12p18a34q8dgzjwi2plgv889kxnxqnnmrqhvjs3ng2z26hv2zfag";
type = "gem";
};
- version = "2.1.0";
+ version = "3.1.1";
};
licensee = {
dependencies = ["rugged"];
@@ -1643,13 +1696,13 @@
version = "2.0.3";
};
mail = {
- dependencies = ["mime-types"];
+ dependencies = ["mini_mime"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9";
+ sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz";
type = "gem";
};
- version = "2.6.6";
+ version = "2.7.0";
};
mail_room = {
source = {
@@ -1733,14 +1786,6 @@
};
version = "5.7.0";
};
- mmap2 = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rgf4zhqa6632nbqj585hc0x69iz21s5c91mpijcr9i5wpj9p1s6";
- type = "gem";
- };
- version = "2.2.7";
- };
mousetrap-rails = {
source = {
remotes = ["https://rubygems.org"];
@@ -1793,10 +1838,10 @@
mysql2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kh96xp396swyaddz5l2zqjxi3cvyqv62scak9b3f98j14ynfscl";
+ sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq";
type = "gem";
};
- version = "0.4.5";
+ version = "0.4.10";
};
net-ldap = {
source = {
@@ -1826,10 +1871,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
+ sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
type = "gem";
};
- version = "1.8.1";
+ version = "1.8.2";
};
numerizer = {
source = {
@@ -1886,10 +1931,10 @@
dependencies = ["omniauth-oauth2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dhfl01519q1cp4w0ml481j1cg05g7qvam0x4ia9jhdz8yx6npfs";
+ sha256 = "0id5gn14av81kh41cq4q6c9knyvzl7vc4rs3m4pmpd43g2z6jdw2";
type = "gem";
};
- version = "1.4.1";
+ version = "2.0.0";
};
omniauth-authentiq = {
dependencies = ["omniauth-oauth2"];
@@ -2063,36 +2108,36 @@
parallel = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd";
+ sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
type = "gem";
};
- version = "1.12.0";
- };
- paranoia = {
- dependencies = ["activerecord"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ibdga0a0px8rf82qnmgm59z3z4s27r11i2i24087f0yh8z8bd7z";
- type = "gem";
- };
- version = "2.3.1";
+ version = "1.12.1";
};
parser = {
dependencies = ["ast"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq";
+ sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3";
type = "gem";
};
- version = "2.4.0.0";
+ version = "2.4.0.2";
+ };
+ parslet = {
+ dependencies = ["blankslate"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3";
+ type = "gem";
+ };
+ version = "1.5.0";
};
path_expander = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hklnfb0br6mx6l25zknz2zj6r152i0jiy6fn6ki220x0l5m2h59";
+ sha256 = "0wsymhprfjazdkmfv02kski3iwjjkciwxqjg9brh56sbymcgk34a";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.2";
};
peek = {
dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"];
@@ -2192,15 +2237,6 @@
};
version = "1.0.1";
};
- poltergeist = {
- dependencies = ["capybara" "cliver" "multi_json" "websocket-driver"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1fnkly1ks31nf5cdks9jd5c5vynbanrr8pwp801qq2i8bg78rwc0";
- type = "gem";
- };
- version = "1.9.0";
- };
posix-spawn = {
source = {
remotes = ["https://rubygems.org"];
@@ -2253,13 +2289,12 @@
version = "0.0.3";
};
prometheus-client-mmap = {
- dependencies = ["mmap2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fgkilpiha338mvfkj5rwhny3vld0nb3v1vgbrlxbhnvch26wakh";
+ sha256 = "1p3xkk9zal95di5v999mk7sq02fk0fimg633ixvhvv70ph6c8dhn";
type = "gem";
};
- version = "0.7.0.beta18";
+ version = "0.9.1";
};
pry = {
dependencies = ["coderay" "method_source" "slop"];
@@ -2333,10 +2368,10 @@
rack-cors = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sz9d9gjmv2vjl3hddzk269hb1k215k8sp37gicphx82h3chk1kw";
+ sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013";
type = "gem";
};
- version = "0.4.0";
+ version = "1.0.2";
};
rack-oauth2 = {
dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
@@ -2378,10 +2413,10 @@
dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dpbf3ybzbhqqkwg5vi60121860cr8fybvchrxk5wy3f2jcj0mch";
+ sha256 = "15vbdlkmlh470g7msqhmcmhxhi4finv3cjg595x9viafvphnf40l";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
rails-deprecated_sanitizer = {
dependencies = ["activesupport"];
@@ -2423,10 +2458,10 @@
dependencies = ["actionpack" "activesupport" "rake" "thor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bavl4hj7bnl3ryqi9rvykm410kflplgingkcxasfv1gdilddh4g";
+ sha256 = "0snymfqj2cql0gp51i6a44avcirdridc15yggnxjj9raa9f3229p";
type = "gem";
};
- version = "4.2.8";
+ version = "4.2.10";
};
rainbow = {
dependencies = ["rake"];
@@ -2448,10 +2483,27 @@
rake = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";
+ sha256 = "190p7cs8zdn07mjj6xwwsdna3g0r98zs4crz7jh2j2q5b0nbxgjf";
type = "gem";
};
- version = "12.1.0";
+ version = "12.3.0";
+ };
+ rb-fsevent = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
+ type = "gem";
+ };
+ version = "0.10.2";
+ };
+ rb-inotify = {
+ dependencies = ["ffi"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+ type = "gem";
+ };
+ version = "0.9.10";
};
rblineprof = {
dependencies = ["debugger-ruby_core_source"];
@@ -2533,28 +2585,28 @@
redis = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kdj7511l6kqvqmaiw7kw604c83pk6f4b540gdsq1bf7yxm6qx6g";
+ sha256 = "0i415x8gi0c5vsiy6ikvx5js6fhc4x80a5lqv8iidy2iymd20irv";
type = "gem";
};
- version = "3.3.3";
+ version = "3.3.5";
};
redis-actionpack = {
dependencies = ["actionpack" "redis-rack" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gnkqi7cji2q5yfwm8b752k71pqrb3dqksv983yrf23virqnjfjr";
+ sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63";
type = "gem";
};
- version = "5.0.1";
+ version = "5.0.2";
};
redis-activesupport = {
dependencies = ["activesupport" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0i0r23rv32k25jqwbr4cb73alyaxwvz9crdaw3gv26h1zjrdjisd";
+ sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5";
type = "gem";
};
- version = "5.0.1";
+ version = "5.0.4";
};
redis-namespace = {
dependencies = ["redis"];
@@ -2569,28 +2621,28 @@
dependencies = ["rack" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fbxl5gv8krjf6n88gvn44xbzhfnsysnzawz7zili298ak98lsb3";
+ sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb";
type = "gem";
};
- version = "1.6.0";
+ version = "2.0.4";
};
redis-rails = {
dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04l2y26k4v30p3dx0pqf9gz257q73qzgrfqf3qv6bxwyv8z9f5hm";
+ sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40";
type = "gem";
};
- version = "5.0.1";
+ version = "5.0.2";
};
redis-store = {
dependencies = ["redis"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1da15wr3wc1d4hqy7h7smdc2k2jpfac3waa9d65si6f4dmqymkkq";
+ sha256 = "00yh8rhv91vxjlqs4ylic99m9npjxmgib2vjj8hgzk1174y6vcmq";
type = "gem";
};
- version = "1.2.0";
+ version = "1.4.1";
};
representable = {
dependencies = ["declarative" "declarative-option" "uber"];
@@ -2769,28 +2821,28 @@
dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mqyylfzch0967w7nfnqza84sqhljijd9y4bnq8hcmrscch75cxw";
+ sha256 = "0d22rr1jnjfkw10rbnqb8plyd7kzf553nm3sbv14xil65s4mkijf";
type = "gem";
};
- version = "0.49.1";
+ version = "0.52.1";
};
rubocop-gitlab-security = {
dependencies = ["rubocop"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy";
+ sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln";
type = "gem";
};
- version = "0.1.0";
+ version = "0.1.1";
};
rubocop-rspec = {
dependencies = ["rubocop"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16qgakivl2vqbx82fm78999cximbb10jbz3ix1ga4a2rns5xxlf3";
+ sha256 = "18rd3w2q07vkfdk9nl8apkpyjfw1478qg82zgfnd4hn3r40jkbcx";
type = "gem";
};
- version = "1.15.1";
+ version = "1.22.1";
};
ruby-fogbugz = {
dependencies = ["crack"];
@@ -2812,10 +2864,10 @@
ruby-progressbar = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm";
+ sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
type = "gem";
};
- version = "1.8.1";
+ version = "1.9.0";
};
ruby-saml = {
dependencies = ["nokogiri"];
@@ -2894,12 +2946,22 @@
version = "2.1.0";
};
sass = {
+ dependencies = ["sass-listen"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy";
+ sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
type = "gem";
};
- version = "3.4.22";
+ version = "3.5.5";
+ };
+ sass-listen = {
+ dependencies = ["rb-fsevent" "rb-inotify"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+ type = "gem";
+ };
+ version = "4.0.0";
};
sass-rails = {
dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"];
@@ -2923,10 +2985,10 @@
dependencies = ["rake" "sass"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01lwbrz7637j79jkm6yaq4wsd4cqgzn0r74whn85v7j9dir73l98";
+ sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g";
type = "gem";
};
- version = "0.54.0";
+ version = "0.56.0";
};
securecompare = {
source = {
@@ -2940,10 +3002,10 @@
dependencies = ["activerecord" "activesupport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nkp1pvkdydclbl2v4qf9cixmiycvlqnrgxd61sv9r85spb01z3p";
+ sha256 = "0x6gclryl0hds3zms095d2iyafcvm2kfrm7362vrkxws7r2775pi";
type = "gem";
};
- version = "2.3.6";
+ version = "2.3.7";
};
select2-rails = {
dependencies = ["thor"];
@@ -2954,6 +3016,15 @@
};
version = "3.5.9.3";
};
+ selenium-webdriver = {
+ dependencies = ["childprocess" "rubyzip"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0w6r0k1w7hpk853qfw18lipyzxs0r0d6xr70zqsjfdn2dwr0rb30";
+ type = "gem";
+ };
+ version = "3.5.0";
+ };
sentry-raven = {
dependencies = ["faraday"];
source = {
@@ -3001,10 +3072,10 @@
dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nazi3a9aq7c7cxk749qz9ilp7dv39r9n3zsbjg4frc96bb85s9w";
+ sha256 = "0mmmv6k4l5rd74zw4xmwsadi0pbbcyzk1cm73zd8fzwra6nfz7sh";
type = "gem";
};
- version = "5.0.4";
+ version = "5.0.5";
};
sidekiq-cron = {
dependencies = ["rufus-scheduler" "sidekiq"];
@@ -3141,10 +3212,10 @@
dependencies = ["actionpack" "activesupport" "sprockets"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zr9vk2vn44wcn4265hhnnnsciwlmqzqc6bnx78if1xcssxj6x44";
+ sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
type = "gem";
};
- version = "3.2.0";
+ version = "3.2.1";
};
sqlite3 = {
source = {
@@ -3295,6 +3366,15 @@
};
version = "0.8.3";
};
+ toml = {
+ dependencies = ["parslet"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v";
+ type = "gem";
+ };
+ version = "0.1.2";
+ };
toml-rb = {
dependencies = ["citrus"];
source = {
@@ -3317,10 +3397,10 @@
dependencies = ["thread_safe"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05r81lk7q7275rdq7xipfm0yxgqyd2ggh73xpc98ypngcclqcscl";
+ sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp";
type = "gem";
};
- version = "1.2.3";
+ version = "1.2.4";
};
u2f = {
source = {
@@ -3476,23 +3556,6 @@
};
version = "0.9.10";
};
- websocket-driver = {
- dependencies = ["websocket-extensions"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9";
- type = "gem";
- };
- version = "0.6.3";
- };
- websocket-extensions = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "07qnsafl6203a2zclxl20hy4jq11c471cgvd0bj5r9fx1qqw06br";
- type = "gem";
- };
- version = "0.1.2";
- };
wikicloth = {
dependencies = ["builder" "expression_parser" "rinku"];
source = {
@@ -3502,6 +3565,14 @@
};
version = "0.8.1";
};
+ with_env = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
xml-simple = {
source = {
remotes = ["https://rubygems.org"];
diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch
deleted file mode 100644
index 3b30ff03346b..000000000000
--- a/pkgs/applications/version-management/gitlab/nulladapter.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/Gemfile b/Gemfile
-index 4861171ef5..f6e701c548 100644
---- a/Gemfile
-+++ b/Gemfile
-@@ -1,5 +1,7 @@
- source 'https://rubygems.org'
-
-+gem 'activerecord-nulldb-adapter'
-+
- gem 'rails', '4.2.8'
- gem 'rails-deprecated_sanitizer', '~> 1.0.3'
-
-diff --git a/Gemfile.lock b/Gemfile.lock
-index 38944248f9..08ce4486ba 100644
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -33,6 +33,8 @@ GEM
- activemodel (= 4.2.8)
- activesupport (= 4.2.8)
- arel (~> 6.0)
-+ activerecord-nulldb-adapter (0.3.7)
-+ activerecord (>= 2.0.0)
- activerecord_sane_schema_dumper (0.2)
- rails (>= 4, < 5)
- activesupport (4.2.8)
-@@ -963,6 +965,7 @@ PLATFORMS
- DEPENDENCIES
- RedCloth (~> 4.3.2)
- ace-rails-ap (~> 4.1.0)
-+ activerecord-nulldb-adapter
- activerecord_sane_schema_dumper (= 0.2)
- acts-as-taggable-on (~> 4.0)
- addressable (~> 2.5.2)
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index 39c7c28847c4..7a2bfea0c109 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -1,8 +1,8 @@
diff --git a/config/environments/production.rb b/config/environments/production.rb
-index c5cbfcf64c..e40f10e25f 100644
+index c5cbfcf64c..4d01f6fab8 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
-@@ -70,14 +70,16 @@ Rails.application.configure do
+@@ -70,10 +70,10 @@ Rails.application.configure do
config.action_mailer.delivery_method = :sendmail
# Defaults to:
@@ -11,23 +11,17 @@ index c5cbfcf64c..e40f10e25f 100644
- # # arguments: '-i -t'
- # # }
+ config.action_mailer.sendmail_settings = {
-+ location: '/run/wrappers/bin/sendmail',
++ location: '/usr/sbin/sendmail',
+ arguments: '-i -t'
+ }
config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = true
- config.eager_load = true
-
- config.allow_concurrency = false
-+
-+ config.active_record.dump_schema_after_migration = false
- end
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 0b33783869..cd4e41d9bd 100644
+index bd696a7f2c..44e3863736 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
-@@ -574,7 +574,7 @@ production: &base
+@@ -590,7 +590,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:
@@ -37,10 +31,10 @@ index 0b33783869..cd4e41d9bd 100644
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
-index 8ddf8e4d2e..559cf9adf7 100644
+index 0bea8a4f4b..290248547b 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
-@@ -252,7 +252,7 @@ Settings.gitlab['user'] ||= 'git'
+@@ -255,7 +255,7 @@ Settings.gitlab['user'] ||= 'git'
Settings.gitlab['user_home'] ||= begin
Etc.getpwnam(Settings.gitlab['user']).dir
rescue ArgumentError # no user configured
@@ -49,7 +43,7 @@ index 8ddf8e4d2e..559cf9adf7 100644
end
Settings.gitlab['time_zone'] ||= nil
Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
-@@ -491,7 +491,7 @@ Settings.backup['upload']['storage_class'] ||= nil
+@@ -507,7 +507,7 @@ Settings.backup['upload']['storage_class'] ||= nil
# Git
#
Settings['git'] ||= Settingslogic.new({})
@@ -58,38 +52,42 @@ index 8ddf8e4d2e..559cf9adf7 100644
# Important: keep the satellites.path setting until GitLab 9.0 at
# least. This setting is fed to 'rm -rf' in
+diff --git a/lib/api/api.rb b/lib/api/api.rb
+index e953f3d2ec..3a8d9f076b 100644
+--- a/lib/api/api.rb
++++ b/lib/api/api.rb
+@@ -2,7 +2,7 @@ module API
+ class API < Grape::API
+ include APIGuard
+
+- LOG_FILENAME = Rails.root.join("log", "api_json.log")
++ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log")
+
+ NO_SLASH_URL_PART_REGEX = %r{[^/]+}
+ PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
-index 59b21149a9..4f4a39a06c 100644
+index a42e312b5d..ccaab9229e 100644
--- a/lib/gitlab/logger.rb
+++ b/lib/gitlab/logger.rb
-@@ -13,7 +13,7 @@
+@@ -26,7 +26,7 @@ module Gitlab
end
- def self.read_latest
-- path = Rails.root.join("log", file_name)
-+ path = File.join(ENV["GITLAB_LOG_PATH"], file_name)
-
- return [] unless File.readable?(path)
-
-@@ -22,7 +22,7 @@
+ def self.full_log_path
+- Rails.root.join("log", file_name)
++ File.join(ENV["GITLAB_LOG_PATH"], file_name)
end
- def self.build
-- new(Rails.root.join("log", file_name))
-+ new(File.join(ENV["GITLAB_LOG_PATH"], file_name))
- end
- end
- end
+ def self.cache_key
diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb
-index b5f4124052..f72c556983 100644
+index 7d7400bdab..cb25211d44 100644
--- a/lib/gitlab/uploads_transfer.rb
+++ b/lib/gitlab/uploads_transfer.rb
@@ -1,7 +1,7 @@
module Gitlab
class UploadsTransfer < ProjectTransfer
def root_dir
-- File.join(CarrierWave.root, FileUploader.base_dir)
-+ ENV['GITLAB_UPLOADS_PATH'] || File.join(CarrierWave.root, FileUploader.base_dir)
+- FileUploader.root
++ ENV['GITLAB_UPLOADS_PATH'] || FileUploader.root
end
end
end
@@ -107,7 +105,7 @@ index 3e0c436d6e..28cefc5514 100644
end
end
diff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rb
-index 7026d0ba07..6d88b8b9fb 100644
+index 7026d0ba07..c56e1f7ed9 100644
--- a/lib/system_check/app/uploads_directory_exists_check.rb
+++ b/lib/system_check/app/uploads_directory_exists_check.rb
@@ -4,12 +4,13 @@ module SystemCheck
@@ -122,7 +120,7 @@ index 7026d0ba07..6d88b8b9fb 100644
+ uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')
try_fixing_it(
- "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads"
-+ "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
++ "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
)
for_more_information(
see_installation_guide_section 'GitLab'
@@ -152,14 +150,3 @@ index b276a81eac..070e3ebd81 100644
end
end
end
---- a/lib/api/api.rb 1970-01-01 01:00:01.000000000 +0100
-+++ b/lib/api/api.rb 2017-09-28 19:37:24.953605705 +0200
-@@ -2,7 +2,7 @@
- class API < Grape::API
- include APIGuard
-
-- LOG_FILENAME = Rails.root.join("log", "api_json.log")
-+ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log")
-
- use GrapeLogging::Middleware::RequestLogger,
- logger: Logger.new(LOG_FILENAME),
diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix
new file mode 100644
index 000000000000..d062c32d018e
--- /dev/null
+++ b/pkgs/applications/version-management/gitless/default.nix
@@ -0,0 +1,26 @@
+{ fetchFromGitHub, pythonPackages, stdenv }:
+
+pythonPackages.buildPythonApplication rec {
+ ver = "0.8.6";
+ name = "gitless-${ver}";
+
+ src = fetchFromGitHub {
+ owner = "sdg-mit";
+ repo = "gitless";
+ rev = "v${ver}";
+ sha256 = "1q6y38f8ap6q1livvfy0pfnjr0l8b68hyhc9r5v87fmdyl7y7y8g";
+ };
+
+ propagatedBuildInputs = with pythonPackages; [ sh pygit2 clint ];
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = http://gitless.com/;
+ description = "A version control system built on top of Git";
+ license = licenses.gpl2;
+ platforms = platforms.all;
+ maintainers = [ maintainers.cransom ];
+ };
+}
+
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 5e1feacd83d4..78b59f59e949 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, git, nettools, perl }:
+{ stdenv, fetchFromGitHub, git, nettools, perl }:
stdenv.mkDerivation rec {
name = "gitolite-${version}";
- version = "3.6.3";
+ version = "3.6.7";
- src = fetchurl {
- url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz";
- sha256 = "16cxifjxnri719qb6zzwkdf61x5y957acbdhcgqcan23x1mfn84v";
+ src = fetchFromGitHub {
+ owner = "sitaramc";
+ repo = "gitolite";
+ rev = "9123ae44b14b9df423a7bf1e693e05865ca320ac";
+ sha256 = "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb";
};
buildInputs = [ git nettools perl ];
@@ -26,6 +28,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
perl ./install -to $out/bin
+ echo ${version} > $out/bin/VERSION
'';
meta = with stdenv.lib; {
@@ -33,6 +36,6 @@ stdenv.mkDerivation rec {
homepage = http://gitolite.com/gitolite/index.html;
license = licenses.gpl2;
platforms = platforms.unix;
- maintainers = [ maintainers.thoughtpolice maintainers.lassulus ];
+ maintainers = [ maintainers.thoughtpolice maintainers.lassulus maintainers.tomberek ];
};
}
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 25a85f4b92d7..d617d363fa0c 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -1,26 +1,25 @@
{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre
-, SDL2_image, freetype, glew, mesa, boost, glm
+, SDL2_image, freetype, glew, libGLU_combined, boost, glm
}:
stdenv.mkDerivation rec {
- version = "0.47";
+ version = "0.48";
name = "gource-${version}";
src = fetchurl {
url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
- sha256 = "1llqwdnfa1pff8bxk27qsqff1fcg0a9kfdib0rn7p28vl21n1cgj";
+ sha256 = "04qxcm05qiyr9rg2kv6abfy7kkzqr8ziw4iyp1d14lniv93m61dp";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa
+ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined
boost glm freetype
];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
- NIX_CFLAGS_COMPILE = "-fpermissive " + # fix build with newer gcc versions
- "-std=c++11"; # fix build with glm >= 0.9.6.0
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://gource.io/;
@@ -36,7 +35,7 @@ stdenv.mkDerivation rec {
Mercurial and Bazaar and SVN. Gource can also parse logs produced
by several third party tools for CVS repositories.
'';
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index bfaa62ebb66d..ded0d5e39863 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
branch = "net.venge.monotone.guitone";
};
+ patches = [ ./parallel-building.patch ];
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ qt4 qmake4Hook graphviz ];
@@ -24,6 +26,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt4 based GUI for monotone";
homepage = http://guitone.thomaskeller.biz;
+ downloadPage = https://code.monotone.ca/p/guitone/;
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/applications/version-management/guitone/parallel-building.patch b/pkgs/applications/version-management/guitone/parallel-building.patch
new file mode 100644
index 000000000000..f0e924cbfb81
--- /dev/null
+++ b/pkgs/applications/version-management/guitone/parallel-building.patch
@@ -0,0 +1,7 @@
+Without this `make tmp/AttributesView.o` fails with
+src/view/dialogs/AddEditAttribute.h:22:35: fatal error: ui_add_edit_attribute.h: No such file or directory
+--- a/guitone.pro
++++ b/guitone.pro
+@@ -215 +215,2 @@ help.commands = @echo Available targets: $${QMAKE_EXTRA_TARGETS}
+ QMAKE_EXTRA_TARGETS += help
++CONFIG += depend_includepath
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 05db6d964c3a..e3cafe6b6464 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchurl, itstool, python2Packages, intltool, wrapGAppsHook
+{ stdenv, fetchurl, itstool, python3Packages, intltool, wrapGAppsHook
, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file
}:
let
- minor = "3.16";
- version = "${minor}.4";
- inherit (python2Packages) python buildPythonApplication pycairo pygobject3;
+ pname = "meld";
+ version = "3.18.0";
+ inherit (python3Packages) python buildPythonApplication pycairo pygobject3;
in buildPythonApplication rec {
- name = "meld-${version}";
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
- sha256 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4";
};
buildInputs = [
intltool wrapGAppsHook itstool libxml2
- gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
+ gnome3.gtksourceview gnome3.gsettings-desktop-schemas pycairo cairo
gnome3.defaultIconTheme gnome3.dconf file
];
propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
@@ -41,6 +41,14 @@ in buildPythonApplication rec {
pythonPath = [ gtk3 ];
+ doCheck = false;
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Visual diff and merge tool";
homepage = http://meldmerge.org/;
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 774aa1082bc8..68750bb9e6e7 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,7 +4,7 @@
let
# if you bump version, update pkgs.tortoisehg too or ping maintainer
- version = "4.3.2";
+ version = "4.5";
name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.buildPythonApplication {
@@ -13,17 +13,17 @@ in python2Packages.buildPythonApplication {
src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz";
- sha256 = "0j6djq584rcj9ghz59ddqzrfq49lykg3wqwap5fnzp9apa4gcnqg";
+ sha256 = "0rgjy42zdlbzgp4qq49amzplfcvycyijf4kdhc5wk3fqz7cki4sd";
};
inherit python; # pass it so that the same version can be used in hg2git
- buildInputs = [ makeWrapper docutils unzip ];
+ buildInputs = [ makeWrapper docutils unzip ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ];
- propagatedBuildInputs = [ hg-git dulwich ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices cf-private ];
+ propagatedBuildInputs = [ hg-git dulwich ];
- makeFlags = "PREFIX=$(out)";
+ makeFlags = [ "PREFIX=$(out)" ];
postInstall = (stdenv.lib.optionalString guiSupport
''
@@ -34,9 +34,9 @@ in python2Packages.buildPythonApplication {
hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py
EOF
# setting HG so that hgk can be run itself as well (not only hg view)
- WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
- --set HG \"$out/bin/hg\"
- --prefix PATH : \"${tk}/bin\" "
+ WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}
+ --set HG $out/bin/hg
+ --prefix PATH : ${tk}/bin "
'') +
''
for i in $(cd $out/bin && ls); do
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index c2006e9dd6bf..c24d80e3f2ef 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -22,15 +22,15 @@ stdenv.mkDerivation rec {
patchFlags = ["-p0"];
patches = [
(fetchurl {
- url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch";
+ url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch";
sha256 = "0risfy8iqmkr209hmnvpv57ywbd3rvchzzd0jy2lfyqrrrm6zknw";
})
(fetchurl {
- url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch";
+ url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch";
sha256 = "16bj0ppzqd45an154dr7sifjra7lv4m9anxfw3c56y763jq7fafa";
})
(fetchurl {
- url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch";
+ url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch";
sha256 = "1gfp82rc7pawb5x4hh2wf7xh1l1l54ib75930xgd1y437la4703r";
})
];
diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index c3ed61f31a23..324bbf690d56 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -3,7 +3,7 @@
with python2Packages;
buildPythonApplication rec {
name = "${pname}-${version}";
- version = "0.3.0";
+ version = "0.3.1";
pname = "nbstripout";
# Mercurial should be added as a build input but because it's a Python
@@ -14,7 +14,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
- sha256 = "126xhjma4a0k7gq58hbqglhb3rai0a576azz7g8gmqjr3kl0264v";
+ sha256 = "b997c99b8bbb865988202d2f005cdaabb2598b07dad891c302a147a5871a4a95";
};
# for some reason, darwin uses /bin/sh echo native instead of echo binary, so
@@ -25,7 +25,7 @@ buildPythonApplication rec {
# ignore flake8 tests for the nix wrapped setup.py
checkPhase = ''
- PATH=$PATH:$out/bin:${mercurial}/bin pytest --ignore=nix_run_setup.py .
+ PATH=$PATH:$out/bin:${mercurial}/bin pytest .
'';
meta = {
diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix
index 01369b9685dc..3ac52a5c4403 100644
--- a/pkgs/applications/version-management/peru/default.nix
+++ b/pkgs/applications/version-management/peru/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "peru-${version}";
- version = "1.1.0";
+ version = "1.1.3";
src = fetchFromGitHub {
owner = "buildinspace";
repo = "peru";
rev = "${version}";
- sha256 = "0hvp6pvpsz0f98az4f1wl93gqlz6wj24pjnc5zs1har9rqlpq8y8";
+ sha256 = "02kr3ib3ppbmcsjy8i8z41vp9gw9gdivy2l5aps12lmaa3rc6727";
};
propagatedBuildInputs = with python3Packages; [ pyyaml docopt ];
diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix
index 019296550819..d3b027fada68 100644
--- a/pkgs/applications/version-management/rabbitvcs/default.nix
+++ b/pkgs/applications/version-management/rabbitvcs/default.nix
@@ -1,14 +1,14 @@
{ fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }:
python2Packages.buildPythonApplication rec {
name = "rabbitvcs-${version}";
- version = "0.16";
+ version = "0.17.1";
namePrefix = "";
src = fetchFromGitHub {
owner = "rabbitvcs";
repo = "rabbitvcs";
rev = "v${version}";
- sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly";
+ sha256 = "01cr16zf3gzsci1hhfli79m34fcx5m1pvswl16rkxxn212yc9fhy";
};
pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ];
@@ -30,6 +30,8 @@ python2Packages.buildPythonApplication rec {
wrapPythonProgramsIn $cli "$out $pythonPath"
'';
+ doCheck = false;
+
meta = {
description = "Graphical tools for working with version control systems";
homepage = http://rabbitvcs.org/;
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
new file mode 100644
index 000000000000..5c6e65915da5
--- /dev/null
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ name = "sit-${version}";
+ version = "0.1.3";
+
+ src = fetchFromGitHub {
+ owner = "sit-it";
+ repo = "sit";
+ rev = "v${version}";
+ sha256 = "1ysy1lhb7fxy02a3c9xk2awa49svnfa8bqcz2aj4x56r2f8vhj0h";
+ };
+
+ cargoSha256 = "1y8a8a9jn9f374sy5fs1snmpiqyckqc0aw7idwnpfr912c1zzrxw";
+
+ meta = with stdenv.lib; {
+ description = "SCM-agnostic, file-based, offline-first, immutable issue tracker";
+ homepage = http://sit-it.org/;
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = with maintainers; [ dywedir ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index d39c81400100..a34afbab55e6 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "smartgithg-${version}";
- version = "17_1_1";
+ version = "17_1_4";
src = fetchurl {
- url = "http://www.syntevo.com/static/smart/download/smartgit/smartgit-linux-${version}.tar.gz";
- sha256 = "1zc1cs9gxv9498jp1nhi9z70dv9dzv0yh5f3bd89wi5zvcwly3d0";
+ url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz";
+ sha256 = "1x8s1mdxg7m3fy3izgnb1smrn4ng3q31x0sqnjlchkb5vx7gp5rh";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index e75223c6c363..4a4879600aeb 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "src-${version}";
- version = "1.13";
+ version = "1.18";
src = fetchurl {
url = "http://www.catb.org/~esr/src/${name}.tar.gz";
- sha256 = "0l13ld8nxm1c720ns22lyx3q1bq2c2zn78vi5w92b7nl6p2nncy8";
+ sha256 = "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c";
};
buildInputs = [ python rcs git makeWrapper ];
@@ -24,9 +24,17 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Simple single-file revision control";
- homepage = http://www.catb.org/~esr/src/;
+ longDescription = ''
+ SRC, acronym of Simple Revision Control, is RCS/SCCS reloaded with a
+ modern UI, designed to manage single-file solo projects kept more than one
+ to a directory. Use it for FAQs, ~/bin directories, config files, and the
+ like. Features integer sequential revision numbers, a command set that
+ will seem familiar to Subversion/Git/hg users, and no binary blobs
+ anywhere.
+ '';
+ homepage = http://www.catb.org/esr/src/;
license = licenses.bsd3;
platforms = platforms.all;
- maintainers = with maintainers; [ calvertvl ];
+ maintainers = with maintainers; [ calvertvl AndersonTorres ];
};
}
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index 424a402780af..4d41cad0d8e6 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec {
src = fetchurl {
urls = [
"http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz"
- "http://pkgs.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz"
+ "http://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz"
];
sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
};
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 44d1ad0cd357..437062f7f5e1 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,18 +2,18 @@
python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}";
- version = "4.3.1";
+ version = "4.5";
src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
- sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n";
+ sha256 = "11m2hir2y1hblg9sqmansv16rcp560j2d3nhqzfhkim46a59fxvk";
};
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ];
- doCheck = false;
+ doCheck = false; # tests fail with "thg: cannot connect to X server"
dontStrip = true;
buildPhase = "";
installPhase = ''
@@ -23,6 +23,11 @@ python2Packages.buildPythonApplication rec {
ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias
'';
+ checkPhase = ''
+ echo "test: thg version"
+ $out/bin/thg version
+ '';
+
meta = {
description = "Qt based graphical tool for working with Mercurial";
homepage = http://tortoisehg.bitbucket.org/;
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index f0185e187bbe..8b2d6fcc8c38 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub }:
-let version = "1.07"; in
+let version = "1.12.0"; in
stdenv.mkDerivation {
name = "yadm-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
owner = "TheLocehiliosan";
repo = "yadm";
rev = "${version}";
- sha256 = "0kkxrvw17pmrx1dq0dq53jb9pm545firakrxc48znfw54n2036fw";
+ sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6";
};
buildCommand = ''
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index ebc1249dc11d..3dd0cc5adc29 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl
, libX11, wxGTK
, libiconv, fontconfig, freetype
-, mesa
+, libGLU_combined
, libass, fftw, ffms
, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
, icu, boost, intltool # New dependencies
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
postPatch = "sed '1i#include ' -i src/utils.cpp";
buildInputs = with stdenv.lib;
- [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa
+ [ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU_combined
libass fftw ffms ffmpeg zlib icu boost boost.out libiconv
]
++ optional spellcheckSupport hunspell
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
# but they are linked against GPL'd softwares
# - so the resulting program will be GPL
maintainers = [ maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/video/avidemux/bootstrap_logging.patch b/pkgs/applications/video/avidemux/bootstrap_logging.patch
new file mode 100644
index 000000000000..8f45251d26c2
--- /dev/null
+++ b/pkgs/applications/video/avidemux/bootstrap_logging.patch
@@ -0,0 +1,26 @@
+diff --git a/bootStrap.bash b/bootStrap.bash
+index 646a5e048..6429199ba 100644
+--- a/bootStrap.bash
++++ b/bootStrap.bash
+@@ -4,6 +4,7 @@
+ #
+ # By default we use qt5 now
+ #
++set -e # hard fail if something fails
+ packages_ext=""
+ rebuild=0
+ do_core=1
+@@ -66,10 +67,10 @@ Process()
+ fi
+ cd $BUILDDIR
+ cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $BUILD_QUIRKS $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
+- make $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR"
+- if [ "x$PKG" != "x" ] ; then
++ make $PARAL
++ if [ "x$PKG" != "x" ] ; then
+ $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package
+- fi
++ fi
+ # we need the make install so that other packcges can be built against this one
+ make install DESTDIR=$FAKEROOT_DIR
+ }
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 7f70818bb141..99ed7378745c 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -1,6 +1,8 @@
{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir
, zlib, gettext, libvdpau, libva, libXv, sqlite
-, yasm, freetype, fontconfig, fribidi, gtk3, qt4
+, yasm, freetype, fontconfig, fribidi
+, makeWrapper, libXext, libGLU, qttools, qtbase
+, alsaLib
, withX265 ? true, x265
, withX264 ? true, x264
, withXvid ? true, xvidcore
@@ -11,9 +13,18 @@
, withFAAD ? true, faad2
, withOpus ? true, libopus
, withVPX ? true, libvpx
+, withQT ? true
+, withCLI ? true
+, default ? "qt5"
+, withPlugins ? true
}:
-let
+assert withQT -> qttools != null && qtbase != null;
+assert default != "qt5" -> default == "cli";
+assert !withQT -> default != "qt5";
+
+stdenv.mkDerivation rec {
+ name = "avidemux-${version}";
version = "2.7.0";
src = fetchurl {
@@ -21,112 +32,55 @@ let
sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy";
};
- common = {
- inherit version src;
+ patches = [ ./dynamic_install_dir.patch ./bootstrap_logging.patch ];
- patches = [ ./dynamic_install_dir.patch ];
+ nativeBuildInputs = [ yasm cmake pkgconfig ];
+ buildInputs = [
+ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig
+ freetype alsaLib libXext libGLU makeWrapper
+ ] ++ lib.optional withX264 x264
+ ++ lib.optional withX265 x265
+ ++ lib.optional withXvid xvidcore
+ ++ lib.optional withLAME lame
+ ++ lib.optional withFAAC faac
+ ++ lib.optional withVorbis libvorbis
+ ++ lib.optional withPulse libpulseaudio
+ ++ lib.optional withFAAD faad2
+ ++ lib.optional withOpus libopus
+ ++ lib.optionals withQT [ qttools qtbase ]
+ ++ lib.optional withVPX libvpx;
- enableParallelBuilding = false;
+ buildCommand = ''
+ unpackPhase
+ cd "$sourceRoot"
+ patchPhase
- nativeBuildInputs = [ cmake pkgconfig yasm ];
- buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype ]
- ++ lib.optional withX264 x264
- ++ lib.optional withX265 x265
- ++ lib.optional withXvid xvidcore
- ++ lib.optional withLAME lame
- ++ lib.optional withFAAC faac
- ++ lib.optional withVorbis libvorbis
- ++ lib.optional withPulse libpulseaudio
- ++ lib.optional withFAAD faad2
- ++ lib.optional withOpus libopus
- ++ lib.optional withVPX libvpx
- ;
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXext}/lib"
+ ${stdenv.shell} bootStrap.bash \
+ --with-core \
+ ${if withQT then "--with-qt" else "--without-qt"} \
+ ${if withCLI then "--with-cli" else "--without-cli"} \
+ ${if withPlugins then "--with-plugins" else "--without-plugins"}
- meta = {
- homepage = http://fixounet.free.fr/avidemux/;
- description = "Free video editor designed for simple video editing tasks";
- maintainers = with stdenv.lib.maintainers; [ viric abbradar ];
- platforms = with stdenv.lib.platforms; linux;
- license = stdenv.lib.licenses.gpl2;
- };
- };
+ mkdir $out
+ cp -R install/usr/* $out
- core = stdenv.mkDerivation (common // {
- name = "avidemux-${version}";
+ for i in $out/bin/*; do
+ wrapProgram $i \
+ --set ADM_ROOT_DIR $out \
+ --prefix LD_LIBRARY_PATH ":" "${libXext}/lib"
+ done
+ ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux"
- preConfigure = ''
- cd avidemux_core
- '';
- });
+ fixupPhase
+ '';
- buildPlugin = args: stdenv.mkDerivation (common // {
- name = "avidemux-${args.pluginName}-${version}";
-
- buildInputs = (args.buildInputs or []) ++ common.buildInputs ++ [ lndir ];
-
- cmakeFlags = [ "-DPLUGIN_UI=${args.pluginUi}" ];
-
- passthru.isUi = args.isUi or false;
-
- buildCommand = ''
- unpackPhase
- cd "$sourceRoot"
- patchPhase
-
- mkdir $out
- lndir ${core} $out
-
- export cmakeFlags="$cmakeFlags -DAVIDEMUX_SOURCE_DIR=$(pwd)"
-
- for i in ${toString (args.buildDirs or [])} avidemux_plugins; do
- ( cd "$i"
- cmakeConfigurePhase
- buildPhase
- installPhase
- )
- done
-
- fixupPhase
- '';
-
- meta = common.meta // args.meta or {};
- });
-
-in {
- avidemux_core = core;
-
- avidemux_cli = buildPlugin {
- pluginName = "cli";
- pluginUi = "CLI";
- isUi = true;
- buildDirs = [ "avidemux/cli" ];
- };
-
- avidemux_qt4 = buildPlugin {
- pluginName = "qt4";
- buildInputs = [ qt4 ];
- pluginUi = "QT4";
- isUi = true;
- buildDirs = [ "avidemux/qt4" ];
- };
-
- avidemux_gtk = buildPlugin {
- pluginName = "gtk";
- buildInputs = [ gtk3 ];
- pluginUi = "GTK";
- isUi = true;
- buildDirs = [ "avidemux/gtk" ];
- # Code seems unmaintained.
- meta.broken = true;
- };
-
- avidemux_common = buildPlugin {
- pluginName = "common";
- pluginUi = "COMMON";
- };
-
- avidemux_settings = buildPlugin {
- pluginName = "settings";
- pluginUi = "SETTINGS";
+ meta = with stdenv.lib; {
+ homepage = http://fixounet.free.fr/avidemux/;
+ description = "Free video editor designed for simple video editing tasks";
+ maintainers = with maintainers; [ viric abbradar ma27 ];
+ # "CPU not supported" errors on AArch64
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/video/avidemux/wrapper.nix b/pkgs/applications/video/avidemux/wrapper.nix
deleted file mode 100644
index 7f05b81baec7..000000000000
--- a/pkgs/applications/video/avidemux/wrapper.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ symlinkJoin, avidemux_unwrapped, makeWrapper
-# GTK version is broken upstream, see https://bugzilla.redhat.com/show_bug.cgi?id=1244340
-, withUi ? "qt4"
-}:
-
-let ui = builtins.getAttr "avidemux_${withUi}" avidemux_unwrapped; in
-
-assert ui.isUi;
-
-symlinkJoin {
- name = "avidemux-${withUi}-${ui.version}";
-
- paths = [ ui avidemux_unwrapped.avidemux_common avidemux_unwrapped.avidemux_settings ];
-
- buildInputs = [ makeWrapper ];
-
- postBuild = ''
- for i in $out/bin/*; do
- wrapProgram $i --set ADM_ROOT_DIR $out
- done
- '';
-
- meta = ui.meta;
-}
diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix
index 40d9aa2f2282..e3ba331e437a 100644
--- a/pkgs/applications/video/bombono/default.nix
+++ b/pkgs/applications/video/bombono/default.nix
@@ -1,7 +1,12 @@
{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons,
mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg,
-enca, pkgconfig }:
+enca, pkgconfig, fetchpatch }:
+let fetchPatchFromAur = {name, sha256}:
+fetchpatch {
+ inherit name sha256;
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
+}; in
stdenv.mkDerivation rec {
name = "bombono-${version}";
version = "1.2.4";
@@ -12,6 +17,17 @@ stdenv.mkDerivation rec {
sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9";
};
+ patches = map fetchPatchFromAur [
+ {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
+ {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
+ {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
+ {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
+ {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
+ {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
+ {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
+ {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
+ ];
+
nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
buildInputs = [
@@ -20,9 +36,11 @@ stdenv.mkDerivation rec {
];
buildPhase = ''
- scons PREFIX=$out
+ scons PREFIX=$out -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
'';
+ enableParallelBuilding = true;
+
installPhase = ''
scons install
'';
@@ -31,5 +49,6 @@ stdenv.mkDerivation rec {
description = "a DVD authoring program for personal computers";
homepage = "http://www.bombono.org/";
license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ symphorien ];
};
}
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index a9e2654f731b..671d67946354 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which
-, libX11, libxcb, mesa
+, libX11, libxcb, libGLU_combined
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
, libchardet
, ffmpeg
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib;
[ libX11
libxcb
- mesa
+ libGLU_combined
qtbase
qtx11extras
qtdeclarative
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index b00aae61d36d..ea8cb5aa3ffa 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ which gnome3.gnome_common glib intltool libtool cairo gtk3 xorg.xwininfo ]
+ buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ]
++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]);
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 21b3f5577765..4adbdbdadb2a 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -50,11 +50,9 @@ stdenv.mkDerivation {
fontconfig intltool
];
- # Note: the build may fail with e.g.:
- # CXX edl.o
+ # $ make -C cinelerra edl.o
# edl.C:50:25: fatal error: versioninfo.h: No such file or directory
- # #include "versioninfo.h"
- enableParallelBuilding = true;
+ enableParallelBuilding = false;
meta = {
description = "Video Editor";
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 69f58fe94bd8..e9f172aad76e 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -49,6 +49,5 @@ stdenv.mkDerivation rec {
homepage = https://clipgrab.org/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index e59469c704cb..f89aa04e0146 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
name = "dvdstyler-${version}";
srcName = "DVDStyler-${version}";
- version = "3.0.3";
+ version = "3.0.4";
src = fetchurl {
url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2";
- sha256 = "1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q";
+ sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi";
};
nativeBuildInputs =
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index ba72e085bf7c..fd8cc8d86306 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -1,20 +1,33 @@
-{stdenv, fetchurl, pkgconfig, glib, gtk2, dbus, dbus_glib, GConf}:
+{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib
+, libnotify, libpulseaudio, mplayer, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "gnome-mplayer-1.0.4";
+ name = "gnome-mplayer-${version}";
+ version = "1.0.9";
- src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz";
- sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2";
+ src = fetchFromGitHub {
+ owner = "kdekorte";
+ repo = "gnome-mplayer";
+ rev = "v${version}";
+ sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib gtk2 dbus dbus_glib GConf];
+ nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ];
+ buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ];
- hardeningDisable = [ "format" ];
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ mencoder = "${mplayer}/bin/mencoder";
+ mplayer = "${mplayer}/bin/mplayer";
+ })
+ ];
- meta = {
- homepage = http://kdekorte.googlepages.com/gnomemplayer;
+ meta = with stdenv.lib; {
description = "Gnome MPlayer, a simple GUI for MPlayer";
+ homepage = https://sites.google.com/site/kdekorte2/gnomemplayer;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/applications/video/gnome-mplayer/fix-paths.patch
new file mode 100644
index 000000000000..ede4991c4662
--- /dev/null
+++ b/pkgs/applications/video/gnome-mplayer/fix-paths.patch
@@ -0,0 +1,87 @@
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -7470,7 +7470,7 @@
+ filename = g_strdup_printf("%s/00000001.jpg", dirname);
+ g_free(basepath);
+ // run mplayer and try to get the first frame and convert it to a jpeg
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ av[ac++] = g_strdup_printf("-vo");
+ av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname);
+ av[ac++] = g_strdup_printf("-ao");
+--- a/src/property_page_common.c
++++ b/src/property_page_common.c
+@@ -80,7 +80,7 @@
+ MetaData *ret;
+ ret = g_new0(MetaData, 1);
+
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ av[ac++] = g_strdup_printf("-vo");
+ av[ac++] = g_strdup_printf("null");
+ av[ac++] = g_strdup_printf("-ao");
+--- a/src/support.c
++++ b/src/support.c
+@@ -566,7 +566,7 @@
+ } else {
+ playlist = FALSE;
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
+@@ -728,7 +728,7 @@
+ playlist = FALSE;
+ // run mplayer and try to get the first frame and convert it to a jpeg
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
+@@ -825,7 +825,7 @@
+ playlist = FALSE;
+
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
+@@ -1251,7 +1251,7 @@
+ gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name);
+
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
+@@ -1532,7 +1532,7 @@
+ return 0;
+
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
+@@ -1597,7 +1597,7 @@
+
+ if (control_id == 0) {
+ ac = 0;
+- av[ac++] = g_strdup_printf("mencoder");
++ av[ac++] = g_strdup_printf("@mencoder@");
+ av[ac++] = g_strdup_printf("-ovc");
+ av[ac++] = g_strdup_printf("copy");
+ av[ac++] = g_strdup_printf("-oac");
+@@ -2830,7 +2830,7 @@
+ gboolean ret = TRUE;
+
+ if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
+- av[ac++] = g_strdup_printf("mplayer");
++ av[ac++] = g_strdup_printf("@mplayer@");
+ } else {
+ av[ac++] = g_strdup_printf("%s", mplayer_bin);
+ }
diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix
index c93510cb1a70..1bb77ffc4a80 100644
--- a/pkgs/applications/video/gnome-mpv/default.nix
+++ b/pkgs/applications/video/gnome-mpv/default.nix
@@ -1,24 +1,30 @@
-{ stdenv, fetchurl
-, intltool, pkgconfig, wrapGAppsHook
+{ stdenv, fetchFromGitHub, meson, ninja
+, gettext, pkgconfig, desktop-file-utils, wrapGAppsHook
, appstream-glib, epoxy, glib, gtk3, mpv
}:
stdenv.mkDerivation rec {
name = "gnome-mpv-${version}";
- version = "0.9";
+ version = "0.13";
- src = fetchurl {
- sha256 = "06pgxl6f3kkgxv8nlmyl7gy3pg55sqf8vgr8m6426mlpm4p3qdn0";
- url = "https://github.com/gnome-mpv/gnome-mpv/releases/download/v${version}/${name}.tar.xz";
+ src = fetchFromGitHub {
+ owner = "gnome-mpv";
+ repo = "gnome-mpv";
+ rev = "0d73b33d60050fd32bf8fae77d831548970a0b69"; # upstream forgot to update appdata
+ # rev = "v${version}";
+ sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4";
};
- nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
- buildInputs = [ appstream-glib epoxy glib.dev gtk3 mpv ];
-
- NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+ nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ];
+ buildInputs = [ epoxy glib gtk3 mpv ];
enableParallelBuilding = true;
+ postPatch = ''
+ patchShebangs .
+ sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
+ '';
+
doCheck = true;
meta = with stdenv.lib; {
@@ -31,6 +37,5 @@ stdenv.mkDerivation rec {
homepage = https://github.com/gnome-mpv/gnome-mpv;
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 7d0cfb455306..3e796275907c 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -16,9 +16,9 @@
libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,
lame, ffmpeg, libdvdread, libdvdnav, libbluray,
mp4v2, mpeg2dec, x264, x265, libmkv,
- fontconfig, freetype, hicolor_icon_theme,
+ fontconfig, freetype, hicolor-icon-theme,
glib, gtk3, intltool, libnotify,
- gst_all_1, dbus_glib, udev, libgudev, libvpx,
+ gst_all_1, dbus-glib, udev, libgudev, libvpx,
useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null
}:
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx
] ++ (lib.optionals useGtk [
glib gtk3 libappindicator-gtk3 libnotify
- gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev
+ gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
libgudev
]);
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index 8653305f908a..b67c4a43cf56 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection
-, gtk3, libwnck3, keybinder, intltool, libcanberra_gtk2 }:
+, gtk3, libwnck3, keybinder, intltool, libcanberra-gtk2 }:
python3Packages.buildPythonApplication rec {
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
patches = [ ./datadir.patch ./bug_1190693.patch ];
prePatch = ''
rm setup.cfg
- substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra_gtk2}/bin/canberra-gtk-play"
+ substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra-gtk2}/bin/canberra-gtk-play"
'';
# no tests
@@ -42,9 +42,9 @@ python3Packages.buildPythonApplication rec {
meta = with stdenv.lib; {
- description = "Cross-platform, Friend-2-Friend and secure decentralised communication platform";
+ description = "A screencasting program created with design in mind";
homepage = https://code.launchpad.net/kazam;
- #license = licenses.bsd2;
+ license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = [ maintainers.domenkozar ];
};
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index da90f681f7a8..8a40912a1d68 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -8,8 +8,7 @@
, libXt, libXmu, libXext, xextproto
, libXinerama, libXrandr, randrproto
, libXtst, libXfixes, fixesproto, systemd
-, SDL, SDL2, SDL_image, SDL_mixer, alsaLib
-, mesa, glew, fontconfig, freetype, ftgl
+, alsaLib, libGLU_combined, glew, fontconfig, freetype, ftgl
, libjpeg, jasper, libpng, libtiff
, libmpeg2, libsamplerate, libmad
, libogg, libvorbis, flac, libxslt
@@ -19,7 +18,7 @@
, libcec, libcec_platform, dcadec, libuuid
, libcrossguid, libmicrohttpd
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
-, libplist, p11_kit, zlib
+, libplist, p11-kit, zlib
, dbusSupport ? true, dbus_libs ? null
, joystickSupport ? true, cwiid ? null
, nfsSupport ? true, libnfs ? null
@@ -44,6 +43,7 @@ assert vdpauSupport -> libvdpau != null;
# - cmake is no longer in project/cmake
# - maybe we can remove auto{conf,make} and libtool from inputs
# - check if dbus support PR has been merged and add dbus as a buildInput
+# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches)
let
kodiReleaseDate = "20171115";
@@ -78,7 +78,8 @@ let
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
'';
- buildInputs = [ gnutls libidn libtasn1 p11_kit zlib ];
+ buildInputs = [ gnutls libidn libtasn1 p11-kit zlib libva ]
+ ++ lib.optional vdpauSupport libvdpau;
nativeBuildInputs = [ cmake nasm pkgconfig ];
};
@@ -117,20 +118,19 @@ in stdenv.mkDerivation rec {
src = kodi_src;
buildInputs = [
- gnutls libidn libtasn1 nasm p11_kit
+ gnutls libidn libtasn1 nasm p11-kit
libxml2 yasm python2
boost libmicrohttpd
gettext pcre-cpp yajl fribidi libva
openssl gperf tinyxml2 taglib libssh swig jre
libX11 xproto inputproto libXt libXmu libXext xextproto
libXinerama libXrandr randrproto libXtst libXfixes fixesproto
- SDL SDL_image SDL_mixer alsaLib
- mesa glew fontconfig freetype ftgl
- libjpeg jasper libpng libtiff libva wayland
+ alsaLib libGLU_combined glew fontconfig freetype ftgl
+ libjpeg jasper libpng libtiff wayland
libmpeg2 libsamplerate libmad
libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray
- sqlite mysql.lib avahi lame
+ sqlite mysql.connector-c avahi lame
curl bzip2 zip unzip glxinfo xdpyinfo
libcec libcec_platform dcadec libuuid
libgcrypt libgpgerror libunistring
@@ -140,7 +140,7 @@ in stdenv.mkDerivation rec {
# libdvdcss libdvdnav libdvdread
]
++ lib.optional dbusSupport dbus_libs
- ++ lib.optionals joystickSupport [ cwiid SDL2 ]
+ ++ lib.optionals joystickSupport [ cwiid ]
++ lib.optional nfsSupport libnfs
++ lib.optional pulseSupport libpulseaudio
++ lib.optional rtmpSupport rtmpdump
@@ -189,7 +189,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/$p \
--prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
- [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}"
+ [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ]}"
done
substituteInPlace $out/share/xsessions/kodi.desktop \
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index e98500f8e76c..6bcba1e927f9 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -149,14 +149,14 @@ rec {
joystick = mkKodiABIPlugin rec {
namespace = "peripheral.joystick";
- version = "1.3.6";
+ version = "1.3.2";
plugin = namespace;
src = fetchFromGitHub {
owner = "kodi-game";
repo = namespace;
- rev = "5b480ccdd4a87f2ca3283a7b8d1bd69a114af0db";
- sha256 = "1zf5zwghx96bqk7bx53qra27lfbgfdi1dsk4s3hwixr8ii72cqpp";
+ rev = "96171dd32899553ffe8fc775fca66e8df5ff5cf1";
+ sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh";
};
meta = with stdenv.lib; {
@@ -264,7 +264,7 @@ rec {
meta = with stdenv.lib; {
homepage = https://forum.kodi.tv/showthread.php?tid=187421;
- descritpion = "A comic book reader";
+ description = "A comic book reader";
maintainers = with maintainers; [ edwtjo ];
};
};
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 9c6a49c55136..d0376ca7e3de 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv
-, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, mesa_glu
+, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
, nvidia_cg_toolkit, zlib, openssl, portaudio
}:
let
@@ -11,7 +11,7 @@ let
libjpeg_original
glib
gnome2.pango
- mesa_glu
+ libGLU
nvidia_cg_toolkit
zlib
openssl
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index ae7625d1972a..a4b08e1ce47c 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -1,26 +1,26 @@
{ stdenv, fetchurl
-, openssl, qt4, mesa, zlib, pkgconfig, libav
+, openssl, qt4, libGLU_combined, zlib, pkgconfig, libav
}:
stdenv.mkDerivation rec {
name = "makemkv-${ver}";
- ver = "1.10.7";
+ ver = "1.10.8";
builder = ./builder.sh;
src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
- sha256 = "2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac";
+ sha256 = "b7861aa7b03203f50d2ce3130f805c4b0406d13aec597648050349fa8b084b29";
};
src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
- sha256 = "be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654";
+ sha256 = "d17cfd916a9bdda35b1065bce86a48a987caf9ffb4d6861609458f9f312603c7";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [openssl qt4 mesa zlib libav];
+ buildInputs = [openssl qt4 libGLU_combined zlib libav];
- libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl mesa qt4 zlib ]
+ libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt4 zlib ]
+ ":" + stdenv.cc.cc + "/lib64";
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index f70c142ab41d..8b94204cd627 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -33,9 +33,8 @@ stdenv.mkDerivation rec {
you an endless video stream. Minitube is not about cloning the YouTube
website, it aims to create a new TV-like experience.
'';
- homepage = http://flavio.tordini.org/minitube;
+ homepage = https://flavio.tordini.org/minitube;
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 3a297abb15c4..b3cfe21b7d69 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig
, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk24x-gtk2, libsoup
, taglib, sqlite
-, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
+, libtorrentRasterbar, glib-networking, gsettings-desktop-schemas
, gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg
, enableBonjour ? false, avahi ? null
}:
@@ -65,13 +65,13 @@ in buildPythonApplication rec {
mv "$out/bin/miro.real" "$out/bin/miro"
wrapProgram "$out/bin/miro" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
- --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
'';
buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [
pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk24x-gtk2 libsoup
- taglib gsettings_desktop_schemas sqlite
+ taglib gsettings-desktop-schemas sqlite
];
propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix
index 2c5d3d365c12..2d5d2d3b102c 100644
--- a/pkgs/applications/video/mkcast/default.nix
+++ b/pkgs/applications/video/mkcast/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
postInstall = ''
for f in $out/bin/*; do #*/
- wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin"
+ wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome-terminal ]}:$out/bin"
done
rm -r screenkey/.bzr
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 183722beed81..7afc3b502ad5 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -1,32 +1,36 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libiconv
-, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost
-, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt
+{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv
+, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost
+, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark
, withGUI ? true
+ , qtbase ? null
+ , qtmultimedia ? null
}:
-assert withGUI -> qt5 != null;
+assert withGUI -> qtbase != null && qtmultimedia != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
- version = "17.0.0";
+ version = "21.0.0";
- src = fetchFromGitHub {
- owner = "mbunkus";
- repo = "mkvtoolnix";
- rev = "release-${version}";
- sha256 = "1v74rxf9wm0sn2illy0hp36hpwz7q04y0k32wq6wn7qrnzkzcc88";
+ src = fetchFromGitLab {
+ owner = "mbunkus";
+ repo = "mkvtoolnix";
+ rev = "release-${version}";
+ sha256 = "06nixp0qqa6g2fv40f7l0i0sqbc7qswpgq4534l98nan08wjbk2r";
};
- nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];
+ nativeBuildInputs = [
+ pkgconfig autoconf automake gettext
+ drake ruby docbook_xsl libxslt
+ ];
buildInputs = [
- expat file xdg_utils boost libebml zlib libmatroska libogg
- libvorbis flac
- ]
- ++ optional stdenv.isDarwin libiconv
- ++ optionals withGUI [qt5.qtbase qt5.qtmultimedia];
+ expat file xdg_utils boost libebml zlib
+ libmatroska libogg libvorbis flac cmark
+ ] ++ optional stdenv.isDarwin libiconv
+ ++ optionals withGUI [ qtbase qtmultimedia ];
preConfigure = "./autogen.sh; patchShebangs .";
buildPhase = "drake -j $NIX_BUILD_CORES";
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index d52154887071..67c91168fa2d 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -2,15 +2,18 @@
stdenv.mkDerivation rec {
name = "motion-${version}";
- version = "4.0.1";
+ version = "4.1.1";
+
src = fetchFromGitHub {
owner = "Motion-Project";
repo = "motion";
rev = "release-${version}";
- sha256 = "172bn2ny5r9fcb4kn9bjq3znpgl8ai84w4b99vhk5jggp2haa3bb";
+ sha256 = "1prbgl9wb9q7igsb6n11c25m0p0z246fxr1q8n1vcjr4rcb65y38";
};
+
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libjpeg ffmpeg ];
+
meta = with stdenv.lib; {
homepage = http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome;
description = "Monitors the video signal from cameras";
diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
new file mode 100644
index 000000000000..80ca213c06c1
--- /dev/null
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }:
+
+stdenv.mkDerivation rec {
+ name = "mpc-qt-${version}";
+ version = "17.11";
+
+ src = fetchFromGitHub {
+ owner = "cmdrkotori";
+ repo = "mpc-qt";
+ rev = "v${version}";
+ sha256 = "1vi4zsmbzxj6ms8wls9zv15vrskdrhgnj6l41m1fk4scs4jzvbkm";
+ };
+
+ nativeBuildInputs = [ pkgconfig qmake qttools ];
+
+ buildInputs = [ mpv qtx11extras ];
+
+ qmakeFlags = [ "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" ];
+
+ meta = with stdenv.lib; {
+ description = "Media Player Classic Qute Theater";
+ homepage = https://github.com/cmdrkotori/mpc-qt;
+ license = licenses.gpl2;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 24c5b4335c46..f2d40c2ac808 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, mesa ? null
+, x11Support ? true, libX11 ? null, libXext ? null, libGLU_combined ? 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 && mesa != null);
+assert x11Support -> (libX11 != null && libXext != null && libGLU_combined != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
assert alsaSupport -> alsaLib != null;
@@ -102,13 +102,14 @@ stdenv.mkDerivation rec {
rm -rf ffmpeg
'';
- nativeBuildInputs = [ buildPackages.stdenv.cc pkgconfig yasm ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ pkgconfig yasm ];
buildInputs = with stdenv.lib;
[ freetype ffmpeg ]
++ optional aalibSupport aalib
++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi
- ++ optionals x11Support [ libX11 libXext mesa ]
+ ++ optionals x11Support [ libX11 libXext libGLU_combined ]
++ 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 680cad1ec252..6723c9dfe1ff 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg
, freefont_ttf, freetype, libass, libpthreadstubs
-, lua, lua5_sockets, libuchardet, libiconv ? null, darwin
+, lua, luasocket, libuchardet, libiconv ? null, darwin
, x11Support ? true,
- mesa ? null,
+ libGLU_combined ? null,
libX11 ? null,
libXext ? null,
libXxf86vm ? null
@@ -13,25 +13,25 @@
wayland ? null,
libxkbcommon ? null
-, rubberbandSupport ? !stdenv.isDarwin, rubberband ? null
+, rubberbandSupport ? true, rubberband ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, sdl2Support ? true, SDL2 ? null
-, alsaSupport ? !stdenv.isDarwin, alsaLib ? null
+, alsaSupport ? true, alsaLib ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, vdpauSupport ? true, libvdpau ? null
-, dvdreadSupport ? !stdenv.isDarwin, libdvdread ? null
-, dvdnavSupport ? dvdreadSupport, libdvdnav ? null
+, dvdreadSupport ? true, libdvdread ? null
+, dvdnavSupport ? true, libdvdnav ? null
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
-, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
+, pulseSupport ? true, libpulseaudio ? null
, bs2bSupport ? true, libbs2b ? null
, cacaSupport ? true, libcaca ? null
, libpngSupport ? true, libpng ? null
, youtubeSupport ? true, youtube-dl ? null
, vaapiSupport ? true, libva ? null
-, drmSupport ? !stdenv.isDarwin, libdrm ? null
+, drmSupport ? true, libdrm ? null
, vapoursynthSupport ? false, vapoursynth ? null
, archiveSupport ? false, libarchive ? null
, jackaudioSupport ? false, libjack2 ? null
@@ -45,7 +45,7 @@ with stdenv.lib;
let
available = x: x != null;
in
-assert x11Support -> all available [mesa libX11 libXext libXxf86vm];
+assert x11Support -> all available [libGLU_combined libX11 libXext libXxf86vm];
assert waylandSupport -> all available [wayland libxkbcommon];
assert rubberbandSupport -> available rubberband;
assert xineramaSupport -> x11Support && available libXinerama;
@@ -73,24 +73,31 @@ assert drmSupport -> available libdrm;
let
# Purity: Waf is normally downloaded by bootstrap.py, but
# for purity reasons this behavior should be avoided.
- wafVersion = "1.9.8";
+ wafVersion = "1.9.15";
waf = fetchurl {
urls = [ "http://waf.io/waf-${wafVersion}"
"http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ];
- sha256 = "1gsd3zza1wixv2vhvq3inp4vb71i41a1kbwqnwixhnvdmcmw8z8n";
+ sha256 = "0qrnlv91cb0v221w8a0fi4wxm99q2hpz10rkyyk4akcsvww6xrw5";
};
in stdenv.mkDerivation rec {
name = "mpv-${version}";
- version = "0.27.0";
+ version = "0.27.2";
src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
- sha256 = "0746kmsg69675y5c70vn8imcr9d1zpjz97f27xr1vx00yjpd518v";
+ sha256 = "1ivyyqajkxq5c1zxp0dm7pljvianhgvwl3dbghgpzyrch59k5wnr";
};
- patchPhase = ''
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch";
+ sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb";
+ })
+ ];
+
+ postPatch = ''
patchShebangs ./TOOLS/
'';
@@ -115,14 +122,15 @@ in stdenv.mkDerivation rec {
python3 ${waf} configure --prefix=$out $configureFlags
'';
- nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ];
+ nativeBuildInputs = [
+ docutils makeWrapper perl
+ pkgconfig python3 which
+ ];
buildInputs = [
ffmpeg freetype libass libpthreadstubs
- lua lua5_sockets libuchardet
- ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
- libiconv Cocoa CoreAudio ])
- ++ optional alsaSupport alsaLib
+ lua luasocket libuchardet
+ ] ++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional xineramaSupport libXinerama
@@ -144,8 +152,11 @@ in stdenv.mkDerivation rec {
++ optional vapoursynthSupport vapoursynth
++ optional archiveSupport libarchive
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
- ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
- ++ optionals waylandSupport [ wayland libxkbcommon ];
+ ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm ]
+ ++ optionals waylandSupport [ wayland libxkbcommon ]
+ ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ libiconv Cocoa CoreAudio
+ ]);
enableParallelBuilding = true;
@@ -153,7 +164,14 @@ in stdenv.mkDerivation rec {
python3 ${waf} build
'';
- installPhase = ''
+ installPhase =
+ let
+ getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" +
+ "${luasocket}/share/lua/${lua.luaversion}/?.${type}";
+ luaPath = getPath "lua";
+ luaCPath = getPath "so";
+ in
+ ''
python3 ${waf} install
# Use a standard font
@@ -162,10 +180,12 @@ in stdenv.mkDerivation rec {
# Ensure youtube-dl is available in $PATH for MPV
wrapProgram $out/bin/mpv \
--add-flags "--scripts=${concatStringsSep "," scripts}" \
+ --prefix LUA_PATH : "${luaPath}" \
+ --prefix LUA_CPATH : "${luaCPath}" \
'' + optionalString youtubeSupport ''
--prefix PATH : "${youtube-dl}/bin" \
'' + optionalString vapoursynthSupport ''
- --prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH"
+ --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH"
'' + ''
cp TOOLS/umpv $out/bin
@@ -187,5 +207,3 @@ in stdenv.mkDerivation rec {
'';
};
}
-# TODO: investigate caca support
-# TODO: investigate lua5_sockets bug
diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix
index d8f18f97ad9a..faa21326fc0e 100644
--- a/pkgs/applications/video/mpv/scripts/convert.nix
+++ b/pkgs/applications/video/mpv/scripts/convert.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, lib
-, yad, mkvtoolnix, libnotify }:
+, yad, mkvtoolnix-cli, libnotify }:
stdenv.mkDerivation {
name = "mpv-convert-script-2016-03-18.lua";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
substituteInPlace convert_script.lua \
${subs "NOTIFY_CMD" "notify-send" "${libnotify}/bin/notify-send"} \
${subs "YAD_CMD" "yad" "${yad}/bin/yad"} \
- ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix}/bin/mkvmerge"}
+ ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix-cli}/bin/mkvmerge"}
'';
dontBuild = true;
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
meta = {
description = "Convert parts of a video while you are watching it in mpv";
homepage = https://gist.github.com/Zehkul/25ea7ae77b30af959be0;
- maintainers = [ lib.maintainers.profpatsch ];
+ maintainers = [ lib.maintainers.Profpatsch ];
longDescription = ''
When this script is loaded into mpv, you can hit Alt+W to mark the beginning
and Alt+W again to mark the end of the clip. Then a settings window opens.
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 71bb0405111c..6f7ebb8c20af 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec
-, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig
+, lame, zlib, libGLU_combined, alsaLib, freetype, perl, pkgconfig
, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
, yasm, libuuid, taglib, libtool, autoconf, automake, file
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sourceRoot = "${name}/mythtv";
buildInputs = [
- freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec
+ freetype qt4 lame zlib xlibsWrapper libGLU_combined perl alsaLib libpulseaudio fftwSinglePrec
libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
libuuid taglib
];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = https://www.mythtv.org/;
description = "Open Source DVR";
license = licenses.gpl2;
- meta.platforms = platforms.linux;
+ platforms = platforms.linux;
maintainers = [ maintainers.titanous ];
};
}
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 518cd3d94bac..1eb725d10bbc 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages,
cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio,
- qmake4Hook, libpng, mesa_noglu, lndir }:
+ qmake4Hook, libpng, libGL, lndir }:
let
minorVersion = "2.1";
@@ -68,7 +68,7 @@ let
sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu
+ libpng ffmpeg openexr opencolorio openimageio boost libGL
seexpr
];
})
@@ -76,7 +76,7 @@ let
pluginName = "misc";
sha256 = "02h79jrll0c17azxj16as1mks3lmypm4m3da4mms9sg31l3n82qi";
buildInputs = [
- mesa_noglu
+ libGL
];
preConfigure = ''
cp ${CImgh} CImg/CImg.h
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 5d82a8c5d096..a3ed28c3fd0a 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -29,13 +29,13 @@ let
optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
name = "obs-studio-${version}";
- version = "20.1.0";
+ version = "21.0.3";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = "${version}";
- sha256 = "1366nl301rhz8cfbq89ixiq1hdxdn8iimz9xyln274anghz02sbr";
+ sha256 = "1mrihhzlsc66w5lr1lcm8c8jg6z0iwmmckr3pk3gk92z4s55969q";
};
patches = [ ./find-xcb.patch ];
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/obs \
- --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib"
+ --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix
index 83e69495b03a..221f4fc0e5c3 100644
--- a/pkgs/applications/video/ogmtools/default.nix
+++ b/pkgs/applications/video/ogmtools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "ogmtools-1.5";
src = fetchurl {
- url = "http://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2";
+ url = "https://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2";
sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8";
};
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
(ogmdemux) or creation of (ogmmerge) OGG media streams. Includes dvdxchap
tool for extracting chapter information from DVD.
'';
- homepage = http://www.bunkus.org/videotools/ogmtools/;
+ homepage = https://www.bunkus.org/videotools/ogmtools/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix
index 29345f7548d5..825bfe7955a8 100644
--- a/pkgs/applications/video/omxplayer/default.nix
+++ b/pkgs/applications/video/omxplayer/default.nix
@@ -49,7 +49,7 @@ let
crossAttrs = {
configurePlatforms = [];
configureFlags = configureFlags ++ [
- "--cross-prefix=${stdenv.cc.prefix}"
+ "--cross-prefix=${stdenv.cc.targetPrefix}"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${hostPlatform.arch}"
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 86b8dab7f1f2..aa9643416485 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -4,13 +4,13 @@
python3Packages.buildPythonApplication rec {
name = "openshot-qt-${version}";
- version = "2.3.4";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "openshot-qt";
rev = "v${version}";
- sha256 = "026zxvg5mij49g021hipv3hspsx8m5bs4v9pm2axqw6rvszjk90z";
+ sha256 = "182dldj9ybs6aqjfrc9dqx1mifdyhv0rf3ifxcp52cm9rz5yv8ml";
};
nativeBuildInputs = [ doxygen wrapGAppsHook ];
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 02a19c935e73..f84e2e83761a 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -8,13 +8,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libopenshot-${version}";
- version = "0.1.7";
+ version = "0.1.9";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot";
rev = "v${version}";
- sha256 = "1dk40qild8d3s99p2kkm0mjvxfxrz2wns7ij1brzqmcdnaxqdhlp";
+ sha256 = "0c7q5cfnp481ysyvgzznvix7j4licq9knwrb83g3xqs4cx573xr3";
};
patchPhase = ''
diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix
new file mode 100644
index 000000000000..9858edf82389
--- /dev/null
+++ b/pkgs/applications/video/peek/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook
+, gsettings-desktop-schemas, gtk3, keybinder3
+}:
+
+stdenv.mkDerivation rec {
+ name = "peek-${version}";
+ version = "1.2.2";
+
+ src = fetchFromGitHub {
+ owner = "phw";
+ repo = "peek";
+ rev = version;
+ sha256 = "1ihmq914g2h5iw86bigkkblzqimr50yq6z883lzq656xkcayd8gh";
+ };
+
+ nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ];
+
+ buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/phw/peek;
+ description = "Simple animated GIF screen recorder with an easy to use interface";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ puffnfresh ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index c4d80344080d..48074a86b552 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook
-, python3Packages, gst, gtk3, hicolor_icon_theme
+, python3Packages, gst, gtk3, hicolor-icon-theme
, gobjectIntrospection, librsvg, gnome3, libnotify
# for gst-transcoder:
, which, meson, ninja
@@ -34,9 +34,9 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
buildInputs = [
- gobjectIntrospection gtk3 librsvg gnome3.gnome_desktop
+ gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop
gnome3.defaultIconTheme
- gnome3.gsettings_desktop_schemas libnotify
+ gnome3.gsettings-desktop-schemas libnotify
gst-transcoder
] ++ (with gst; [
gstreamer gst-editing-services
diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix
new file mode 100644
index 000000000000..13f93800f6e2
--- /dev/null
+++ b/pkgs/applications/video/qmediathekview/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ pname = "QMediathekView";
+ version = "2017-04-16";
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "adamreichold";
+ repo = pname;
+ rev = "8c69892b95bf6825bd06a8c594168a98fe7cb2d1";
+ sha256 = "1wca1w4iywd3hmiwcqx6fv79p3x5n1cgbw2liw3hs24ch3z54ckm";
+ };
+
+ postPatch = ''
+ substituteInPlace ${pname}.pro \
+ --replace /usr ""
+ '';
+
+ buildInputs = [ qtbase qttools xz boost ];
+
+ nativeBuildInputs = [ qmake pkgconfig ];
+
+ installFlags = [ "INSTALL_ROOT=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "An alternative Qt-based front-end for the database maintained by the MediathekView project";
+ inherit (src.meta) homepage;
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index 8b2a69acfcc8..c3204cc9c0ce 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
homepage = http://quvi.sf.net;
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.mornfall ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index 6f4e60913390..603534be4c8b 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
homepage = http://quvi.sf.net;
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.mornfall ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index 3f99258737c2..333f4e6ab4de 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = http://quvi.sf.net;
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.mornfall ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix
new file mode 100644
index 000000000000..5638fad39e5d
--- /dev/null
+++ b/pkgs/applications/video/screenkey/default.nix
@@ -0,0 +1,60 @@
+{ lib
+, substituteAll
+, buildPythonApplication
+, fetchFromGitHub
+, distutils_extra
+, setuptools-git
+, intltool
+, pygtk
+, libX11
+, libXtst
+, wrapGAppsHook
+, defaultIconTheme
+, hicolor_icon_theme
+}:
+buildPythonApplication rec {
+ pname = "screenkey";
+ version = "0.9";
+
+ src = fetchFromGitHub {
+ owner = "wavexx";
+ repo = "screenkey";
+ rev = "screenkey-${version}";
+ sha256 = "14g7fiv9n7m03djwz1pp5034pffi87ssvss9bc1q8vq0ksn23vrw";
+ };
+
+ patches = [
+ (substituteAll {
+ src = ./paths.patch;
+ inherit libX11 libXtst;
+ })
+ ];
+
+ nativeBuildInputs = [
+ distutils_extra
+ setuptools-git
+ intltool
+
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ defaultIconTheme
+ hicolor_icon_theme
+ ];
+
+ propagatedBuildInputs = [
+ pygtk
+ ];
+
+ # screenkey does not have any tests
+ doCheck = false;
+
+ meta = with lib; {
+ homepage = https://www.thregr.org/~wavexx/software/screenkey/;
+ description = "A screencast tool to display your keys inspired by Screenflick";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.rasendubi ];
+ };
+}
diff --git a/pkgs/applications/video/screenkey/paths.patch b/pkgs/applications/video/screenkey/paths.patch
new file mode 100644
index 000000000000..7e5ed47fc19d
--- /dev/null
+++ b/pkgs/applications/video/screenkey/paths.patch
@@ -0,0 +1,20 @@
+--- a/Screenkey/xlib.py
++++ b/Screenkey/xlib.py
+@@ -6,7 +6,7 @@
+ from ctypes import *
+
+ ## base X11
+-libX11 = CDLL('libX11.so.6')
++libX11 = CDLL('@libX11@/lib/libX11.so.6')
+
+ # types
+ Atom = c_ulong
+@@ -278,7 +278,7 @@
+
+
+ ## record extensions
+-libXtst = CDLL('libXtst.so.6')
++libXtst = CDLL('@libXtst@/lib/libXtst.so.6')
+
+ # types
+ XPointer = String
\ No newline at end of file
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 447518d008b4..5b9ae0119039 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -1,22 +1,19 @@
{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext
-, libXfixes, mesa, pkgconfig, libpulseaudio, qt4
+, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qt4, cmake, ninja
}:
stdenv.mkDerivation rec {
name = "simplescreenrecorder-${version}";
- version = "0.3.8";
+ version = "0.3.9";
src = fetchurl {
url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
- sha256 = "0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg";
+ sha256 = "1gnf9wbiq2fcbqcn1a5nfmp8r0nxrrlgh2wly2mfkkwymynhx0pk";
};
patches = [ ./fix-paths.patch ];
postPatch = ''
- # #455
- sed '1i#include ' -i src/Benchmark.cpp
-
for i in scripts/ssr-glinject src/AV/Input/GLInjectInput.cpp; do
substituteInPlace $i \
--subst-var out \
@@ -24,14 +21,12 @@ stdenv.mkDerivation rec {
done
'';
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa
+ nativeBuildInputs = [ pkgconfig cmake ninja ];
+ buildInputs = [
+ alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined
libpulseaudio qt4
];
- enableParallelBuilding = true;
-
meta = with stdenv.lib; {
description = "A screen recorder for Linux";
homepage = http://www.maartenbaert.be/simplescreenrecorder;
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index e7deccee0d9f..9e547a791a48 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, qmake, qtscript }:
stdenv.mkDerivation rec {
- name = "smplayer-17.9.0";
+ name = "smplayer-18.2.2";
src = fetchurl {
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
- sha256 = "0s9856cmwl829d2xc2ycf97phpv4a2d39ybmnbhsrb07jq5hkw1a";
+ sha256 = "0q0m9q643z6ih5gkf1fq3d6y99d62yxkhfgap98h251q6kd7dhis";
};
buildInputs = [ qtscript ];
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index b05887967093..406d49c99391 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, qmake, qtscript, qtwebkit }:
stdenv.mkDerivation rec {
- version = "17.5.0";
+ version = "18.1.0";
name = "smtube-${version}";
src = fetchurl {
url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
- sha256 = "13m0ll18n1da8i4r4b7gn0jjz9dgrkkyk9mpfas4rgnjw92m5jld";
+ sha256 = "1sw2b89ricxfbmgbzsp9f89n0gwh9dbnii6lr9gcccs8djpp1ad1";
};
makeFlags = [
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 9fd07febbfce..9ff54bd681f8 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,17 +1,17 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
pythonPackages.buildPythonApplication rec {
- version = "0.9.0";
+ version = "0.10.0";
name = "streamlink-${version}";
src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
rev = "${version}";
- sha256 = "11jczkar3aqsbl5amkm7lsv4fz6xdaydd5izn222wjzsbvnzrcgd";
+ sha256 = "1p9gkwcvqlnv09ihqh71nh82nnmq9ybp1v8d8kd2vhkg1vm5ximn";
};
- buildInputs = with pythonPackages; [ pytest mock ];
+ checkInputs = with pythonPackages; [ pytest mock requests-mock ];
propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client ]) ++ [ rtmpdump ffmpeg ];
diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix
new file mode 100644
index 000000000000..32bd731f16e9
--- /dev/null
+++ b/pkgs/applications/video/subdl/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, python3 }:
+
+stdenv.mkDerivation rec {
+ name = "subdl-0.0pre.2017.11.06";
+
+ src = fetchFromGitHub {
+ owner = "alexanderwink";
+ repo = "subdl";
+ rev = "4cf5789b11f0ff3f863b704b336190bf968cd471";
+ sha256 = "0kmk5ck1j49q4ww0lvas2767kwnzhkq0vdwkmjypdx5zkxz73fn8";
+ };
+
+ meta = {
+ homepage = https://github.com/alexanderwink/subdl;
+ description = "A command-line tool to download subtitles from opensubtitles.org";
+ platforms = stdenv.lib.platforms.all;
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [ stdenv.lib.maintainers.exfalso ];
+ };
+
+ buildInputs = [ python3 ];
+
+ installPhase = ''
+ install -vD subdl $out/bin/subdl
+ '';
+}
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index 88768b3cb8f6..3683973824a3 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -1,29 +1,24 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, desktop_file_utils,
- enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx,
- xdg_utils, isocodes, wrapGAppsHook
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
+ desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme,
+ libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
}:
let
- ver_maj = "0.53";
- ver_min = "0";
+ version = "0.54.0";
in
stdenv.mkDerivation rec {
- name = "subtitle-editor-${ver_maj}.${ver_min}";
+ name = "subtitleeditor-${version}";
- src = fetchurl {
- url = "http://download.gna.org/subtitleeditor/${ver_maj}/subtitleeditor-${ver_maj}.${ver_min}.tar.gz";
- sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g";
+ src = fetchFromGitHub {
+ owner = "kitone";
+ repo = "subtitleeditor";
+ rev = version;
+ sha256 = "0vxcscc9m6gymgj173ahk2g9hlk9588z5fdaavmkpyriqdlhwm11";
};
- patches = [
- (fetchpatch {
- url = "https://sources.debian.net/data/main/s/subtitleeditor/0.53.0-2/debian/patches/03-fix-build-gstreamermm-1.8.0.patch";
- sha256 = "0di2i34id5dqnd3glibhifair1kdfnv8ay3k64lirad726ardw2c";
- })
- ];
-
nativeBuildInputs = [
+ autoreconfHook
pkgconfig
intltool
file
@@ -31,7 +26,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- desktop_file_utils
+ desktop-file-utils
enchant
gnome3.gtk
gnome3.gtkmm
@@ -39,7 +34,7 @@ stdenv.mkDerivation rec {
gst_all_1.gstreamermm
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
- hicolor_icon_theme
+ hicolor-icon-theme
libsigcxx
libxmlxx
xdg_utils
@@ -48,11 +43,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- # disable check because currently making check in po fails
- doCheck = false;
-
- hardeningDisable = [ "format" ];
-
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
configureFlags = [ "--disable-debug" ];
@@ -65,9 +55,9 @@ stdenv.mkDerivation rec {
and refine existing subtitle. This program also shows sound waves, which
makes it easier to synchronise subtitles to voices.
'';
- homepage = http://home.gna.org/subtitleeditor;
+ homepage = http://kitone.github.io/subtitleeditor/;
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = [ stdenv.lib.maintainers.plcplc ];
platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.plcplc ];
};
}
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index b465379c50ed..fffbd5c0ffb4 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -21,21 +21,13 @@ assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation rec {
name = "vlc-${version}";
- version = "2.2.6";
+ version = "2.2.8";
src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
- sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4";
+ sha256 = "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v";
};
- patches = [
- (fetchpatch {
- name = "CVE-2017-9300.patch";
- url = "https://git.videolan.org/?p=vlc/vlc-2.2.git;a=patch;h=55a82442cfea9dab8b853f3a4610f2880c5fadf3;hp=dbe888f9ca9c3b102478b4a16a3d1d985c267899";
- sha256 = "0l0fwqkn31lggwc5dkhb58gkv8pc6ng51y0izjigqvfqvhwdnzxn";
- })
- ];
-
# Comment-out the Qt 5.5 version check, as we do apply the relevant patch.
# https://trac.videolan.org/vlc/ticket/16497
postPatch = if (!withQt5) then null else
diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix
index 59ba63b32eeb..2bf74da3d0f2 100644
--- a/pkgs/applications/video/w_scan/default.nix
+++ b/pkgs/applications/video/w_scan/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "w_scan-${version}";
- version = "20161022";
+ version = "20170107";
src = fetchurl {
url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2";
- sha256 = "0y8dq2sm13xn2r2lrqf5pdhr9xcnbxbg1aw3iq1szds2idzsyxr0";
+ sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q";
};
meta = {
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
new file mode 100644
index 000000000000..bb519ef3dab0
--- /dev/null
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -0,0 +1,88 @@
+{
+ alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype,
+ gdk_pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor,
+ libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
+ libxcb, nspr, nss, stdenv, udev
+}:
+
+ let
+ rpath = stdenv.lib.makeLibraryPath ([
+ alsaLib
+ atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ gnome2.GConf
+ gnome2.gtk
+ gnome2.pango
+ libX11
+ libXScrnSaver
+ libXcomposite
+ libXcursor
+ libXdamage
+ libXext
+ libXfixes
+ libXi
+ libXrandr
+ libXrender
+ libXtst
+ libxcb
+ nspr
+ nss
+ stdenv.cc.cc
+ udev
+ ]);
+ in stdenv.mkDerivation rec {
+ name = "webtorrent-desktop-${version}";
+ version = "0.19.0";
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.19.0/webtorrent-desktop_${version}-1_amd64.deb";
+ sha256 = "0v4fgvf8qgxjwg5kz30pcxl71pi9rri0l3cy20pid07rdd6r4sgd";
+ }
+ else
+ throw "Webtorrent is not currently supported on ${stdenv.system}";
+ phases = [ "unpackPhase" "installPhase" ];
+ nativeBuildInputs = [ dpkg ];
+ unpackPhase = "dpkg-deb -x $src .";
+ installPhase = ''
+ mkdir -p $out
+ cp -R opt $out
+
+ mv ./usr/share $out/share
+ mv $out/opt/webtorrent-desktop $out/libexec
+ chmod +x $out/libexec/WebTorrent
+ rmdir $out/opt
+
+ chmod -R g-w $out
+
+ # Patch WebTorrent
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath ${rpath}:$out/libexec $out/libexec/WebTorrent
+
+ # Symlink to bin
+ mkdir -p $out/bin
+ ln -s $out/libexec/WebTorrent $out/bin/WebTorrent
+
+ # Fix the desktop link
+ substituteInPlace $out/share/applications/webtorrent-desktop.desktop \
+ --replace /opt/webtorrent-desktop/WebTorrent $out/bin/WebTorrent
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Streaming torrent app for Mac, Windows, and Linux.";
+ homepage = https://webtorrent.io/desktop;
+ license = licenses.mit;
+ maintainers = [ maintainers.flokli ];
+ platforms = [
+ "x86_64-linux"
+ ];
+ };
+ }
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index b417489c14c0..5e44116415ea 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -1,5 +1,5 @@
{stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl
-, lirc, shared_mime_info, libjpeg }:
+, lirc, shared-mime-info, libjpeg }:
stdenv.mkDerivation rec {
name = "xine-ui-0.99.9";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd";
};
- nativeBuildInputs = [ pkgconfig shared_mime_info ];
+ nativeBuildInputs = [ pkgconfig shared-mime-info ];
buildInputs =
[ xineLib libpng readline ncurses curl lirc libjpeg
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index fcf569a762a7..ee4ea4346e4a 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
+{ stdenv, lib, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
let
- targetArch = if stdenv.isi686 then
- "Ia32"
+ projectDscPath = if stdenv.isi686 then
+ "OvmfPkg/OvmfPkgIa32.dsc"
else if stdenv.isx86_64 then
- "X64"
+ "OvmfPkg/OvmfPkgX64.dsc"
+ else if stdenv.isAarch64 then
+ "ArmVirtPkg/ArmVirtQemu.dsc"
else
throw "Unsupported architecture";
@@ -14,7 +16,7 @@ let
src = edk2.src;
in
-stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
+stdenv.mkDerivation (edk2.setup projectDscPath {
name = "OVMF-${version}";
inherit src;
@@ -36,28 +38,45 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
ln -sv "$file" .
done
- ${if (seabios == false) then ''
- ln -sv ${src}/OvmfPkg .
- '' else ''
+ ${if stdenv.isAarch64 then ''
+ ln -sv ${src}/ArmPkg .
+ ln -sv ${src}/ArmPlatformPkg .
+ ln -sv ${src}/ArmVirtPkg .
+ ln -sv ${src}/EmbeddedPkg .
+ ln -sv ${src}/OvmfPkg .
+ '' else if seabios != null then ''
cp -r ${src}/OvmfPkg .
chmod +w OvmfPkg/Csm/Csm16
cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
- ''}
-
- ${if (secureBoot == true) then ''
- ln -sv ${src}/SecurityPkg .
- ln -sv ${src}/CryptoPkg .
- '' else ''
- ''}
- '';
-
- buildPhase = if (seabios == false) then ''
- build ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""}
'' else ''
- build -D CSM_ENABLE -D FD_SIZE_2MB ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""}
+ ln -sv ${src}/OvmfPkg .
+ ''}
+
+ ${lib.optionalString secureBoot ''
+ ln -sv ${src}/SecurityPkg .
+ ln -sv ${src}/CryptoPkg .
+ ''}
+ '';
+
+ buildPhase = if stdenv.isAarch64 then ''
+ build -n $NIX_BUILD_CORES
+ '' else if seabios == null then ''
+ build -n $NIX_BUILD_CORES ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
+ '' else ''
+ build -n $NIX_BUILD_CORES -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
'';
- postFixup = ''
+ postFixup = if stdenv.isAarch64 then ''
+ mkdir -vp $fd/FV
+ mkdir -vp $fd/AAVMF
+ mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
+
+ # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec
+ # FIXME: why is it different from Debian dir layout? https://anonscm.debian.org/cgit/pkg-qemu/edk2.git/tree/debian/rules
+ dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=/dev/zero bs=1M count=64
+ dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=$fd/FV/QEMU_EFI.fd conv=notrunc
+ dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M count=64
+ '' else ''
mkdir -vp $OUTPUT_FD/FV
mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV
'';
@@ -68,6 +87,6 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
description = "Sample UEFI firmware for QEMU and KVM";
homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
license = stdenv.lib.licenses.bsd2;
- platforms = ["x86_64-linux" "i686-linux"];
+ platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"];
};
})
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 4ad8f0213261..f9d7128330fb 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, pkgconfig, libtool
-, gtk2, mesa, readline, libX11, libXpm
+, gtk2, libGLU_combined, 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 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
+ [ pkgconfig libtool gtk2 libGLU_combined readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
++ optionals termSupport [ ncurses ]
++ optionals sdlSupport [ SDL2 ]
++ optionals wxSupport [ wxGTK ]
diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix
index d02d78606545..e10d54148977 100644
--- a/pkgs/applications/virtualization/cbfstool/default.nix
+++ b/pkgs/applications/virtualization/cbfstool/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "cbfstool-${version}";
- version = "4.5";
+ version = "4.7";
src = fetchgit {
url = "http://review.coreboot.org/p/coreboot";
rev = "refs/tags/${version}";
- sha256 = "0sc2h440x4sfp1lqnmh3xfgymf7j0rqfx00v6jqf0svfbp8a6cq5";
+ sha256 = "02k63013vf7wgsilslj68fs1x81clvqpn91dydaqhv5aymh73zpi";
};
nativeBuildInputs = [ flex bison ];
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 3316633e4378..8f456a2a49a8 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,23 +1,38 @@
{ stdenv, lib, fetchFromGitHub, removeReferencesTo
-, go, libapparmor, apparmor-parser, libseccomp }:
+, go, libapparmor, apparmor-parser, libseccomp, btrfs-progs }:
with lib;
stdenv.mkDerivation rec {
name = "containerd-${version}";
- version = "0.2.9";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
- sha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552";
+ sha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0";
};
- buildInputs = [ removeReferencesTo go ];
+ hardeningDisable = [ "fortify" ];
+
+ buildInputs = [ removeReferencesTo go btrfs-progs ];
+ buildFlags = "VERSION=v${version}";
+
+ BUILDTAGS = []
+ ++ optional (btrfs-progs == null) "no_btrfs";
+
+ preConfigure = ''
+ # Extract the source
+ cd "$NIX_BUILD_TOP"
+ mkdir -p "go/src/github.com/containerd"
+ mv "$sourceRoot" "go/src/github.com/containerd/containerd"
+ export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
+'';
preBuild = ''
- ln -s $(pwd) vendor/src/github.com/containerd/containerd
+ cd go/src/github.com/containerd/containerd
+ patchShebangs .
'';
installPhase = ''
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2aa418f0d844..af15240dc12e 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -36,11 +36,9 @@ rec {
sha256 = containerdSha256;
};
- # This should go into the containerd derivation once 1.0.0 is out
- preBuild = ''
- mkdir $(pwd)/vendor/src
- mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/
- '' + oldAttrs.preBuild;
+ hardeningDisable = [ "fortify" ];
+
+ buildInputs = [ removeReferencesTo go btrfs-progs ];
});
docker-tini = tini.overrideAttrs (oldAttrs: rec {
@@ -90,7 +88,7 @@ rec {
buildInputs = [
makeWrapper removeReferencesTo go-md2man go libtool
] ++ optionals (stdenv.isLinux) [
- sqlite devicemapper btrfs-progs systemd libtool libseccomp
+ sqlite devicemapper btrfs-progs systemd libseccomp
];
dontStrip = true;
@@ -100,6 +98,7 @@ rec {
cd ./components/engine
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="${rev}"
+ export VERSION="${version}"
./hack/make.sh dynbinary
cd -
'') + ''
@@ -131,11 +130,7 @@ rec {
extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]);
installPhase = optionalString (stdenv.isLinux) ''
- if [ -d "./components/engine/bundles/${version}" ]; then
- install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
- else
- install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
- fi
+ install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd
makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
--prefix PATH : "$out/libexec/docker:$extraPath"
@@ -202,26 +197,26 @@ rec {
# Get revisions from
# https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
- docker_17_09 = dockerGen rec {
- version = "17.09.0-ce";
- rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit
- sha256 = "03g0imdcxqx9y4hhyymxqzvm8bqg4cqrmb7sjbxfdgrhzh9kcn1p";
- runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64";
- runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq";
- containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0";
- containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd";
+ docker_17_12 = dockerGen rec {
+ version = "17.12.1-ce";
+ rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit
+ sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i";
+ runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
+ runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
+ containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
+ containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
- docker_17_10 = dockerGen rec {
- version = "17.10.0-ce";
- rev = "f4ffd2511ce93aa9e5eefdf0e912f77543080b0b"; # git commit
- sha256 = "07x47cfdaz4lhlga1pchcbqqy0nd2q6zch0ycag18vzi99w4gmh2";
- runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d";
- runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0";
- containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0";
- containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd";
+ docker_18_02 = dockerGen rec {
+ version = "18.02.0-ce";
+ rev = "fc4de447b563498eb4da89f56fb858bbe761d91b"; # git commit
+ sha256 = "1025cwv2niiwg5pc30nb1qky1raisvd9ix2qw6rdib232hwq9k8m";
+ runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
+ runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
+ containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
+ containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index 9ca73747c459..8d5ecfce9fd2 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
stdenv.mkDerivation rec {
- name = "lkl-2017-11-10";
- rev = "52a6a643c7d1dd3031c0cbec75e1ac7a999f3d57";
+ name = "lkl-2018-03-10";
+ rev = "8772a4da6064444c5b70766b806fe272b0287c31";
outputs = [ "dev" "lib" "out" ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
inherit rev;
owner = "lkl";
repo = "linux";
- sha256 = "1i5ywrfxqpykjjalwh9g4rwd4s186cqk3j806d327a67xb2ivxnp";
+ sha256 = "1m6gh4zcx1q7rv05d0knjpk3ivk2b3kc0kwjndciadqc45kws4wh";
};
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
sed -i $out/bin/lkl-hijack.sh \
-e "s,LD_LIBRARY_PATH=.*,LD_LIBRARY_PATH=$lib/lib,"
- cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin
+ cp tools/lkl/{cptofs,fs2tar,lklfuse} $out/bin
+ ln -s cptofs $out/bin/cpfromfs
cp -r tools/lkl/include $dev/
cp tools/lkl/liblkl*.{a,so} $lib/lib
'';
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
overhead
'';
homepage = https://github.com/lkl/linux/;
- platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it
+ platforms = [ "x86_64-linux" "aarch64-linux" ]; # Darwin probably works too but I haven't tested it
license = licenses.gpl2;
maintainers = with maintainers; [ copumpkin ];
};
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
new file mode 100644
index 000000000000..bd014dd60d37
--- /dev/null
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub
+, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
+, libX11, freefont_ttf
+}:
+
+stdenv.mkDerivation rec {
+ name = "looking-glass-client-${version}";
+ version = "a10";
+
+ src = fetchFromGitHub {
+ owner = "gnif";
+ repo = "LookingGlass";
+ rev = version;
+ sha256 = "10jxnkrvskjzkg86iz3hnb5v91ykzx6pvcnpy1v4436g5f2d62wn";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [
+ SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig
+ libX11 freefont_ttf
+ ];
+
+ enableParallelBuilding = true;
+
+ sourceRoot = "source/client";
+
+ installPhase = ''
+ mkdir -p $out
+ mv bin $out/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A KVM Frame Relay (KVMFR) implementation";
+ longDescription = ''
+ Looking Glass is an open source application that allows the use of a KVM
+ (Kernel-based Virtual Machine) configured for VGA PCI Pass-through
+ without an attached physical monitor, keyboard or mouse. This is the final
+ step required to move away from dual booting with other operating systems
+ for legacy programs that require high performance graphics.
+ '';
+ homepage = https://looking-glass.hostfission.com/;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.pneumaticat ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index c7f8ea696b57..e42c1d5dd1e4 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
better management of, and seamless user interactions with, guests.
'';
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ joamaki ];
};
}
diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix
deleted file mode 100644
index 21cb4906d034..000000000000
--- a/pkgs/applications/virtualization/openstack/glance.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, python2Packages, sqlite, which, strace }:
-
-python2Packages.buildPythonApplication rec {
- name = "glance-${version}";
- version = "11.0.0";
- namePrefix = "";
-
- PBR_VERSION = "${version}";
-
- src = fetchurl {
- url = "https://github.com/openstack/glance/archive/${version}.tar.gz";
- sha256 = "05rz1lmzdmpnw8sf87vvi0l6q9g6s840z934zyinw17yfcvmqrdg";
- };
-
- # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with python2Packages; [
- pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
- httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste
- jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python
- WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile
-
- # oslo componenets
- oslo-config oslo-context oslo-concurrency oslo-service oslo-utils oslo-db
- oslo-i18n oslo-log oslo-messaging oslo-middleware oslo-policy oslo-serialization
- MySQL_python
- ];
-
- buildInputs = with python2Packages; [
- Babel coverage fixtures mox3 mock oslosphinx requests testrepository pep8
- testresources testscenarios testtools psutil_1 oslotest psycopg2
- sqlite which strace
- ];
-
- patchPhase = ''
- # it's not a test, but a class mixin
- sed -i 's/ImageCacheTestCase/ImageCacheMixin/' glance/tests/unit/test_image_cache.py
-
- # these require network access, see https://bugs.launchpad.net/glance/+bug/1508868
- sed -i 's/test_get_image_data_http/noop/' glance/tests/unit/common/scripts/test_scripts_utils.py
- sed -i 's/test_set_image_data_http/noop/' glance/tests/unit/common/scripts/image_import/test_main.py
- sed -i 's/test_create_image_with_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py
- sed -i 's/test_upload_image_http_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py
-
- # TODO: couldn't figure out why this test is failing
- sed -i 's/test_all_task_api/noop/' glance/tests/integration/v2/test_tasks_api.py
- '';
-
- postInstall = ''
- # check all binaries don't crash
- for i in $out/bin/*; do
- case "$i" in
- *glance-artifacts) # https://bugs.launchpad.net/glance/+bug/1508879
- :
- ;;
- *)
- $i --help
- esac
- done
-
- cp etc/*-paste.ini $out/etc/
- '';
-
- meta = with stdenv.lib; {
- homepage = http://glance.openstack.org/;
- description = "Services for discovering, registering, and retrieving virtual machine images";
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix
deleted file mode 100644
index 39c54f0d204b..000000000000
--- a/pkgs/applications/virtualization/openstack/keystone.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, python2Packages, xmlsec, which, openssl }:
-
-python2Packages.buildPythonApplication rec {
- name = "keystone-${version}";
- version = "8.0.0";
- namePrefix = "";
-
- PBR_VERSION = "${version}";
-
- src = fetchurl {
- url = "https://github.com/openstack/keystone/archive/${version}.tar.gz";
- sha256 = "1xbrs7xgwjzrs07zyxxcl2lq18dh582gd6lx1zzzji8c0qmffy0z";
- };
-
- # remove on next version bump
- patches = [ ./remove-oslo-policy-tests.patch ];
-
- # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with python2Packages; [
- pbr webob eventlet greenlet PasteDeploy paste routes cryptography six
- sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached
- keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack
- xmlsec MySQL_python
-
- # oslo
- oslo-cache oslo-concurrency oslo-config oslo-context oslo-messaging oslo-db
- oslo-i18n oslo-log oslo-middleware oslo-policy oslo-serialization oslo-service
- oslo-utils
- ];
-
- buildInputs = with python2Packages; [
- coverage fixtures mock subunit tempest-lib testtools testrepository
- ldap ldappool webtest requests oslotest pep8 pymongo which
- ];
-
- makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"];
-
- postInstall = ''
- # install .ini files
- mkdir -p $out/etc
- cp etc/* $out/etc
-
- # check all binaries don't crash
- for i in $out/bin/*; do
- $i --help
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = http://keystone.openstack.org/;
- description = "Authentication, authorization and service discovery mechanisms via HTTP";
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch b/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch
deleted file mode 100644
index d7a2caa2bdea..000000000000
--- a/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 3aefdf4de76fdcdc02093bc631e339f9ecd4c707 Mon Sep 17 00:00:00 2001
-From: James Page
-Date: Fri, 18 Sep 2015 16:38:47 +0100
-Subject: Add compatibility with iproute2 >= 4.0
-
-The ip netns list command adds additional id data in more recent
-versions of iproute2 of the format:
-
- qdhcp-35fc068a-750d-4add-b1d2-af392dbd8790 (id: 1)
-
-Update parsing to deal with old and new formats.
-
-Change-Id: I0d3fc4262284172f5ad31e4f2f78ae1fb33b4228
-Closes-Bug: 1497309
----
- neutron/agent/linux/ip_lib.py | 6 +++---
- neutron/tests/functional/agent/test_l3_agent.py | 2 +-
- neutron/tests/unit/agent/linux/test_ip_lib.py | 15 +++++++++++++++
- 3 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py
-index 551341a..a717bf6 100644
---- a/neutron/agent/linux/ip_lib.py
-+++ b/neutron/agent/linux/ip_lib.py
-@@ -208,7 +208,7 @@ class IPWrapper(SubProcessBase):
- @classmethod
- def get_namespaces(cls):
- output = cls._execute([], 'netns', ('list',))
-- return [l.strip() for l in output.split('\n')]
-+ return [l.split()[0] for l in output.splitlines()]
-
-
- class IPDevice(SubProcessBase):
-@@ -819,8 +819,8 @@ class IpNetnsCommand(IpCommandBase):
- output = self._parent._execute(
- ['o'], 'netns', ['list'],
- run_as_root=cfg.CONF.AGENT.use_helper_for_ns_read)
-- for line in output.split('\n'):
-- if name == line.strip():
-+ for line in [l.split()[0] for l in output.splitlines()]:
-+ if name == line:
- return True
- return False
-
-diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py
-index ffa20e6..84b16df 100644
---- a/neutron/tests/functional/agent/test_l3_agent.py
-+++ b/neutron/tests/functional/agent/test_l3_agent.py
-@@ -790,7 +790,7 @@ class L3HATestFramework(L3AgentTestFramework):
- get_ns_name = mock.patch.object(
- namespaces.RouterNamespace, '_get_ns_name').start()
- get_ns_name.return_value = "%s%s%s" % (
-- namespaces.RouterNamespace._get_ns_name(router_info['id']),
-+ 'qrouter-' + router_info['id'],
- self.NESTED_NAMESPACE_SEPARATOR, self.agent.host)
- router1 = self.manage_router(self.agent, router_info)
-
-diff --git a/neutron/tests/unit/agent/linux/test_ip_lib.py b/neutron/tests/unit/agent/linux/test_ip_lib.py
-index 2de408d..bdfc9d7 100644
---- a/neutron/tests/unit/agent/linux/test_ip_lib.py
-+++ b/neutron/tests/unit/agent/linux/test_ip_lib.py
-@@ -27,6 +27,11 @@ NETNS_SAMPLE = [
- 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb',
- 'cccccccc-cccc-cccc-cccc-cccccccccccc']
-
-+NETNS_SAMPLE_IPROUTE2_4 = [
-+ '12345678-1234-5678-abcd-1234567890ab (id: 1)',
-+ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb (id: 0)',
-+ 'cccccccc-cccc-cccc-cccc-cccccccccccc (id: 2)']
-+
- LINK_SAMPLE = [
- '1: lo: mtu 16436 qdisc noqueue state UNKNOWN \\'
- 'link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 promiscuity 0',
-@@ -279,6 +284,16 @@ class TestIpWrapper(base.BaseTestCase):
-
- self.execute.assert_called_once_with([], 'netns', ('list',))
-
-+ def test_get_namespaces_iproute2_4(self):
-+ self.execute.return_value = '\n'.join(NETNS_SAMPLE_IPROUTE2_4)
-+ retval = ip_lib.IPWrapper.get_namespaces()
-+ self.assertEqual(retval,
-+ ['12345678-1234-5678-abcd-1234567890ab',
-+ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb',
-+ 'cccccccc-cccc-cccc-cccc-cccccccccccc'])
-+
-+ self.execute.assert_called_once_with([], 'netns', ('list',))
-+
- def test_add_tuntap(self):
- ip_lib.IPWrapper().add_tuntap('tap0')
- self.execute.assert_called_once_with([], 'tuntap',
---
-cgit v0.11.2
-
diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix
deleted file mode 100644
index 9ee586cf0409..000000000000
--- a/pkgs/applications/virtualization/openstack/neutron.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, python2Packages, xmlsec, which, dnsmasq }:
-
-python2Packages.buildPythonApplication rec {
- name = "neutron-${version}";
- version = "7.0.0";
- namePrefix = "";
-
- PBR_VERSION = "${version}";
-
- src = fetchurl {
- url = "https://github.com/openstack/neutron/archive/${version}.tar.gz";
- sha256 = "02ll081xly7zfjmgkal81fy3aplbnn5zgx8xfy3yy1nv3kfnyi40";
- };
-
- # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with python2Packages; [
- pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests
- jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six
- stevedore pecan ryu networking-hyperv MySQL_python
-
- # clients
- keystoneclient neutronclient novaclient
-
- # oslo components
- oslo-concurrency oslo-config oslo-context oslo-db oslo-i18n oslo-log oslo-messaging
- oslo-middleware oslo-policy oslo-rootwrap oslo-serialization oslo-service oslo-utils
- oslo-versionedobjects
- ];
-
- # make sure we include migrations
- prePatch = ''
- echo "graft neutron" >> MANIFEST.in
- substituteInPlace etc/neutron/rootwrap.d/dhcp.filters --replace "/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq"
- '';
- patches = [ ./neutron-iproute-4.patch ];
-
- buildInputs = with python2Packages; [
- cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository
- testtools testresources testscenarios webtest oslotest os-testr tempest-lib
- ddt pep8
- ];
-
- postInstall = ''
- # requires extra optional dependencies
- # TODO: package networking_mlnx, networking_vsphere, bsnstacklib, XenAPI
- rm $out/bin/{neutron-mlnx-agent,neutron-ovsvapp-agent,neutron-restproxy-agent,neutron-rootwrap-xen-dom0}
-
- # check all binaries don't crash
- for i in $out/bin/*; do
- case "$i" in
- *neutron-pd-notify|*neutron-rootwrap-daemon|*neutron-rootwrap)
- :
- ;;
- *)
- $i --help
- esac
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = http://neutron.openstack.org/;
- description = "Virtual network service for Openstack";
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.linux;
- # Marked as broken due to needing an update for security issues.
- # See: https://github.com/NixOS/nixpkgs/issues/18856
- broken = true;
- };
-}
diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix
deleted file mode 100644
index ef3eb2fb0842..000000000000
--- a/pkgs/applications/virtualization/openstack/nova.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ stdenv, fetchurl, python2Packages, openssl, openssh }:
-
-python2Packages.buildPythonApplication rec {
- name = "nova-${version}";
- version = "12.0.0";
- namePrefix = "";
-
- PBR_VERSION = "${version}";
-
- src = fetchurl {
- url = "https://github.com/openstack/nova/archive/${version}.tar.gz";
- sha256 = "175n1znvmy8f5vqvabc2fa4qy8y17685z4gzpq8984mdsdnpv21w";
- };
-
- # otherwise migrate.cfg is not installed
- patchPhase = ''
- echo "graft nova" >> MANIFEST.in
-
- # remove transient error test, see http://hydra.nixos.org/build/40203534
- rm nova/tests/unit/compute/test_{shelve,compute_utils}.py
- '';
-
- # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt
- propagatedBuildInputs = with python2Packages; [
- pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography
- webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
- netifaces paramiko Babel iso8601 jsonschema keystoneclient requests six
- stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql
- keystonemiddleware MySQL_python
-
- # oslo components
- oslo-rootwrap oslo-reports oslo-utils oslo-i18n oslo-config oslo-context
- oslo-log oslo-serialization oslo-middleware oslo-db oslo-service oslo-messaging
- oslo-concurrency oslo-versionedobjects
-
- # clients
- cinderclient neutronclient glanceclient
- ];
-
- buildInputs = with python2Packages; [
- coverage fixtures mock mox3 subunit requests-mock pillow oslosphinx
- oslotest testrepository testresources testtools tempest-lib bandit
- oslo-vmware pep8 barbicanclient ironicclient openssl openssh
- ];
-
- postInstall = ''
- cp -prvd etc $out/etc
-
- # check all binaries don't crash
- for i in $out/bin/*; do
- case "$i" in
- *nova-dhcpbridge*)
- :
- ;;
- *nova-rootwrap*)
- :
- ;;
- *)
- $i --help
- ;;
- esac
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = http://nova.openstack.org/;
- description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller";
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch b/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch
deleted file mode 100644
index 3cdc27a2d2af..000000000000
--- a/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6016d017004acaae288312b196ef07ea98e9962d Mon Sep 17 00:00:00 2001
-From: Brant Knudson
-Date: Mon, 12 Oct 2015 15:12:45 -0500
-Subject: [PATCH] Remove oslo.policy implementation tests from keystone
-
-oslo.policy 0.12.0 contains a change to use requests to do the http
-check rather than urllib. This change caused keystone tests to fail
-because the keystone tests were mocking urllib, making assumptions
-about how oslo.policy is implemented. Keystone doesn't need to test
-internal features of oslo.policy, so these tests are removed.
-
-Change-Id: I9d6e4950b9fe75cbb94100c8effdcec002642027
-Closes-Bug: 1505374
----
- keystone/tests/unit/test_policy.py | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/keystone/tests/unit/test_policy.py b/keystone/tests/unit/test_policy.py
-index b2f0e52..686e2b7 100644
---- a/keystone/tests/unit/test_policy.py
-+++ b/keystone/tests/unit/test_policy.py
-@@ -16,10 +16,8 @@
- import json
- import os
-
--import mock
- from oslo_policy import policy as common_policy
- import six
--from six.moves.urllib import request as urlrequest
- from testtools import matchers
-
- from keystone import exception
-@@ -118,28 +116,6 @@ def test_enforce_good_action(self):
- action = "example:allowed"
- rules.enforce(self.credentials, action, self.target)
-
-- def test_enforce_http_true(self):
--
-- def fakeurlopen(url, post_data):
-- return six.StringIO("True")
--
-- action = "example:get_http"
-- target = {}
-- with mock.patch.object(urlrequest, 'urlopen', fakeurlopen):
-- result = rules.enforce(self.credentials, action, target)
-- self.assertTrue(result)
--
-- def test_enforce_http_false(self):
--
-- def fakeurlopen(url, post_data):
-- return six.StringIO("False")
--
-- action = "example:get_http"
-- target = {}
-- with mock.patch.object(urlrequest, 'urlopen', fakeurlopen):
-- self.assertRaises(exception.ForbiddenAction, rules.enforce,
-- self.credentials, action, target)
--
- def test_templatized_enforcement(self):
- target_mine = {'project_id': 'fake'}
- target_not_mine = {'project_id': 'another'}
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index cb0f772ada3a..00303be12da2 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -4,31 +4,37 @@
, makeWrapper
, attr, libcap, libcap_ng
, CoreServices, Cocoa, rez, setfile
-, numaSupport ? stdenv.isLinux, numactl
+, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl
, seccompSupport ? stdenv.isLinux, libseccomp
, pulseSupport ? !stdenv.isDarwin, libpulseaudio
, sdlSupport ? !stdenv.isDarwin, SDL
, vncSupport ? true, libjpeg, libpng
-, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol
+, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol
, usbredirSupport ? spiceSupport, usbredir
, xenSupport ? false, xen
-, x86Only ? false
+, hostCpuOnly ? false
, nixosTestRunner ? false
}:
with stdenv.lib;
let
- version = "2.10.1";
- sha256 = "1a3bjr0ygx4r2qd4nx5jf77jhh4xis3zga27lfryn0b4ap3hn14f";
+ version = "2.11.1";
+ sha256 = "1jrcff0szyjxc3vywyiclwdzk0xgq4cxvjbvmcfyjcpdrq9j5pyr";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
+
+ hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu"
+ else if stdenv.isi686 then "i386-softmmu"
+ else if stdenv.isArm then "arm-softmmu"
+ else if stdenv.isAarch64 then "aarch64-softmmu"
+ else throw "Don't know how to build a 'hostCpuOnly = true' QEMU";
in
stdenv.mkDerivation rec {
name = "qemu-"
+ stdenv.lib.optionalString xenSupport "xen-"
- + stdenv.lib.optionalString x86Only "x86-only-"
+ + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-"
+ stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
+ version;
@@ -48,14 +54,14 @@ stdenv.mkDerivation rec {
++ optionals pulseSupport [ libpulseaudio ]
++ optionals sdlSupport [ SDL ]
++ optionals vncSupport [ libjpeg libpng ]
- ++ optionals spiceSupport [ spice_protocol spice ]
+ ++ optionals spiceSupport [ spice-protocol spice ]
++ optionals usbredirSupport [ usbredir ]
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
++ optionals xenSupport [ xen ];
enableParallelBuilding = true;
- patches = [ ./no-etc-install.patch ]
+ patches = [ ./no-etc-install.patch ./statfs-flags.patch ]
++ optional nixosTestRunner ./force-uid0-on-9p.patch
++ optional pulseSupport ./fix-hda-recording.patch;
@@ -75,7 +81,7 @@ stdenv.mkDerivation rec {
++ optional seccompSupport "--enable-seccomp"
++ optional spiceSupport "--enable-spice"
++ optional usbredirSupport "--enable-usb-redir"
- ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"
+ ++ optional hostCpuOnly "--target-list=${hostCpuTargets}"
++ optional stdenv.isDarwin "--enable-cocoa"
++ optional stdenv.isLinux "--enable-linux-aio"
++ optional xenSupport "--enable-xen";
@@ -87,14 +93,17 @@ stdenv.mkDerivation rec {
done
'';
+ # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
postInstall =
- ''
- # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
- p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"
- if [ -e "$p" ]; then
- makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
- fi
- '';
+ if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+ else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+ else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+ else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+ else "";
+
+ passthru = {
+ qemu-system-i386 = "bin/qemu-system-i386";
+ };
meta = with stdenv.lib; {
homepage = http://www.qemu.org/;
diff --git a/pkgs/applications/virtualization/qemu/riscv-initrd.patch b/pkgs/applications/virtualization/qemu/riscv-initrd.patch
new file mode 100644
index 000000000000..a7e5b28cfd5e
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/riscv-initrd.patch
@@ -0,0 +1,98 @@
+From 44b0f612499764dad425d467aadacb01fbd4a920 Mon Sep 17 00:00:00 2001
+From: Shea Levy
+Date: Tue, 20 Feb 2018 07:59:43 -0500
+Subject: [PATCH] riscv: Respect the -initrd flag.
+
+Logic for initrd start address borrowed from arm/boot.c
+---
+ hw/riscv/virt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 46 insertions(+), 3 deletions(-)
+
+diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
+index 46d95b2b79..5c7d191a3f 100644
+--- a/hw/riscv/virt.c
++++ b/hw/riscv/virt.c
+@@ -77,7 +77,35 @@ static uint64_t load_kernel(const char *kernel_filename)
+ return kernel_entry;
+ }
+
+-static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,
++static hwaddr load_initrd(const char *filename, uint64_t mem_size,
++ uint64_t kernel_entry, hwaddr *start)
++{
++ int size;
++
++ /* We want to put the initrd far enough into RAM that when the
++ * kernel is uncompressed it will not clobber the initrd. However
++ * on boards without much RAM we must ensure that we still leave
++ * enough room for a decent sized initrd, and on boards with large
++ * amounts of RAM we must avoid the initrd being so far up in RAM
++ * that it is outside lowmem and inaccessible to the kernel.
++ * So for boards with less than 256MB of RAM we put the initrd
++ * halfway into RAM, and for boards with 256MB of RAM or more we put
++ * the initrd at 128MB.
++ */
++ *start = kernel_entry + MIN(mem_size / 2, 128 * 1024 * 1024);
++
++ size = load_ramdisk(filename, *start, mem_size - *start);
++ if (size == -1) {
++ size = load_image_targphys(filename, *start, mem_size - *start);
++ if (size == -1) {
++ error_report("qemu: could not load ramdisk '%s'", filename);
++ exit(1);
++ }
++ }
++ return *start + size;
++}
++
++static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,
+ uint64_t mem_size, const char *cmdline)
+ {
+ void *fdt;
+@@ -233,6 +261,8 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,
+ qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename);
+ qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
+ g_free(nodename);
++
++ return fdt;
+ }
+
+ static void riscv_virt_board_init(MachineState *machine)
+@@ -246,6 +276,7 @@ static void riscv_virt_board_init(MachineState *machine)
+ char *plic_hart_config;
+ size_t plic_hart_config_len;
+ int i;
++ void *fdt;
+
+ /* Initialize SOC */
+ object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY);
+@@ -265,7 +296,8 @@ static void riscv_virt_board_init(MachineState *machine)
+ main_mem);
+
+ /* create device tree */
+- create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline);
++ fdt = create_fdt(s, memmap, machine->ram_size,
++ machine->kernel_cmdline);
+
+ /* boot rom */
+ memory_region_init_ram(boot_rom, NULL, "riscv_virt_board.bootrom",
+@@ -273,7 +305,18 @@ static void riscv_virt_board_init(MachineState *machine)
+ memory_region_add_subregion(system_memory, 0x0, boot_rom);
+
+ if (machine->kernel_filename) {
+- load_kernel(machine->kernel_filename);
++ uint64_t kernel_entry = load_kernel(machine->kernel_filename);
++
++ if (machine->initrd_filename) {
++ hwaddr start;
++ hwaddr end = load_initrd(machine->initrd_filename,
++ machine->ram_size, kernel_entry,
++ &start);
++ qemu_fdt_setprop_cell(fdt, "/chosen",
++ "linux,initrd-start", start);
++ qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
++ end);
++ }
+ }
+
+ /* reset vector */
diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix
new file mode 100644
index 000000000000..5e234dcb8935
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/riscv.nix
@@ -0,0 +1,22 @@
+{ qemu, fetchFromGitHub, lib }: let
+ src = fetchFromGitHub {
+ owner = "riscv";
+ repo = "riscv-qemu";
+ rev = "af435b709d4a5de3ec2e59ff4dcd05b0b295a730";
+ sha256 = "1kqcsn8yfdg3zyd991i4v5dxznd1l4a4hjry9304lvsm3sz2wllw";
+ fetchSubmodules = true;
+ };
+ version = "2.11.50";
+ revCount = "58771";
+ shortRev = "af435b709d";
+ targets = [ "riscv32-linux-user" "riscv32-softmmu"
+ "riscv64-linux-user" "riscv64-softmmu"
+ ];
+in lib.overrideDerivation qemu (orig: {
+ name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}";
+ inherit src;
+ # https://github.com/riscv/riscv-qemu/pull/109
+ patches = orig.patches ++ [ ./riscv-initrd.patch ];
+ configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ];
+ postInstall = null;
+})
diff --git a/pkgs/applications/virtualization/qemu/statfs-flags.patch b/pkgs/applications/virtualization/qemu/statfs-flags.patch
new file mode 100644
index 000000000000..52a470a2869a
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/statfs-flags.patch
@@ -0,0 +1,197 @@
+commit 909fe47c7009aa9a75fe9470c5f8d3dd5b50917a
+Author: Shea Levy
+Date: Sun Feb 18 13:50:11 2018 -0500
+
+ linux-user: Support f_flags in statfs when available.
+
+ Signed-off-by: Shea Levy
+
+diff --git a/configure b/configure
+index 913e14839d..52fe2bf941 100755
+--- a/configure
++++ b/configure
+@@ -5303,6 +5303,22 @@ if compile_prog "" "" ; then
+ have_utmpx=yes
+ fi
+
++##########################################
++# Check for newer fields of struct statfs on Linux
++
++if test "$linux_user" = "yes"; then
++ cat > $TMPC <
++
++int main(void) {
++ struct statfs fs;
++ fs.f_flags = 0;
++}
++EOF
++ if compile_object ; then
++ have_statfs_flags=yes
++ fi
++fi
+ ##########################################
+ # checks for sanitizers
+
+@@ -6518,6 +6534,10 @@ if test "$have_utmpx" = "yes" ; then
+ echo "HAVE_UTMPX=y" >> $config_host_mak
+ fi
+
++if test "$have_statfs_flags" = "yes" ; then
++ echo "HAVE_STATFS_FLAGS=y" >> $config_host_mak
++fi
++
+ if test "$ivshmem" = "yes" ; then
+ echo "CONFIG_IVSHMEM=y" >> $config_host_mak
+ fi
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 82b35a6bdf..77481eca2c 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -9534,6 +9534,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+ __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]);
+ __put_user(stfs.f_namelen, &target_stfs->f_namelen);
+ __put_user(stfs.f_frsize, &target_stfs->f_frsize);
++#ifdef HAVE_STATFS_FLAGS
++ __put_user(stfs.f_flags, &target_stfs->f_flags);
++#endif
+ memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare));
+ unlock_user_struct(target_stfs, arg2, 1);
+ }
+diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
+index a35c52a60a..64aa49d3c5 100644
+--- a/linux-user/syscall_defs.h
++++ b/linux-user/syscall_defs.h
+@@ -362,7 +362,14 @@ struct kernel_statfs {
+ int f_ffree;
+ kernel_fsid_t f_fsid;
+ int f_namelen;
++#ifdef HAVE_STATFS_FLAGS
++ int f_frsize;
++ int f_flags;
++ int f_spare[4];
++#else
+ int f_spare[6];
++#endif
++
+ };
+
+ struct target_dirent {
+@@ -2223,7 +2230,12 @@ struct target_statfs {
+ /* Linux specials */
+ target_fsid_t f_fsid;
+ int32_t f_namelen;
++#ifdef HAVE_STATFS_FLAGS
++ int32_t f_flags;
++ int32_t f_spare[5];
++#else
+ int32_t f_spare[6];
++#endif
+ };
+ #else
+ struct target_statfs {
+@@ -2239,7 +2251,12 @@ struct target_statfs {
+ /* Linux specials */
+ target_fsid_t f_fsid;
+ abi_long f_namelen;
++#ifdef HAVE_STATFS_FLAGS
++ abi_long f_flags;
++ abi_long f_spare[5];
++#else
+ abi_long f_spare[6];
++#endif
+ };
+ #endif
+
+@@ -2255,7 +2272,12 @@ struct target_statfs64 {
+ uint64_t f_bavail;
+ target_fsid_t f_fsid;
+ uint32_t f_namelen;
++#ifdef HAVE_STATFS_FLAGS
++ uint32_t f_flags;
++ uint32_t f_spare[5];
++#else
+ uint32_t f_spare[6];
++#endif
+ };
+ #elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \
+ defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \
+@@ -2271,7 +2293,12 @@ struct target_statfs {
+ target_fsid_t f_fsid;
+ abi_long f_namelen;
+ abi_long f_frsize;
++#ifdef HAVE_STATFS_FLAGS
++ abi_long f_flags;
++ abi_long f_spare[4];
++#else
+ abi_long f_spare[5];
++#endif
+ };
+
+ struct target_statfs64 {
+@@ -2285,7 +2312,12 @@ struct target_statfs64 {
+ target_fsid_t f_fsid;
+ abi_long f_namelen;
+ abi_long f_frsize;
++#ifdef HAVE_STATFS_FLAGS
++ abi_long f_flags;
++ abi_long f_spare[4];
++#else
+ abi_long f_spare[5];
++#endif
+ };
+ #elif defined(TARGET_S390X)
+ struct target_statfs {
+@@ -2299,7 +2331,13 @@ struct target_statfs {
+ kernel_fsid_t f_fsid;
+ int32_t f_namelen;
+ int32_t f_frsize;
++#ifdef HAVE_STATFS_FLAGS
++ int32_t f_flags;
++ int32_t f_spare[4];
++#else
+ int32_t f_spare[5];
++#endif
++
+ };
+
+ struct target_statfs64 {
+@@ -2313,7 +2351,12 @@ struct target_statfs64 {
+ kernel_fsid_t f_fsid;
+ int32_t f_namelen;
+ int32_t f_frsize;
++#ifdef HAVE_STATFS_FLAGS
++ int32_t f_flags;
++ int32_t f_spare[4];
++#else
+ int32_t f_spare[5];
++#endif
+ };
+ #else
+ struct target_statfs {
+@@ -2327,7 +2370,12 @@ struct target_statfs {
+ target_fsid_t f_fsid;
+ uint32_t f_namelen;
+ uint32_t f_frsize;
++#ifdef HAVE_STATFS_FLAGS
++ uint32_t f_flags;
++ uint32_t f_spare[4];
++#else
+ uint32_t f_spare[5];
++#endif
+ };
+
+ struct target_statfs64 {
+@@ -2341,7 +2389,12 @@ struct target_statfs64 {
+ target_fsid_t f_fsid;
+ uint32_t f_namelen;
+ uint32_t f_frsize;
++#ifdef HAVE_STATFS_FLAGS
++ uint32_t f_flags;
++ uint32_t f_spare[4];
++#else
+ uint32_t f_spare[5];
++#endif
+ };
+ #endif
+
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index a99e6f569564..40eadad68d09 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "remotebox-${version}";
- version = "2.2";
+ version = "2.4";
src = fetchurl {
url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
- sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5";
+ sha256 = "14zcpzpdb5gxkxvckcdwq3mfv8b18zirbdskzddhqxjddkzayckz";
};
buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ];
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
RemoteBox aims to fill this gap by providing a graphical VirtualBox
client which is able to manage a VirtualBox server installation.
'';
- maintainers = with maintainers; [ nckx ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 452f082e20e7..947f4454362b 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/
wrapProgram $out/bin/rkt \
- --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib \
+ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \
--prefix PATH : ${iptables}/bin
'';
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 4fdb7421c3cb..b0fd42f4efb1 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
name = "runc-${version}";
- version = "1.0.0-rc4";
+ version = "1.0.0-rc5";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
- sha256 = "0dh24x0zw90hs7618pnqvjhd2nx8dpz3b5jwc1vbs8dawj8prir2";
+ sha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix
index 6b40b1da3a0d..5aa73528e9d7 100644
--- a/pkgs/applications/virtualization/seabios/default.nix
+++ b/pkgs/applications/virtualization/seabios/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "seabios-${version}";
- version = "1.9.3";
+ version = "1.11.0";
src = fetchurl {
url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz";
- sha256 = "13b7n20qfc2cc8v70jvl9r51m563rss9lbk1aflirvnd9705vs0s";
+ sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2";
};
buildInputs = [ iasl python ];
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index ddd8cf72b93d..662805438958 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -1,20 +1,55 @@
{ stdenv
, fetchFromGitHub
-, autoreconfHook }:
+, autoreconfHook
+, gnutar
+, which
+, gnugrep
+, coreutils
+, python
+, e2fsprogs
+, makeWrapper
+, squashfsTools
+, gzip
+, gnused
+, curl
+, utillinux
+ }:
stdenv.mkDerivation rec {
name = "singularity-${version}";
- version = "2.2";
+ version = "2.4.2";
+
+ enableParallelBuilding = true;
+
+ patches = [ ./env.patch ];
+
+ preConfigure = ''
+ sed -i 's/-static//g' src/Makefile.am
+ patchShebangs .
+ '';
+
+ configureFlags = "--localstatedir=/var";
+ installFlags = "CONTAINER_MOUNTDIR=dummy CONTAINER_FINALDIR=dummy CONTAINER_OVERLAY=dummy SESSIONDIR=dummy";
+
+ fixupPhase = ''
+ patchShebangs $out
+ for f in $out/libexec/singularity/helpers/help.sh $out/libexec/singularity/cli/*.exec $out/libexec/singularity/bootstrap-scripts/*.sh ; do
+ chmod a+x $f
+ sed -i 's| /sbin/| |g' $f
+ sed -i 's| /bin/bash| ${stdenv.shell}|g' $f
+ wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath buildInputs}
+ done
+ '';
src = fetchFromGitHub {
owner = "singularityware";
repo = "singularity";
rev = version;
- sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px";
+ sha256 = "0cpa2yp82g9j64mgr90p75ddk85kbj1qi1r6hy0sz17grqdlaxl4";
};
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ ];
+ nativeBuildInputs = [ autoreconfHook makeWrapper ];
+ buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux ];
meta = with stdenv.lib; {
homepage = http://singularity.lbl.gov/;
diff --git a/pkgs/applications/virtualization/singularity/env.patch b/pkgs/applications/virtualization/singularity/env.patch
new file mode 100644
index 000000000000..bc3be363bb81
--- /dev/null
+++ b/pkgs/applications/virtualization/singularity/env.patch
@@ -0,0 +1,21 @@
+diff --git a/libexec/functions b/libexec/functions
+index bc68107..6c2211c 100644
+--- a/libexec/functions
++++ b/libexec/functions
+@@ -29,16 +29,6 @@ if [ -z "${SINGULARITY_MESSAGELEVEL:-}" ]; then
+ SINGULARITY_MESSAGELEVEL=5
+ fi
+
+-if [ -z "${USER:-}" ]; then
+- USER=`id -un`
+- export USER
+-fi
+-if [ -z "${HOME:-}" ]; then
+- HOME=`getent passwd "$USER" | cut -d : -f 6`
+- export HOME
+-fi
+-
+-
+ message() {
+ LEVEL="${1:-}"
+ MESSAGE="${2:-}"
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix
index 74da6c4ab167..15ae244b3291 100644
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib,
+{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib,
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus,
systemd}:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
substituteInPlace data/spice-vdagent.desktop --replace /usr $out
'';
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ alsaLib spice_protocol glib
+ buildInputs = [ alsaLib spice-protocol glib
libpciaccess libxcb libXrandr libXinerama libXfixes
dbus systemd ] ;
meta = {
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index 0d4aa4783c6b..c027541c01c1 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, glibc }:
stdenv.mkDerivation rec {
- version = "0.16.1";
+ version = "0.17.0";
name = "tini-${version}";
src = fetchFromGitHub {
owner = "krallin";
repo = "tini";
rev = "v${version}";
- sha256 ="1abvjwjk7xhsbx60niy4ykcj3xvrxcl6zx8z1v827jsn47wzpikp";
+ sha256 ="0y16xk89811a6g2srg63jv5b2221dirzrhha7mj056a6jq5ql2f0";
};
patchPhase = "sed -i /tini-static/d CMakeLists.txt";
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 13dbf544c927..d0e270558874 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,34 +1,35 @@
{ stdenv, fetchurl, python2Packages, intltool, file
-, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf
+, wrapGAppsHook, gtkvnc, vte, avahi, dconf
, gobjectIntrospection, libvirt-glib, system-libvirt
-, gsettings_desktop_schemas, glib, libosinfo, gnome3
-, spiceSupport ? true, spice_gtk ? null
+, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
+, spiceSupport ? true, spice-gtk ? null
}:
with stdenv.lib;
python2Packages.buildPythonApplication rec {
name = "virt-manager-${version}";
- version = "1.4.2";
+ version = "1.5.1";
namePrefix = "";
src = fetchurl {
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
- sha256 = "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23";
+ sha256 = "1ardmd4sxdmd57y7qpka44gf09c1yq2g0xs074d3k1h925crv27f";
};
- nativeBuildInputs = [ wrapGAppsHook intltool file ];
+ nativeBuildInputs = [
+ wrapGAppsHook intltool file
+ gobjectIntrospection # for setup hook populating GI_TYPELIB_PATH
+ ];
buildInputs =
- [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi
- gsettings_desktop_schemas libosinfo
- ] ++ optional spiceSupport spice_gtk;
+ [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi
+ gsettings-desktop-schemas libosinfo gtk3
+ ] ++ optional spiceSupport spice-gtk;
propagatedBuildInputs = with python2Packages;
- [ eventlet greenlet gflags netaddr carrot routes PasteDeploy
- m2crypto ipy twisted distutils_extra simplejson
- cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python
- pygobject3 ipaddr mox libvirt libxml2 requests
+ [
+ pygobject3 ipaddr libvirt libxml2 requests
];
patchPhase = ''
@@ -60,6 +61,8 @@ python2Packages.buildPythonApplication rec {
manages Xen and LXC (linux containers).
'';
license = licenses.gpl2;
+ # exclude Darwin since libvirt-glib currently doesn't build there
+ platforms = platforms.linux;
maintainers = with maintainers; [ qknight offline fpletz ];
};
}
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index f386b457fc50..9316496a547e 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,30 +1,30 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
-, qtbase, qtmultimedia, qtsvg
-, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol
+, qtbase, qtmultimedia, qtsvg, qttools
+, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol
}:
mkDerivation rec {
name = "virt-manager-qt-${version}";
- version = "0.45.75";
+ version = "0.52.80";
src = fetchFromGitHub {
owner = "F1ash";
repo = "qt-virt-manager";
rev = "${version}";
- sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n";
+ sha256 = "131rs6c90vdf1j40qj7k6s939y8la9ma0q3labxb7ac3r8hvhn6a";
};
cmakeFlags = [
"-DBUILD_QT_VERSION=5"
+ "-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5"
];
buildInputs = [
- # virt-manager-qt currently does not compile with qtermwidget-0.8.0
- qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1
- libvirt libvncserver pixman spice_gtk spice_protocol
+ qtbase qtmultimedia qtsvg
+ libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol
];
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig qttools ];
enableParallelBuilding = true;
@@ -38,5 +38,6 @@ mkDerivation rec {
'';
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
+ inherit (qtbase.meta) platforms;
};
}
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index f411ea5c83e6..493307d0d078 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, ocamlPackages }:
+{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
stdenv.mkDerivation rec {
name = "virt-top-${version}";
- version = "1.0.8";
+ version = "2017-11-18-unstable";
- src = fetchurl {
- url = "https://people.redhat.com/~rjones/virt-top/files/virt-top-${version}.tar.gz";
- sha256 = "04i1sf2d3ghilmzvr2vh74qcy009iifyc2ymj9kxnbkp97lrz13w";
+ src = fetchgit {
+ url = git://git.annexia.org/git/virt-top.git;
+ rev = "18a751d8c26548bb090ff05e30ccda3092e3373b";
+ sha256 = "0c4whjvw7p3yvd476i4ppdhi8j821r5y6caqrj2v9dc181cnp01i";
};
+ nativeBuildInputs = [ autoreconfHook ];
buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt ocaml_gettext curses csv xml-light ];
buildPhase = "make opt";
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index 3b8d0a7cf63e..eb48e1d3d300 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,32 +1,36 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
-, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen
-, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
+, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen
+, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
, libapparmor
, spiceSupport ? true
-, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
+, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
}:
assert spiceSupport ->
- spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null;
+ spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null;
with stdenv.lib;
stdenv.mkDerivation rec {
baseName = "virt-viewer";
- version = "5.0";
+ version = "6.0";
name = "${baseName}-${version}";
src = fetchurl {
url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
- sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b";
+ sha256 = "1chqrf658niivzfh85cbwkbv9vyg8sv1mv3i31vawkfsfdvvsdwh";
};
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
- glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info
- libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib
- libcap_ng numactl libapparmor xen
- ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
+ glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
+ libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib
+ libcap_ng numactl libapparmor
+ ] ++ optionals stdenv.isx86_64 [
+ xen
+ ] ++ optionals spiceSupport [
+ spice-gtk spice-protocol libcap gdbm
+ ];
postInstall = ''
for f in "$out"/bin/*; do
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 0952fd1af080..29cb7c192b56 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,8 +1,9 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2
, libXrandr, libXinerama
-, which, alsaLib, curl, libvpx, gawk, nettools, dbus
-, xorriso, makeself, perl, pkgconfig
+, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
+, alsaLib, curl, libvpx, gawk, nettools, dbus
+, xorriso, makeself, perl
, javaBindings ? false, jdk ? null
, pythonBindings ? false, python2 ? null
, enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null
@@ -19,10 +20,11 @@ let
python = python2;
buildType = "release";
# Manually sha256sum the extensionPack file, must be hex!
- extpack = "005ba9211862643e2516d549e98b80942918047f1f6c55fcfe08c490dd1947bc";
- extpackRev = "118431";
- main = "0m6y98pvkngprw5iaswvkbbfxmzvfl8yvgi984p1866zwap77z16";
- version = "5.2.0";
+ # Do not forget to update the hash in ./guest-additions/default.nix!
+ extpack = "355ea5fe047f751534720c65398b44290d53f389e0f5f66818f3f36746631d26";
+ extpackRev = "121009";
+ main = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8";
+ version = "5.2.8";
# See https://github.com/NixOS/nixpkgs/issues/672 for details
extensionPack = requireFile rec {
@@ -51,10 +53,12 @@ in stdenv.mkDerivation {
outputs = [ "out" "modsrc" ];
+ nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ];
+
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl
- pkgconfig which libXmu libpng patchelfUnstable python ]
+ libXmu libpng patchelfUnstable python ]
++ optional javaBindings jdk
++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio
@@ -88,8 +92,11 @@ in stdenv.mkDerivation {
set +x
'';
- patches = optional enableHardening ./hardened.patch
- ++ [ ./qtx11extras.patch ];
+ patches =
+ optional enableHardening ./hardened.patch
+ ++ [ ./qtx11extras.patch ];
+
+
postPatch = ''
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
@@ -197,8 +204,9 @@ in stdenv.mkDerivation {
meta = {
description = "PC emulator";
- homepage = http://www.virtualbox.org/;
- maintainers = [ lib.maintainers.sander ];
- platforms = lib.platforms.linux;
+ license = licenses.gpl2;
+ homepage = https://www.virtualbox.org/;
+ maintainers = with maintainers; [ flokli sander ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
};
}
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 87b89a98e780..96e8404b3ef9 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,12 +19,14 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "1r6dybr3pfclffk7gppf7n8gwj3ziw7pmfvbwwkdw00q9ah7h5l4";
+ sha256 = "04q8d2dxhkkqbghqidcwv6mx57fqpp92smh7gnaxb7vqqskb9dl0";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include";
+ patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ];
+
patches = [
./fix_kerndir.patch
./fix_kernincl.patch
@@ -34,7 +36,7 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
- buildInputs = [ patchelf cdrkit makeWrapper dbus ];
+ buildInputs = [ patchelf cdrkit makeWrapper dbus ] ++ kernel.moduleBuildDependencies;
installPhase = ''
mkdir -p $out
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch
index e7feed853b12..0be949f63c92 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kerndir.patch
@@ -1,7 +1,7 @@
-diff --git a/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header
+diff --git a/vboxsf/Makefile.include.header b/vboxsf/Makefile.include.header
index 8df1eb4d25..5a3e5604e7 100644
---- a/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header
-+++ b/install/src/vboxguest-5.2.0/vboxsf/Makefile.include.header
+--- a/vboxsf/Makefile.include.header
++++ b/vboxsf/Makefile.include.header
@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
endif # neq($(KERNELRELEASE),)
@@ -11,10 +11,10 @@ index 8df1eb4d25..5a3e5604e7 100644
$(error Error: unable to find the headers of the Linux kernel to build against. \
Specify KERN_VER= and run Make again)
-diff --git a/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header
+diff --git a/vboxguest/Makefile.include.header b/vboxguest/Makefile.include.header
index 8df1eb4d25..5a3e5604e7 100644
---- a/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header
-+++ b/install/src/vboxguest-5.2.0/vboxguest/Makefile.include.header
+--- a/vboxguest/Makefile.include.header
++++ b/vboxguest/Makefile.include.header
@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
endif # neq($(KERNELRELEASE),)
@@ -24,10 +24,10 @@ index 8df1eb4d25..5a3e5604e7 100644
$(error Error: unable to find the headers of the Linux kernel to build against. \
Specify KERN_VER= and run Make again)
-diff --git a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header
+diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header
index 8df1eb4d25..5a3e5604e7 100644
---- a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header
-+++ b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header
+--- a/vboxvideo/Makefile.include.header
++++ b/vboxvideo/Makefile.include.header
@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
endif # neq($(KERNELRELEASE),)
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch
index 251394e5d13e..e59e2e98c1b3 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/fix_kernincl.patch
@@ -1,7 +1,7 @@
-diff --git a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header
+diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header
index 8df1eb4d25..5a3e5604e7 100644
---- a/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header
-+++ b/install/src/vboxguest-5.2.0/vboxvideo/Makefile.include.header
+--- a/vboxvideo/Makefile.include.header
++++ b/vboxvideo/Makefile.include.header
@@ -122,7 +122,6 @@ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
Specify KERN_VER= and run Make again)
endif
diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
new file mode 100644
index 000000000000..c3280cbda94b
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -0,0 +1,176 @@
+{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit
+, withInternalQemu ? true
+, withInternalTraditionalQemu ? true
+, withInternalSeabios ? true
+, withSeabios ? !withInternalSeabios, seabios ? null
+, withInternalOVMF ? false # FIXME: tricky to build
+, withOVMF ? false, OVMF
+, withLibHVM ? true
+
+# qemu
+, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir
+, alsaLib, glib, python2
+, ... } @ args:
+
+assert withInternalSeabios -> !withSeabios;
+assert withInternalOVMF -> !withOVMF;
+
+with stdenv.lib;
+
+# Patching XEN? Check the XSAs at
+# https://xenbits.xen.org/xsa/
+# and try applying all the ones we don't have yet.
+
+let
+ xsaPatch = { name , sha256 }: (fetchpatch {
+ url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
+ inherit sha256;
+ });
+
+ xsa = import ./xsa-patches.nix { inherit fetchpatch; };
+
+ qemuDeps = [
+ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
+ alsaLib glib python2
+ ];
+in
+
+callPackage (import ./generic.nix (rec {
+ version = "4.10.0";
+
+ src = fetchurl {
+ url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
+ sha256 = "0i38ap5b5m1kix6xb0vn9ya1yab35adyc98bzfnbq4lb7w1afqh2";
+ };
+
+ # Sources needed to build tools and firmwares.
+ xenfiles = optionalAttrs withInternalQemu {
+ "qemu-xen" = {
+ src = fetchgit {
+ url = https://xenbits.xen.org/git-http/qemu-xen.git;
+ # rev = "refs/tags/qemu-xen-${version}";
+ # use revision hash - reproducible but must be updated with each new version
+ rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2";
+ sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w";
+ };
+ buildInputs = qemuDeps;
+ postPatch = ''
+ # needed in build but /usr/bin/env is not available in sandbox
+ substituteInPlace scripts/tracetool.py \
+ --replace "/usr/bin/env python" "${python2}/bin/python"
+ '';
+ meta.description = "Xen's fork of upstream Qemu";
+ };
+ } // optionalAttrs withInternalTraditionalQemu {
+ "qemu-xen-traditional" = {
+ src = fetchgit {
+ url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
+ # rev = "refs/tags/xen-${version}";
+ # use revision hash - reproducible but must be updated with each new version
+ rev = "c8ea0457495342c417c3dc033bba25148b279f60";
+ sha256 = "0v5nl3c08kpjg57fb8l191h1y57ykp786kz6l525jgplif28vx13";
+ };
+ buildInputs = qemuDeps;
+ patches = [
+ ];
+ postPatch = ''
+ substituteInPlace xen-hooks.mak \
+ --replace /usr/include/pci ${pciutils}/include/pci
+ '';
+ meta.description = "Xen's fork of upstream Qemu that uses old device model";
+ };
+ } // optionalAttrs withInternalSeabios {
+ "firmware/seabios-dir-remote" = {
+ src = fetchgit {
+ url = https://xenbits.xen.org/git-http/seabios.git;
+ rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df";
+ sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm";
+ };
+ patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
+ meta.description = "Xen's fork of Seabios";
+ };
+ } // optionalAttrs withInternalOVMF {
+ "firmware/ovmf-dir-remote" = {
+ src = fetchgit {
+ url = https://xenbits.xen.org/git-http/ovmf.git;
+ rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8";
+ sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr";
+ };
+ meta.description = "Xen's fork of OVMF";
+ };
+ } // {
+ # TODO: patch Xen to make this optional?
+ "firmware/etherboot/ipxe.git" = {
+ src = fetchgit {
+ url = https://git.ipxe.org/ipxe.git;
+ rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d";
+ sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09";
+ };
+ meta.description = "Xen's fork of iPXE";
+ };
+ } // optionalAttrs withLibHVM {
+ "xen-libhvm-dir-remote" = {
+ src = fetchgit {
+ name = "xen-libhvm";
+ url = https://github.com/michalpalka/xen-libhvm;
+ rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c";
+ sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd";
+ };
+ buildPhase = ''
+ make
+ cd biospt
+ cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm
+ '';
+ installPhase = ''
+ make install
+ cp biospt/biospt $out/bin/
+ '';
+ meta = {
+ description = ''
+ Helper library for reading ACPI and SMBIOS firmware values
+ from the host system for use with the HVM guest firmware
+ pass-through feature in Xen'';
+ license = licenses.bsd2;
+ };
+ };
+ };
+
+ configureFlags = []
+ ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH
+ ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional"
+ ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional"
+
+ ++ optional (withSeabios) "--with-system-seabios=${seabios}"
+ ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios"
+
+ ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
+ ++ optional (withInternalOVMF) "--enable-ovmf";
+
+ patches = with xsa; flatten [
+ XSA_252
+ XSA_253
+ XSA_255_1
+ XSA_255_2
+ XSA_256
+ ];
+
+ # Fix build on Glibc 2.24.
+ NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
+ postPatch = ''
+ # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
+ sed 1i'#include ' \
+ -i tools/blktap2/control/tap-ctl-allocate.c \
+ -i tools/libxl/libxl_device.c
+ # Makefile didn't include previous PKG_CONFIG_PATH so glib wasn't found
+ substituteInPlace tools/Makefile \
+ --replace 'PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config' 'PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config:$(PKG_CONFIG_PATH)'
+ '';
+
+ passthru = {
+ qemu-system-i386 = if withInternalQemu
+ then "lib/xen/bin/qemu-system-i386"
+ else throw "this xen has no qemu builtin";
+ };
+
+})) args
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 308913adf89c..bb6209ce47fb 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -9,7 +9,7 @@
, withLibHVM ? true
# qemu
-, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir
+, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir
, alsaLib
, ... } @ args:
@@ -29,7 +29,7 @@ let
});
qemuDeps = [
- udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
+ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
alsaLib
];
@@ -39,6 +39,10 @@ in
callPackage (import ./generic.nix (rec {
version = "4.5.5";
+ meta = {
+ knownVulnerabilities = [ "Security support ended in January 2018" ];
+ };
+
src = fetchurl {
url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2";
@@ -230,6 +234,12 @@ callPackage (import ./generic.nix (rec {
XSA_243_45
XSA_244_45
XSA_245
+ XSA_246_45
+ XSA_247_45
+ XSA_248_45
+ XSA_249
+ XSA_250_45
+ XSA_251_45
];
# Fix build on Glibc 2.24.
@@ -242,4 +252,10 @@ callPackage (import ./generic.nix (rec {
-i tools/libxl/libxl_device.c
'';
+ passthru = {
+ qemu-system-i386 = if withInternalQemu
+ then "lib/xen/bin/qemu-system-i386"
+ else throw "this xen has no qemu builtin";
+ };
+
})) ({ ocamlPackages = ocamlPackages_4_02; } // args)
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 259dd72a960c..cce91dcd5deb 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -8,7 +8,7 @@
, withLibHVM ? true
# qemu
-, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir
+, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir
, alsaLib
, ... } @ args:
@@ -29,18 +29,30 @@ let
xsa = import ./xsa-patches.nix { inherit fetchpatch; };
+ xenlockprofpatch = (fetchpatch {
+ name = "xenlockprof-gcc7.patch";
+ url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=f49fa658b53580cf2ad354d2bf1796766cc11222";
+ sha256 = "1lvzfvkqirknivm8q4cg5byfqz49s16zjk65fkwl3kwb03chky70";
+ });
+
+ xenpmdpatch = (fetchpatch {
+ name = "xenpmd-gcc7.patch";
+ url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=2d78f78a14528752266982473c07118f1bc336e3";
+ sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq";
+ });
+
qemuDeps = [
- udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
+ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
alsaLib
];
in
callPackage (import ./generic.nix (rec {
- version = "4.8.2";
+ version = "4.8.3";
src = fetchurl {
url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
- sha256 = "1ydgwbn8ab0s16jrbi3wzaa6j0y3zk0j8pay458qcgayk3qc476b";
+ sha256 = "0vhkpyy5x7kc36hnav95fn194ngsmc3m2xcc78vccs00gdf6m8q9";
};
# Sources needed to build tools and firmwares.
@@ -49,15 +61,9 @@ callPackage (import ./generic.nix (rec {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen.git;
rev = "refs/tags/qemu-xen-${version}";
- sha256 = "1v19pp86kcgwvsbkrdrn4rlaj02i4054avw8k70w1m0rnwgcsdbs";
+ sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4";
};
buildInputs = qemuDeps;
- patches = [
- (xsaPatch {
- name = "216-qemuu";
- sha256 = "06w2iw1r5gip2bpbg19cziws965h9in0f6np74cr31f76yy30yxn";
- })
- ];
meta.description = "Xen's fork of upstream Qemu";
};
} // optionalAttrs withInternalTraditionalQemu {
@@ -144,20 +150,15 @@ callPackage (import ./generic.nix (rec {
++ optional (withInternalOVMF) "--enable-ovmf";
patches = with xsa; flatten [
- XSA_231
- XSA_232
- XSA_233
- XSA_234_48
- XSA_236
- XSA_237_48
- XSA_238
- XSA_239
- XSA_240_48
- XSA_241
- XSA_242
- XSA_243_48
- XSA_244
- XSA_245
+ # XSA_231 to XSA-251 are fixed in 4.8.3 (verified with git log)
+ XSA_252_49
+ # 253: 4.8 not affected
+ # 254: no patch supplied by xen project (Meltdown/Spectre)
+ XSA_255_49_1
+ XSA_255_49_2
+ XSA_256_48
+ xenlockprofpatch
+ xenpmdpatch
];
# Fix build on Glibc 2.24.
@@ -170,4 +171,10 @@ callPackage (import ./generic.nix (rec {
-i tools/libxl/libxl_device.c
'';
+ passthru = {
+ qemu-system-i386 = if withInternalQemu
+ then "lib/xen/bin/qemu-system-i386"
+ else throw "this xen has no qemu builtin";
+ };
+
})) args
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 9efcc45be359..0cbf30bea741 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -154,12 +154,12 @@ stdenv.mkDerivation (rec {
substituteInPlace tools/xenstat/Makefile \
--replace /usr/include/curses.h ${ncurses.dev}/include/curses.h
- ${optionalString (config.version >= "4.8") ''
+ ${optionalString (builtins.compareVersions config.version "4.8" >= 0) ''
substituteInPlace tools/hotplug/Linux/launch-xenstore.in \
--replace /bin/mkdir mkdir
''}
- ${optionalString (config.version < "4.6") ''
+ ${optionalString (builtins.compareVersions config.version "4.6" < 0) ''
# TODO: use this as a template and support our own if-up scripts instead?
substituteInPlace tools/hotplug/Linux/xen-backend.rules.in \
--replace "@XEN_SCRIPT_DIR@" $out/etc/xen/scripts
@@ -221,6 +221,7 @@ stdenv.mkDerivation (rec {
done
'';
+ # TODO(@oxij): Stop referencing args here
meta = {
homepage = http://www.xen.org/;
description = "Xen hypervisor and related components"
@@ -231,5 +232,5 @@ stdenv.mkDerivation (rec {
+ withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.'');
platforms = [ "x86_64-linux" ];
maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ];
- };
+ } // (config.meta or {});
} // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ])
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
index 8f5262acb024..791a3b91818a 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -2,7 +2,7 @@
, stdenv, overrideCC, gcc49
}:
-# TODO on new Xen version: generalize this to generate [vanilla slim
+# TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim
# light] for each ./.nix.
rec {
@@ -58,10 +58,6 @@ rec {
};
xen_4_8-vanilla = callPackage ./4.8.nix {
- # At the very least included seabios and etherboot need gcc49,
- # so we have to build all of it with gcc49.
- stdenv = overrideCC stdenv gcc49;
-
meta = {
description = "vanilla";
longDescription = ''
@@ -107,8 +103,54 @@ rec {
};
};
- xen-vanilla = xen_4_5-vanilla;
- xen-slim = xen_4_5-slim;
- xen-light = xen_4_5-light;
+ xen_4_10-vanilla = callPackage ./4.10.nix {
+ meta = {
+ description = "vanilla";
+ longDescription = ''
+ Vanilla version of Xen. Uses forks of Qemu and Seabios bundled
+ with Xen. This gives vanilla experince, but wastes space and
+ build time: typical NixOS setup that runs lots of VMs will
+ build three different versions of Qemu when using this (two
+ forks and upstream).
+ '';
+ };
+ };
+
+ xen_4_10-slim = xen_4_10-vanilla.override {
+ withInternalQemu = false;
+ withInternalTraditionalQemu = true;
+ withInternalSeabios = false;
+ withSeabios = true;
+
+ meta = {
+ description = "slim";
+ longDescription = ''
+ Slimmed-down version of Xen that reuses nixpkgs packages as
+ much as possible. Different parts may get out of sync, but
+ this builds faster and uses less space than vanilla. Use with
+ `qemu_xen` from nixpkgs.
+ '';
+ };
+ };
+
+ xen_4_10-light = xen_4_10-vanilla.override {
+ withInternalQemu = false;
+ withInternalTraditionalQemu = false;
+ withInternalSeabios = false;
+ withSeabios = true;
+
+ meta = {
+ description = "light";
+ longDescription = ''
+ Slimmed-down version of Xen without `qemu-traditional` (you
+ don't need it if you don't know what it is). Use with
+ `qemu_xen-light` from nixpkgs.
+ '';
+ };
+ };
+
+ xen-vanilla = xen_4_8-vanilla;
+ xen-slim = xen_4_8-slim;
+ xen-light = xen_4_8-light;
}
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
index fd85c85f22bb..727546b69fb0 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -771,4 +771,166 @@ in rec {
sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8";
})
];
+
+ # 4.5 - 4.7
+ XSA_246_45 = [
+ (xsaPatch {
+ name = "246-4.7";
+ sha256 = "13rad4k8z3bq15d67dhgy96kdbrjiq9sy8px0jskbpx9ygjdahkn";
+ })
+ ];
+
+ # 4.8 - 4.9
+ XSA_246 = [
+ (xsaPatch {
+ name = "246-4.9";
+ sha256 = "0z68vm0z5zvv9gm06pxs9kxq2q9fdbl0l0cm71ggzdplg1vw0snz";
+ })
+ ];
+
+ # 4.8
+ XSA_247_48 = [
+ (xsaPatch {
+ name = "247-4.8/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu";
+ sha256 = "0kvjrk90n69s721c2qj2df5raml3pjk6bg80aig353p620w6s3xh";
+ })
+ (xsaPatch {
+ name = "247-4.8/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas";
+ sha256 = "1s9kv6h6dd8psi5qf5l5gpk9qhq8blckwhl76cjbldcgi6imb3nr";
+ })
+ ];
+
+ # 4.5
+ XSA_247_45 = [
+ (xsaPatch {
+ name = "247-4.5/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu";
+ sha256 = "0h1mp5s9si8aw2gipds317f27h9pi7bgnhj0bcmw11p0ch98sg1m";
+ })
+ (xsaPatch {
+ name = "247-4.5/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas";
+ sha256 = "0vjjybxbcm4xl26wbqvcqfiyvvlayswm4f98i1fr5a9abmljn5sb";
+ })
+ ];
+
+ # 4.5
+ XSA_248_45 = [
+ (xsaPatch {
+ name = "248-4.5";
+ sha256 = "0csxg6h492ddsa210b45av28iqf7cn2dfdqk4zx10zwf1pv2shyn";
+ })
+ ];
+
+ # 4.8
+ XSA_248_48 = [
+ (xsaPatch {
+ name = "248-4.8";
+ sha256 = "1ycw29q22ymxg18kxpr5p7vhpmp8klssbp5gq77hspxzz2mb96q1";
+ })
+ ];
+
+ # 4.5 .. 4.9
+ XSA_249 = [
+ (xsaPatch {
+ name = "249";
+ sha256 = "0v6ngzqhkz7yv4n83xlpxfbkr2qyg5b1cds7ikkinm86hiqy6agl";
+ })
+ ];
+ # 4.5
+ XSA_250_45 = [
+ (xsaPatch {
+ name = "250-4.5";
+ sha256 = "0pqldl6qnl834gvfp90z247q9xcjh3835s2iffnajz7jhjb2145d";
+ })
+ ];
+ # 4.8 ...
+ XSA_250 = [
+ (xsaPatch {
+ name = "250";
+ sha256 = "1wpigg8kmha57sspqqln3ih9nbczsw6rx3v72mc62lh62qvwd7x8";
+ })
+ ];
+ # 4.5
+ XSA_251_45 = [
+ (xsaPatch {
+ name = "251-4.5";
+ sha256 = "0lc94cx271z09r0mhxaypyd9d4740051p28idf5calx5228dqjgm";
+ })
+ ];
+ # 4.8
+ XSA_251_48 = [
+ (xsaPatch {
+ name = "251-4.8";
+ sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq";
+ })
+ ];
+ # 4.8
+ XSA_252_49 = [
+ (xsaPatch {
+ name = "252-4.9";
+ sha256 = "03sbn90nlkk5ba1n168rxjkc7x3mqj7rfqvspbwblmwikfbnms2n";
+ })
+ ];
+ # 4.8
+ XSA_255_49_1= [
+ (xsaPatch {
+ name = "255-4.9-1";
+ sha256 = "0gbin7yxbkq40lvm3gvj1vffavvbng3zpd2m8l1kqyz0rv4vm9zc";
+ })
+ ];
+ # 4.8
+ XSA_255_49_2= [
+ (xsaPatch {
+ name = "255-4.9-2";
+ sha256 = "0fyg5nnyfpfr80qq83pr64zjp5w1nx94bdblzsjap8gaqcahyr12";
+ })
+ ];
+ # 4.8
+ XSA_256_48= [
+ (xsaPatch {
+ name = "256-4.8";
+ sha256 = "1w84f717kxwx0h3rw18r4f8pl0l1h5xlj5fy80sr0ws4xkp1qdn4";
+ })
+ ];
+
+
+ # 4.10
+ XSA_252 = [
+ (xsaPatch {
+ name = "252";
+ sha256 = "0v4sg20dnvnwrjh3x69gk81v2kmcql7g2s044vg3wcxhzvij1rrn";
+ })
+ ];
+
+ # 4.10
+ XSA_253 = [
+ (xsaPatch {
+ name = "253";
+ sha256 = "0445vzlzy3gd499xraqh5r4qjar6qr0y3813h22jy1n84nhxz27i";
+ })
+ ];
+
+ # 4.10
+ XSA_255_1 = [
+ (xsaPatch {
+ name = "255-1";
+ sha256 = "05g2f3ji1rrjlw3yw4nrns50pnmsib8ybrf64scr1817mj0q9myr";
+ })
+ ];
+
+ # 4.10
+ XSA_255_2 = [
+ (xsaPatch {
+ name = "255-2";
+ sha256 = "08wbngw5z0f9g8di59hww3hhi7j9z49bpc4xlwn5akfcwbgf0961";
+ })
+ ];
+
+ # 4.10
+ XSA_256 = [
+ (xsaPatch {
+ name = "256";
+ sha256 = "1hicwhbwj6k25px55f4ncx1c5xiihi8pfvsb3kv57k7kaicb7pza";
+ })
+ ];
+
}
diff --git a/pkgs/applications/window-managers/awesome/3.5.nix b/pkgs/applications/window-managers/awesome/3.5.nix
index 3a2a030b8a4d..f3d43d15efba 100644
--- a/pkgs/applications/window-managers/awesome/3.5.nix
+++ b/pkgs/applications/window-managers/awesome/3.5.nix
@@ -70,8 +70,8 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/awesome \
- --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \
- --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
+ --prefix LUA_CPATH ";" "${lgi}/lib/lua/${lua.luaversion}/?.so" \
+ --prefix LUA_PATH ";" "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index ec73150a5069..c23284d0b527 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -4,13 +4,13 @@
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
, which, dbus, nettools, git, asciidoc, doxygen
, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
-, libxkbcommon, xcbutilxrm, hicolor_icon_theme
+, libxkbcommon, xcbutilxrm, hicolor-icon-theme
}:
with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}";
version = "4.2";
-
+
src = fetchFromGitHub {
owner = "awesomewm";
repo = "awesome";
@@ -25,11 +25,11 @@ with luaPackages; stdenv.mkDerivation rec {
imagemagick
makeWrapper
pkgconfig
- xmlto docbook_xml_dtd_45
+ xmlto docbook_xml_dtd_45
docbook_xsl findXMLCatalogs
];
-
- propagatedUserEnvPkgs = [ hicolor_icon_theme ];
+
+ propagatedUserEnvPkgs = [ hicolor-icon-theme ];
buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection
git lgi libpthreadstubs libstartup_notification
libxdg_basedir lua nettools pango xcb-util-cursor
@@ -41,7 +41,6 @@ with luaPackages; stdenv.mkDerivation rec {
#cmakeFlags = "-DGENERATE_MANPAGES=ON";
cmakeFlags = "-DOVERRIDE_VERSION=${version}";
- LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";
GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
@@ -49,10 +48,9 @@ with luaPackages; stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/awesome \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \
- --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
+ --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
+ --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"
wrapProgram $out/bin/awesome-client \
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index 17baffbe8c73..d79d8c3325d7 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45
, docbook_xsl, libxslt, libxml2, makeWrapper
-, dbus, libconfig, libdrm, mesa_noglu, pcre, libX11, libXcomposite, libXdamage
+, dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage
, libXinerama, libXrandr, libXrender, libXext, xwininfo }:
stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
pcre
libconfig
dbus
- mesa_noglu
+ libGL
];
nativeBuildInputs = [
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index 159468f79047..53bcd158aedd 100644
--- a/pkgs/applications/window-managers/compton/git.nix
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
- docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre,
+ docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre,
pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
libXrandr, libXrender, xwininfo }:
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
libdrm
libxml2
libxslt
- mesa
+ libGLU_combined
pcre
];
diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix
index 9f6c89375182..76352753db1d 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildPhase = " make ";
meta = {
- homepage = http://suckless.org/;
+ homepage = https://suckless.org/;
description = "Dynamic window manager for X";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 19aa89a7f7e7..9c24df004f39 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "i3-${version}";
- version = "4.14.1";
+ version = "4.15";
src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2";
- sha256 = "1cazmfbbx6n8c81h6x6pdayq3mxs2ml3adz165z8vapkc72kl1nh";
+ sha256 = "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91";
};
nativeBuildInputs = [ which pkgconfig makeWrapper ];
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index a589e21be98b..edaa88bde23d 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchFromGitHub, which, pkgconfig, libxcb, xcbutilkeysyms
-, xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb,
+ xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon,
+ libxkbfile, libjpeg_turbo
+}:
stdenv.mkDerivation rec {
- version = "2.9.1-c";
+ version = "2.10.1-1-c";
name = "i3lock-color-${version}";
src = fetchFromGitHub {
- owner = "chrjguill";
+ owner = "PandorasFox";
repo = "i3lock-color";
- rev = version;
- sha256 = "0qnw71qbppgp3ywj1k07av7wkl9syfb8j6izrkhj143q2ks4rkvl";
+ rev = "01476c56333cccae80cdd3f125b0b9f3a0fe2cb3";
+ sha256 = "06ca8496fkdkvh4ycg0b7kd3r1bjdqdwfimb51v4nj1lm87pdkdf";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11
- libev cairo libxkbcommon libxkbfile ];
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11
+ libev cairo libxkbcommon libxkbfile libjpeg_turbo ];
makeFlags = "all";
preInstall = ''
@@ -31,6 +34,6 @@ stdenv.mkDerivation rec {
# Needs the SSE2 instruction set. See upstream issue
# https://github.com/chrjguill/i3lock-color/issues/44
- platforms = platforms.i686 ++ platforms.x86_64;
+ platforms = platforms.x86;
};
}
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index 6c53c51551ac..e28a9cf75be8 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- rev = "546ce2e71bd2339f2134904c7d22062e86105b46";
- name = "i3lock-fancy-unstable-2016-10-13_rev${builtins.substring 0 7 rev}";
+ rev = "3734fba160166006521e513f5734eb76ac6aa48f";
+ name = "i3lock-fancy-unstable-2017-12-14_rev${builtins.substring 0 7 rev}";
src = fetchFromGitHub {
owner = "meskarune";
repo = "i3lock-fancy";
inherit rev;
- sha256 = "1pbxydwdfd7jlw3b8cnlwlrkqlyh5jyanfhjybndqmacd3y8vplb";
+ sha256 = "1bg4xds2hmbq8rp6azbdqvgp1aaq5y1bp05cfwqqm6y3sjw7ywzl";
};
patchPhase = ''
sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock
sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock
sed -i -e "s| awk | ${gawk}/bin/awk |" lock
- sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock
- sed -i -e 's|ICON="$SCRIPTPATH/icons/lockdark.png"|ICON="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock
- sed -i -e 's|ICON="$SCRIPTPATH/icons/lock.png"|ICON="'$out'/share/i3lock-fancy/icons/lock.png"|' lock
+ sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" lock
+ sed -i -e 's|icon="$scriptpath/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock
+ sed -i -e 's|icon="$scriptpath/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' lock
sed -i -e "s|getopt |${getopt}/bin/getopt |" lock
sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock
- sed -i -e "s|SHOT=(import -window root)|SHOT=(${scrot}/bin/scrot -z)|" lock
+ sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" lock
'';
installPhase = ''
mkdir -p $out/bin $out/share/i3lock-fancy/icons
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 20df6566b23f..4d572e8c040d 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "i3lock-${version}";
- version = "2.9.1";
+ version = "2.10";
src = fetchurl {
url = "https://i3wm.org/i3lock/${name}.tar.bz2";
- sha256 = "1467ha4ssbfjk1jh0ya2i5ljzm554ln18nyrppvsipg8shb1cshh";
+ sha256 = "1vn8828ih7mpdl58znfnzpdwdgwksq16rghm5qlppbbz66zk5sr9";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 05965fc37174..0b86c0283e0c 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
name = "i3status-rust-${version}";
- version = "0.9.0.2017-11-09";
+ version = "0.9.0.2018-01-15";
src = fetchFromGitHub {
owner = "greshake";
repo = "i3status-rust";
- rev = "5daf2cdd611bed3db804d011d5d5af34b558e615";
- sha256 = "0j6h7x5mm3m7wq0if20qxc9z3qw29xgf5qb3sqwdbdpz8ykpqdgk";
+ rev = "aa7bc98d945ba63358cd48c66e0261c201b999e4";
+ sha256 = "1q2p53nl499yxsw0i81ryyc2ln80p8i3iii5hx7aiwfi4ybm55b1";
};
cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h";
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index fbea1d4e9a41..05f89728f6a7 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "jwm-${version}";
- version = "1651";
+ version = "1653";
src = fetchFromGitHub {
owner = "joewing";
repo = "jwm";
rev = "s${version}";
- sha256 = "097wqipg1h7h19a5bqdx7iq60fkjrx2niwsgg1f8cfz106yhbp6q";
+ sha256 = "09ci3g97xmif66pp9n4sdvdmlxpw67pwp8lbjynxhdvha5pwwpv5";
};
nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix
index 1c6b8a84c952..7aa604690f9a 100644
--- a/pkgs/applications/window-managers/kbdd/default.nix
+++ b/pkgs/applications/window-managers/kbdd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, dbus_glib, autoreconfHook, xorg }:
+{ stdenv, fetchgit, pkgconfig, dbus-glib, autoreconfHook, xorg }:
stdenv.mkDerivation rec {
name = "kbdd";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ xorg.libX11 dbus_glib ];
+ buildInputs = [ xorg.libX11 dbus-glib ];
meta = {
description = "Simple daemon and library to make per window layout using XKB";
diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix
index 27cb564d2c6b..ed34e75f35db 100644
--- a/pkgs/applications/window-managers/lemonbar/default.nix
+++ b/pkgs/applications/window-managers/lemonbar/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, libxcb }:
stdenv.mkDerivation rec {
- name = "lemonbar-1.2";
+ name = "lemonbar-1.3";
src = fetchurl {
- url = "https://github.com/LemonBoy/bar/archive/v1.2.tar.gz";
- sha256 = "1smz8lh930bnb6a4lrm07l3z2k071kc8p2pljk5wsrch3x2xhimq";
+ url = "https://github.com/LemonBoy/bar/archive/v1.3.tar.gz";
+ sha256 = "0zd3v8ys4jzi60pm3wq7p3pbbd5y0acimgiq46qx1ckmwg2q9rza";
};
buildInputs = [ libxcb perl ];
diff --git a/pkgs/applications/window-managers/orbment/bemenu.nix b/pkgs/applications/window-managers/orbment/bemenu.nix
new file mode 100644
index 000000000000..065b81948c2d
--- /dev/null
+++ b/pkgs/applications/window-managers/orbment/bemenu.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, pango, wayland, libxkbcommon }:
+
+stdenv.mkDerivation rec {
+ name = "bemenu-2017-02-14";
+
+ src = fetchFromGitHub {
+ owner = "Cloudef";
+ repo = "bemenu";
+ rev = "d6261274cf0b3aa51ce8ea7418a79495b20ad558";
+ sha256 = "08bc623y5yjbz7q83lhl6rb0xs6ji17z79c260bx0fgin8sfj5x8";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ pango wayland libxkbcommon ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "A dynamic menu library and client program inspired by dmenu";
+ homepage = src.meta.homepage;
+ license = with licenses; [ gpl3 lgpl3 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix
index 8071bc4bb426..46130680af42 100644
--- a/pkgs/applications/window-managers/orbment/default.nix
+++ b/pkgs/applications/window-managers/orbment/default.nix
@@ -1,9 +1,12 @@
-{ lib, stdenv, fetchgit, cmake, pkgconfig
+{ lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage
, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng
, libdrm, libX11
+, westonLite
}:
-stdenv.mkDerivation rec {
+let
+ bemenu = callPackage ./bemenu.nix {};
+in stdenv.mkDerivation rec {
name = "orbment-${version}";
version = "git-2016-08-13";
@@ -14,13 +17,20 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs = [
wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11
libdrm
];
+ postFixup = ''
+ wrapProgram $out/bin/orbment \
+ --prefix PATH : "${stdenv.lib.makeBinPath [ bemenu westonLite ]}"
+ '';
+
+ enableParallelBuilding = true;
+
meta = {
description = "Modular Wayland compositor";
homepage = src.url;
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
index d2bf1e5a96de..13eef1c045a4 100644
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ b/pkgs/applications/window-managers/oroborus/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A really minimalistic X window manager";
- homepage = http://www.oroborus.org/;
+ homepage = https://www.oroborus.org/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
diff --git a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
index e3c88a5fa551..71d3d9cafaa3 100644
--- a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
+++ b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
@@ -1,15 +1,5 @@
-From 00c5af939567429d40877845dc52b54fde2d8a50 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Nikolaev"
-Date: Thu, 26 Nov 2015 10:53:12 +0200
-Subject: [PATCH 1/3] Substitution vars for absolute paths
-
----
- libqtile/pangocffi.py | 6 +++---
- libqtile/xcursors.py | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
diff --git a/libqtile/pangocffi.py b/libqtile/pangocffi.py
-index 27691d1..25f690d 100644
+index 1e8f5c04..e860d43a 100644
--- a/libqtile/pangocffi.py
+++ b/libqtile/pangocffi.py
@@ -58,9 +58,9 @@ except ImportError:
@@ -26,18 +16,15 @@ index 27691d1..25f690d 100644
def CairoContext(cairo_t):
diff --git a/libqtile/xcursors.py b/libqtile/xcursors.py
-index e0e55e1..59b6428 100644
+index f1133555..3e61204a 100644
--- a/libqtile/xcursors.py
+++ b/libqtile/xcursors.py
-@@ -114,7 +114,7 @@ class Cursors(dict):
+@@ -112,7 +112,7 @@ class Cursors(dict):
def _setup_xcursor_binding(self):
try:
- xcursor = ffi.dlopen('libxcb-cursor.so')
+ xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so')
except OSError:
- self.log.warning("xcb-cursor not found, fallback to font pointer")
+ logger.warning("xcb-cursor not found, fallback to font pointer")
return False
---
-2.6.3
-
diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
index b620bfb25014..7d184838fbaa 100644
--- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
+++ b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
@@ -1,57 +1,52 @@
-From f299a0aa0eefcf16bb4990f00ac3946727f43ef3 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Nikolaev"
-Date: Fri, 27 Nov 2015 10:49:48 +0200
-Subject: [PATCH 2/3] Restore PATH and PYTHONPATH
-
----
- bin/qtile | 1 +
- bin/qtile-run | 1 +
- bin/qtile-session | 2 ++
- libqtile/utils.py | 7 +++++++
- 4 files changed, 11 insertions(+)
-
+diff --git a/bin/qshell b/bin/qshell
+index 2ba7e61c..0ac2a2ef 100755
+--- a/bin/qshell
++++ b/bin/qshell
+@@ -28,5 +28,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
+ sys.path.insert(0, base_dir)
+
+ if __name__ == '__main__':
++ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
+ from libqtile.scripts import qshell
+ qshell.main()
diff --git a/bin/qtile b/bin/qtile
-index 66034fe..ce3fcd1 100755
+index 3e82814d..335b5cea 100755
--- a/bin/qtile
+++ b/bin/qtile
-@@ -131,6 +131,7 @@ def make_qtile():
+@@ -29,5 +29,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
+ sys.path.insert(0, base_dir)
-
- if __name__ == "__main__":
+ if __name__ == '__main__':
+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
- rename_process()
- q = make_qtile()
- try:
+ from libqtile.scripts import qtile
+ qtile.main()
diff --git a/bin/qtile-run b/bin/qtile-run
-index ccedb96..646a476 100755
+index e4b121be..1c203bc9 100755
--- a/bin/qtile-run
+++ b/bin/qtile-run
-@@ -50,6 +50,7 @@ def main():
- proc.wait()
+@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
+ sys.path.insert(0, base_dir)
- if __name__ == "__main__":
+ if __name__ == '__main__':
+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
- try:
- main()
- except KeyboardInterrupt:
-diff --git a/bin/qtile-session b/bin/qtile-session
-index 84f6a2d..da31b12 100755
---- a/bin/qtile-session
-+++ b/bin/qtile-session
-@@ -25,6 +25,8 @@
- Qtile session manager.
- """
+ from libqtile.scripts import qtile_run
+ qtile_run.main()
+diff --git a/bin/qtile-top b/bin/qtile-top
+index 5316e0e7..272c6430 100755
+--- a/bin/qtile-top
++++ b/bin/qtile-top
+@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
+ sys.path.insert(0, base_dir)
-+__import__("importlib").import_module("libqtile.utils").restore_os_environment()
-+
- from libqtile.log_utils import init_log
- import logging
- import os
+ if __name__ == '__main__':
++ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
+ from libqtile.scripts import qtile_top
+ qtile_top.main()
diff --git a/libqtile/utils.py b/libqtile/utils.py
-index 284089b..ec3539e 100644
+index 36ed0a58..bca9eab3 100644
--- a/libqtile/utils.py
+++ b/libqtile/utils.py
-@@ -227,3 +227,11 @@ def describe_attributes(obj, attrs, func=None):
+@@ -240,3 +240,11 @@ def describe_attributes(obj, attrs, func=None):
pairs.append('%s=%s' % (attr, value))
return ', '.join(pairs)
diff --git a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
index d9377897fc69..c9ae57c8615c 100644
--- a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
+++ b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
@@ -1,17 +1,8 @@
-From b560c11078fecc35df2c62f34beda06c4e80a10d Mon Sep 17 00:00:00 2001
-From: "Alexander V. Nikolaev"
-Date: Fri, 27 Nov 2015 10:54:35 +0200
-Subject: [PATCH 3/3] Restart executable
-
----
- libqtile/manager.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
diff --git a/libqtile/manager.py b/libqtile/manager.py
-index b1a38e2..110f7d8 100644
+index 36518a74..9b6bdd02 100644
--- a/libqtile/manager.py
+++ b/libqtile/manager.py
-@@ -1339,7 +1339,7 @@ class Qtile(command.CommandObject):
+@@ -1386,7 +1386,7 @@ class Qtile(command.CommandObject):
argv = [s for s in argv if not s.startswith('--with-state')]
argv.append('--with-state=' + buf.getvalue().decode())
@@ -19,7 +10,4 @@ index b1a38e2..110f7d8 100644
+ self.cmd_execute(os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:])
def cmd_spawn(self, cmd):
- """
---
-2.6.3
-
+ """Run cmd in a shell.
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 8f4d4858ca11..f889bf29f71a 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, python27Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }:
let cairocffi-xcffib = python27Packages.cairocffi.override {
- pythonPath = [ python27Packages.xcffib ];
+ withXcffib = true;
};
in
python27Packages.buildPythonApplication rec {
name = "qtile-${version}";
- version = "0.10.4";
+ version = "0.10.7";
src = fetchFromGitHub {
owner = "qtile";
repo = "qtile";
rev = "v${version}";
- sha256 = "0rwklzgkp3x242xql6qmfpfnhr788hd3jc1l80pc5ybxlwyfx59i";
+ sha256 = "18szgplyym0b65vnaa8nqzadq6q0mhsiky9g5hqhn7xzf4kykmj8";
};
patches = [
@@ -36,11 +36,13 @@ python27Packages.buildPythonApplication rec {
postInstall = ''
wrapProgram $out/bin/qtile \
- --set QTILE_WRAPPER '$0' \
- --set QTILE_SAVED_PYTHONPATH '$PYTHONPATH' \
- --set QTILE_SAVED_PATH '$PATH'
+ --run 'export QTILE_WRAPPER=$0' \
+ --run 'export QTILE_SAVED_PYTHONPATH=$PYTHONPATH' \
+ --run 'export QTILE_SAVED_PATH=$PATH'
'';
+ doCheck = false; # Requires X server.
+
meta = with stdenv.lib; {
homepage = http://www.qtile.org/;
license = licenses.mit;
@@ -49,4 +51,3 @@ python27Packages.buildPythonApplication rec {
maintainers = with maintainers; [ kamilchm ];
};
}
-
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index 215b8c38ece4..e7427fa7763a 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
- inherit sbcl lispPackages;
+ inherit sbcl lispPackages contrib;
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 1e1072e49604..d643e2dd2186 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "sway-${version}";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
- sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh";
+ sha256 = "00prns3dnafd19ap774p8v994i3p185ji0dnp2xxbkgh2z7sbwpi";
};
nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- cmakeFlags = "-DVERSION=${version}";
+ cmakeFlags = "-DVERSION=${version} -DLD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib";
meta = with stdenv.lib; {
description = "i3-compatible window manager for Wayland";
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index 020a7bbb3577..5aec0973a7c6 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }:
stdenv.mkDerivation rec {
- name = "trayer-1.1.7";
+ name = "trayer-1.1.8";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gdk_pixbuf gtk2 ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "sargon";
repo = "trayer-srg";
rev = name;
- sha256 = "06lpgralggh5546qgvpilzxh4anshli2za41x68x2zbaizyqb09a";
+ sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg";
};
preConfigure = ''
diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix
index 789f074aecdf..0b430693eeed 100644
--- a/pkgs/applications/window-managers/velox/default.nix
+++ b/pkgs/applications/window-managers/velox/default.nix
@@ -1,25 +1,53 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig
-, swc, libxkbcommon
-, wld, wayland, pixman, fontconfig
+{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, newScope
+, libxkbcommon
+, wayland, pixman, fontconfig
+, stConf ? null, stPatches ? []
}:
-stdenv.mkDerivation rec {
+let
+ callPackage = newScope self;
+ self = {
+ swc = callPackage ./swc.nix {};
+ wld = callPackage ./wld.nix {};
+ dmenu-velox = callPackage ./dmenu.nix {};
+ st-velox = callPackage ./st.nix {
+ conf = stConf;
+ patches = stPatches;
+ };
+ };
+in with self; stdenv.mkDerivation rec {
name = "velox-${version}";
- version = "git-2015-11-03";
- repo = "https://github.com/michaelforney/velox";
- rev = "53b41348df7e37886cab012609923255e4397419";
+ version = "git-2017-07-04";
- src = fetchurl {
- url = "${repo}/archive/${rev}.tar.gz";
- sha256 = "e49583efbbe62ea30f0084491ff757dff683f35eef6e9b68aa413e0b50c4bf20";
+ src = fetchFromGitHub {
+ owner = "michaelforney";
+ repo = "velox";
+ rev = "0b1d3d62861653d92d0a1056855a84fcef661bc0";
+ sha256 = "0p5ra5p5w21wl696rmv0vdnl7jnri5iwnxfs6nl6miwydhq2dmci";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ swc libxkbcommon wld wayland pixman fontconfig ];
+ propagatedUserEnvPkgs = [ swc ];
+
makeFlags = "PREFIX=$(out)";
- installPhase = "PREFIX=$out make install";
+ preBuild = ''
+ substituteInPlace config.c \
+ --replace /etc/velox.conf $out/etc/velox.conf
+ '';
+ installPhase = ''
+ PREFIX=$out make install
+ mkdir -p $out/etc
+ cp velox.conf.sample $out/etc/velox.conf
+ '';
+ postFixup = ''
+ wrapProgram $out/bin/velox \
+ --prefix PATH : "${stdenv.lib.makeBinPath [ dmenu-velox st-velox ]}"
+ '';
+
+ enableParallelBuilding = true;
meta = {
description = "velox window manager";
diff --git a/pkgs/applications/window-managers/velox/dmenu.nix b/pkgs/applications/window-managers/velox/dmenu.nix
new file mode 100644
index 000000000000..182a290e0eee
--- /dev/null
+++ b/pkgs/applications/window-managers/velox/dmenu.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchFromGitHub #, libX11, libXinerama, enableXft, libXft, zlib
+, swc, wld, wayland, libxkbcommon, pixman, fontconfig
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "dmenu-velox-${version}";
+ version = "git-2017-04-07";
+
+ src = fetchFromGitHub {
+ owner = "michaelforney";
+ repo = "dmenu";
+ rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70";
+ sha256 = "14j8jv0nlybinhzkgd6dplvng9zy8p292prlx39w0k4fm6x5nv6y";
+ };
+
+ buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ];
+
+ postPatch = ''
+ sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run
+ '';
+
+ preConfigure = [
+ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk''
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A generic, highly customizable, and efficient menu for the X Window System";
+ homepage = http://tools.suckless.org/dmenu;
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ ];
+ platforms = with stdenv.lib.platforms; all;
+ };
+}
diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/window-managers/velox/st.nix
similarity index 50%
rename from pkgs/applications/misc/st/wayland.nix
rename to pkgs/applications/window-managers/velox/st.nix
index 69794b1cffbd..49ce57469bd6 100644
--- a/pkgs/applications/misc/st/wayland.nix
+++ b/pkgs/applications/window-managers/velox/st.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, writeText
-, ncurses, wayland, wld, libxkbcommon, fontconfig, pixman
-, conf ? null, patches ? [] }:
+{ stdenv, fetchFromGitHub, pkgconfig, writeText
+, ncurses, wayland, wayland-protocols, wld, libxkbcommon, fontconfig, pixman
+, conf, patches }:
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "st-wayland-${version}";
- version = "git-2015-08-29";
- rev = "61b47b76a09599c8093214e28c48938f5b424daa";
+ name = "st-velox-${version}";
+ version = "git-2016-12-22";
- src = fetchurl {
- url = "https://github.com/michaelforney/st/archive/${rev}.tar.gz";
- sha256 = "7164da135f02405dba5ae3131dfd896e072df29ac6c0928f3b887beffb8a7d97";
+ src = fetchFromGitHub {
+ owner = "michaelforney";
+ repo = "st";
+ rev = "b27f17da65f74b0a923952601873524e03b4d047";
+ sha256 = "17aa4bz5g14jvqghk2c8mw77hb8786s07pv814rmlk7nnsavmp3i";
};
inherit patches;
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ncurses wayland wld libxkbcommon fontconfig pixman ];
+ buildInputs = [ ncurses wayland wayland-protocols wld libxkbcommon fontconfig pixman ];
NIX_LDFLAGS = "-lfontconfig";
@@ -28,6 +29,8 @@ stdenv.mkDerivation rec {
TERMINFO=$out/share/terminfo make install PREFIX=$out
'';
+ enableParallelBuilding = true;
+
meta = {
homepage = http://st.suckless.org/;
license = licenses.mit;
diff --git a/pkgs/applications/window-managers/velox/swc.nix b/pkgs/applications/window-managers/velox/swc.nix
new file mode 100644
index 000000000000..a2f98b8b65e7
--- /dev/null
+++ b/pkgs/applications/window-managers/velox/swc.nix
@@ -0,0 +1,36 @@
+{ lib, stdenv, fetchFromGitHub, pkgconfig
+, wld, wayland, wayland-protocols, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm
+}:
+
+stdenv.mkDerivation rec {
+ name = "swc-${version}";
+ version = "git-2017-06-28";
+
+ src = fetchFromGitHub {
+ owner = "michaelforney";
+ repo = "swc";
+ rev = "5b20050872f8ad29cfc97729f8af47b6b3df5393";
+ sha256 = "1lxpm17v5d8png6ixc0zn0w00xgrhz2n5b8by9vx6800b18246z8";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ wld wayland wayland-protocols fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ];
+
+ prePatch = ''
+ substituteInPlace launch/local.mk --replace 4755 755
+ '';
+
+ makeFlags = "PREFIX=$(out)";
+ installPhase = "PREFIX=$out make install";
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A library for making a simple Wayland compositor";
+ homepage = src.meta.homepage;
+ license = lib.licenses.mit;
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/libraries/wld/default.nix b/pkgs/applications/window-managers/velox/wld.nix
similarity index 59%
rename from pkgs/development/libraries/wld/default.nix
rename to pkgs/applications/window-managers/velox/wld.nix
index 1dd5858ec720..d85f8212ec47 100644
--- a/pkgs/development/libraries/wld/default.nix
+++ b/pkgs/applications/window-managers/velox/wld.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchFromGitHub, pkgconfig
, wayland, fontconfig, pixman, freetype, libdrm
}:
stdenv.mkDerivation rec {
name = "wld-${version}";
- version = "git-2015-09-01";
- repo = "https://github.com/michaelforney/wld";
- rev = "efe0a1ed1856a2e4a1893ed0f2d7dde43b5627f0";
+ version = "git-2017-10-31";
- src = fetchurl {
- url = "${repo}/archive/${rev}.tar.gz";
- sha256 = "09388f7828e18c75e7b8d41454903886a725d7a868f60e66c128bd7d2e953ee1";
+ src = fetchFromGitHub {
+ owner = "michaelforney";
+ repo = "wld";
+ rev = "b4e902bbecb678c45485b52c3aa183cbc932c595";
+ sha256 = "0j2n776flnzyw3vhxl0r8h1c48wrihi4g6bs2z8j4hbw5pnwq1k6";
};
nativeBuildInputs = [ pkgconfig ];
@@ -20,9 +20,11 @@ stdenv.mkDerivation rec {
makeFlags = "PREFIX=$(out)";
installPhase = "PREFIX=$out make install";
+ enableParallelBuilding = true;
+
meta = {
description = "A primitive drawing library targeted at Wayland";
- homepage = repo;
+ homepage = src.meta.homepage;
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ];
diff --git a/pkgs/applications/window-managers/way-cooler/bar.diff b/pkgs/applications/window-managers/way-cooler/bar.diff
new file mode 100644
index 000000000000..e60ebabe9833
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/bar.diff
@@ -0,0 +1,37 @@
+--- bar.py.txt.orig 2017-12-05 18:10:20.108569182 +0300
++++ ./bar.py.txt 2017-12-10 21:42:10.622781945 +0300
+@@ -5,6 +5,7 @@ import datetime
+ import json
+ from time import sleep
+ from pydbus import SessionBus
++from glob import glob
+
+ BUS = SessionBus()
+ LAYOUT = BUS.get(bus_name='org.way-cooler', object_path='/org/way_cooler/Layout')
+@@ -32,7 +33,7 @@ def main():
+ output += func()
+ print(output)
+ sys.stdout.flush()
+- sleep(.1)
++ sleep(1)
+
+ def get_workspaces(layout_json):
+ """Gets the workspace names from the layout json"""
+@@ -49,9 +50,14 @@ def get_time():
+ return datetime.datetime.now().strftime(' %a %b %d %H:%M ')
+
+ def get_battery():
+- with open("/sys/class/power_supply/BAT0/capacity", "r") as f:
+- bat = f.readlines()
+- return bat[0].strip() + "% Battery"
++ try:
++ [path] = glob("/sys/class/power_supply/BAT?/capacity")
++ with open(path, "r") as f:
++ bat = f.readlines()
++ result = bat[0].strip() + "% Battery"
++ except Exception:
++ result = ""
++ return result
+
+ def format_workspaces(layout, workspaces, active_workspace):
+ workspaces = " " + workspaces.replace(" ", " ") + " "
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
old mode 100755
new mode 100644
index 75c9e6ecf8c8..c8b67ec047ae
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -1,27 +1,93 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig
-, wayland, xwayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon }:
+{ stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides
+, wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf
+}:
-with rustPlatform;
+let
+ # refer to
+ # https://github.com/way-cooler/way-cooler.github.io/blob/master/way-cooler-release-i3-default.sh
+ # for version numbers
+ fakegit = writeShellScriptBin "git" ''
+ echo ""
+ '';
+ way-cooler = (((callPackage ./way-cooler.nix {}).way_cooler { builtin-lua = true; }).override {
+ crateOverrides = defaultCrateOverrides // {
-buildRustPackage rec {
- name = "way-cooler-${version}";
- version = "0.5.2";
+ way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk_pixbuf wayland ]; };
+ };}).overrideAttrs (oldAttrs: rec {
+ nativeBuildInputs = [ makeWrapper ];
- src = fetchFromGitHub {
- owner = "way-cooler";
- repo = "way-cooler";
- rev = "v${version}";
- sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb";
+ postBuild = ''
+ mkdir -p $out/etc
+ cp -r config $out/etc/way-cooler
+ '';
+ postFixup = ''
+ cd $out/bin
+ mv way_cooler way-cooler
+ '';
+ });
+ wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec {
+ nativeBuildInputs = [ makeWrapper ];
+
+ postFixup = ''
+ makeWrapper $out/bin/wc_bg $out/bin/wc-bg \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}"
+ '';
+ });
+ wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec {
+ postFixup = ''
+ cd $out/bin
+ mv wc_grab wc-grab
+ '';
+ });
+ wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override {
+ crateOverrides = defaultCrateOverrides // {
+
+ wc-lock = attrs: { buildInputs = [ pam ]; };
+ };}).overrideAttrs (oldAttrs: rec {
+ nativeBuildInputs = [ makeWrapper ];
+
+ postFixup = ''
+ makeWrapper $out/bin/wc_lock $out/bin/wc-lock \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}"
+ '';
+ });
+ # https://github.com/way-cooler/way-cooler/issues/446
+ wc-bar-bare = stdenv.mkDerivation {
+ name = "wc-bar-bare-2017-12-05";
+
+ src = fetchurl {
+ url = "https://github.com/way-cooler/way-cooler/files/1529701/bar.py.txt";
+ sha256 = "1n1rf1k02i6vimr9n0iksf65phhyy96i5wh5d0rrx7yqki3dh6ka";
+ };
+
+ unpackPhase = "cat $src > bar.py.txt";
+
+ # https://github.com/way-cooler/way-cooler/issues/446#issuecomment-350567833
+ patches = [ ./bar.diff ];
+
+ pythonPath = with python3Packages; [ pydbus ];
+ nativeBuildInputs = with python3Packages; [ python wrapPython ];
+
+ installPhase = ''
+ install -Dm755 bar.py.txt $out/bin/bar.py
+ patchShebangs $out/bin/bar.py
+ wrapPythonPrograms
+ '';
};
-
- cargoSha256 = "06qivlybmmc49ksv4232sm1r4hp923xsq4c2ksa4i2azdzc1csdc";
-
- buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ];
-
- nativeBuildInputs = [ pkgconfig ];
+ wc-bar = writeShellScriptBin "lemonbar" ''
+ SELECTED="#000000"
+ SELECTED_OTHER_WORKSPACE="#555555"
+ BACKGROUND="#4E2878"
+ # https://github.com/way-cooler/way-cooler/issues/446#issuecomment-349471439
+ sleep 5
+ ${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d
+ '';
+in symlinkJoin rec {
+ version = "0.8.0";
+ name = "way-cooler-with-extensions-${version}";
+ paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ];
meta = with stdenv.lib; {
- broken = true;
description = "Customizable Wayland compositor (window manager)";
longDescription = ''
Way Cooler is a customizable tiling window manager written in Rust
diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix
new file mode 100644
index 000000000000..9ba6db367720
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/way-cooler.nix
@@ -0,0 +1,1862 @@
+# Generated by carnix 0.6.5: carnix -o way-cooler.nix Cargo.lock
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+ abi = buildPlatform.parsed.abi.name;
+ include = includedFiles: src: builtins.filterSource (path: type:
+ lib.lists.any (f:
+ let p = toString (src + ("/" + f)); in
+ (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
+ ) includedFiles
+ ) src;
+ updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
+ mapFeatures = features: map (fun: fun { features = features; });
+ mkFeatures = feat: lib.lists.foldl (features: featureName:
+ if feat.${featureName} or false then
+ [ featureName ] ++ features
+ else
+ features
+ ) [] (builtins.attrNames feat);
+in
+rec {
+ way_cooler = f: way_cooler_0_8_0 { features = way_cooler_0_8_0_features { way_cooler_0_8_0 = f; }; };
+ aho_corasick_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "aho-corasick";
+ version = "0.5.3";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn";
+ libName = "aho_corasick";
+ crateBin = [ { name = "aho-corasick-dot"; } ];
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.4.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.6.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.7.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "0.9.1";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
+ inherit dependencies buildDependencies features;
+ };
+ bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "bitflags";
+ version = "1.0.1";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1";
+ inherit dependencies buildDependencies features;
+ };
+ c_vec_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "c_vec";
+ version = "1.2.1";
+ authors = [ "Guillaume Gomez " ];
+ sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd";
+ inherit dependencies buildDependencies features;
+ };
+ cairo_rs_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "cairo-rs";
+ version = "0.2.0";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "0bcbhbyips15b7la4r43p4x57jv1w2ll8iwg9lxwvzz5k6c7iwvd";
+ libName = "cairo";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ cairo_sys_rs_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "cairo-sys-rs";
+ version = "0.4.0";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "062nxihlydci65pyy2ldn7djkc9sm7a5xvkl8pxrsxfxvfapm5br";
+ libName = "cairo_sys";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "cfg-if";
+ version = "0.1.2";
+ authors = [ "Alex Crichton " ];
+ sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi";
+ inherit dependencies buildDependencies features;
+ };
+ dbus_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dbus";
+ version = "0.4.1";
+ authors = [ "David Henningsson " ];
+ sha256 = "0qw32qj2rys318h780klxlznkwg93dfimbn8mc34m4940l8v00g9";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ dbus_macros_0_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dbus-macros";
+ version = "0.0.6";
+ authors = [ "Antoni Boucher " ];
+ sha256 = "1nymk2hzzgyafyr5nfa4r4frx4hml3wlwgzfr9b69vmcvn3d2jyd";
+ inherit dependencies buildDependencies features;
+ };
+ dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dlib";
+ version = "0.3.1";
+ authors = [ "Victor Berger " ];
+ sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr";
+ inherit dependencies buildDependencies features;
+ };
+ dlib_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dlib";
+ version = "0.4.0";
+ authors = [ "Victor Berger " ];
+ sha256 = "08sy43rji5dyhyz8r4i0dz6zan1r1dz8sh6fk3c1jyhy8v8s96jr";
+ inherit dependencies buildDependencies features;
+ };
+ dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dtoa";
+ version = "0.4.2";
+ authors = [ "David Tolnay " ];
+ sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw";
+ inherit dependencies buildDependencies features;
+ };
+ dummy_rustwlc_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "dummy-rustwlc";
+ version = "0.7.1";
+ authors = [ "Snirk Immington " "Preston Carpenter " ];
+ sha256 = "13priwnxpjvmym6yh9v9x1230ca04cba7bzbnn21pbvqngis1y88";
+ inherit dependencies buildDependencies features;
+ };
+ env_logger_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "env_logger";
+ version = "0.3.5";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1mvxiaaqsyjliv1mm1qaagjqiccw11mdyi3n9h9rf8y6wj15zycw";
+ inherit dependencies buildDependencies features;
+ };
+ fixedbitset_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "fixedbitset";
+ version = "0.1.8";
+ authors = [ "bluss" ];
+ sha256 = "18qr6w8jlfvhq825dr0mv9k0xqgb43sshdihbarc9khi9cz910a2";
+ inherit dependencies buildDependencies features;
+ };
+ fuchsia_zircon_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "fuchsia-zircon";
+ version = "0.3.2";
+ authors = [ "Raph Levien " ];
+ sha256 = "1zhxksplv52nlqd4j21h8462b5s913ngnhd303qsxsxn8dpaxgkq";
+ inherit dependencies buildDependencies features;
+ };
+ fuchsia_zircon_sys_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "fuchsia-zircon-sys";
+ version = "0.3.2";
+ authors = [ "Raph Levien " ];
+ sha256 = "0p8mrhg8pxk4kpzziv6nlxd8xgkj916gsg2b0x2mvf9dxwzrqhnk";
+ inherit dependencies buildDependencies features;
+ };
+ gcc_0_3_54_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gcc";
+ version = "0.3.54";
+ authors = [ "Alex Crichton " ];
+ sha256 = "07a5i47r8achc6gxsba3ga17h9gnh4b9a2cak8vjg4hx62aajkr4";
+ inherit dependencies buildDependencies features;
+ };
+ gdk_pixbuf_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gdk-pixbuf";
+ version = "0.2.0";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "082z1s30haa59ax35wsv06mj8z8bhhq0fac36g01qa77kpiphj5y";
+ libName = "gdk_pixbuf";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ gdk_pixbuf_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gdk-pixbuf-sys";
+ version = "0.4.0";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "1r98zdqqik3hh1l10jmhhcjx59yk4m0bs9pc7hnkwp2p6gm968vp";
+ libName = "gdk_pixbuf_sys";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ getopts_0_2_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "getopts";
+ version = "0.2.15";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "14wm893ihscwwbwpd1xvjm23slaidridbl2p2ghwkx69xfzm9333";
+ inherit dependencies buildDependencies features;
+ };
+ gio_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gio-sys";
+ version = "0.4.0";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "064lv6h3qfgjzc6pbbxgln24b2fq9gxzh78z6d7fwfa97azllv2l";
+ libName = "gio_sys";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ glib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "glib";
+ version = "0.3.1";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "00s3n0pd8by1fk2l01mxmbnqq4ff6wadnkcf9jbjvr1l9bzgyqbl";
+ inherit dependencies buildDependencies features;
+ };
+ glib_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "glib-sys";
+ version = "0.4.0";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "153i1zmk824hdf8agkaqcgddlwpvgng71n7bdpaav5f4zzlfyp2w";
+ libName = "glib_sys";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ gobject_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "gobject-sys";
+ version = "0.4.0";
+ authors = [ "The Gtk-rs Project Developers" ];
+ sha256 = "00zmcbzqfhn9w01cphhf3hbq8ldd9ajba7x07z59vv1gdq6wjzli";
+ libName = "gobject_sys";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "itoa";
+ version = "0.3.4";
+ authors = [ "David Tolnay " ];
+ sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
+ inherit dependencies buildDependencies features;
+ };
+ json_macro_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "json_macro";
+ version = "0.1.1";
+ authors = [ "Denis Kolodin " ];
+ sha256 = "0hl2934shpwqbszrq035valbdz9y8p7dza183brygy5dbvivcyqy";
+ inherit dependencies buildDependencies features;
+ };
+ kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "kernel32-sys";
+ version = "0.2.2";
+ authors = [ "Peter Atashian " ];
+ sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
+ libName = "kernel32";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "lazy_static";
+ version = "0.2.11";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm";
+ inherit dependencies buildDependencies features;
+ };
+ lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "lazy_static";
+ version = "1.0.0";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh";
+ inherit dependencies buildDependencies features;
+ };
+ libc_0_2_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libc";
+ version = "0.2.34";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "11jmqdxmv0ka10ay0l8nzx0nl7s2lc3dbrnh1mgbr2grzwdyxi2s";
+ inherit dependencies buildDependencies features;
+ };
+ libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libloading";
+ version = "0.3.4";
+ authors = [ "Simonas Kazlauskas " ];
+ sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ libloading_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "libloading";
+ version = "0.4.3";
+ authors = [ "Simonas Kazlauskas " ];
+ sha256 = "1cgb6xbadm59gc3cq733wrzsp59914hrjam0fan5gn1z100b6319";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ log_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "log";
+ version = "0.3.9";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2";
+ inherit dependencies buildDependencies features;
+ };
+ log_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "log";
+ version = "0.4.0";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0d6m7c1cr6sj3kk47801zyjgnzyl94yh2ra9gxc3waljza7wvx92";
+ inherit dependencies buildDependencies features;
+ };
+ memchr_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "memchr";
+ version = "0.1.11";
+ authors = [ "Andrew Gallant " "bluss" ];
+ sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8";
+ inherit dependencies buildDependencies features;
+ };
+ nix_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "nix";
+ version = "0.6.0";
+ authors = [ "Carl Lerche " ];
+ sha256 = "1bgh75y897isnxbw3vd79vns9h6q4d59p1cgv9c4laysyw6fkqwf";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ nix_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "nix";
+ version = "0.9.0";
+ authors = [ "The nix-rust Project Developers" ];
+ sha256 = "00p63bphzwwn460rja5l2wcpgmv7ljf7illf6n95cppx63d180q0";
+ inherit dependencies buildDependencies features;
+ };
+ num_traits_0_1_41_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "num-traits";
+ version = "0.1.41";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "134gv890n1gv8v0jys55k0940gqp2hibgf1fs8q9jmyk2xp1jp9m";
+ inherit dependencies buildDependencies features;
+ };
+ ordermap_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "ordermap";
+ version = "0.3.2";
+ authors = [ "bluss" ];
+ sha256 = "13zw8i0gf3snihmg9xvd63sd3ffdhhv8bmgfwbwf4shqxh6h3sac";
+ inherit dependencies buildDependencies features;
+ };
+ petgraph_0_4_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "petgraph";
+ version = "0.4.10";
+ authors = [ "bluss" "mitchmindtree" ];
+ sha256 = "1fdh2hwkrbf716qxdiasjn8jspvshhykclj8mwafdd8h241159sj";
+ inherit dependencies buildDependencies features;
+ };
+ phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg";
+ libPath = "src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_codegen";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj";
+ inherit dependencies buildDependencies features;
+ };
+ phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_generator";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g";
+ inherit dependencies buildDependencies features;
+ };
+ phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "phf_shared";
+ version = "0.7.21";
+ authors = [ "Steven Fackler " ];
+ sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln";
+ libPath = "src/lib.rs";
+ inherit dependencies buildDependencies features;
+ };
+ pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "pkg-config";
+ version = "0.3.9";
+ authors = [ "Alex Crichton " ];
+ sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
+ inherit dependencies buildDependencies features;
+ };
+ rand_0_3_19_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rand";
+ version = "0.3.19";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "19zx65w7rrrfnjifmjp2i80w9bc6ld7pcwnk5hmr9xszmmvhk8zp";
+ inherit dependencies buildDependencies features;
+ };
+ regex_0_1_80_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "regex";
+ version = "0.1.80";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6";
+ inherit dependencies buildDependencies features;
+ };
+ regex_syntax_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "regex-syntax";
+ version = "0.3.9";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
+ inherit dependencies buildDependencies features;
+ };
+ rlua_0_9_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rlua";
+ version = "0.9.7";
+ authors = [ "kyren " ];
+ sha256 = "1671b5ga54aq49sqx69hvnjr732hf9jpqwswwxgpcqq8q05mfzgp";
+ inherit dependencies buildDependencies features;
+ };
+ rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rustc-serialize";
+ version = "0.3.24";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn";
+ inherit dependencies buildDependencies features;
+ };
+ rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rustc_version";
+ version = "0.1.7";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
+ inherit dependencies buildDependencies features;
+ };
+ rustwlc_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "rustwlc";
+ version = "0.7.0";
+ authors = [ "Snirk Immington " "Timidger " ];
+ sha256 = "0gqi9pdw74al33ja25h33q68vnfklj3gpjgkiqqbr3gflgli5h1i";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "semver";
+ version = "0.1.20";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
+ inherit dependencies buildDependencies features;
+ };
+ serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "serde";
+ version = "0.9.15";
+ authors = [ "Erick Tryzelaar " ];
+ sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b";
+ inherit dependencies buildDependencies features;
+ };
+ serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "serde_json";
+ version = "0.9.10";
+ authors = [ "Erick Tryzelaar " ];
+ sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005";
+ inherit dependencies buildDependencies features;
+ };
+ siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "siphasher";
+ version = "0.2.2";
+ authors = [ "Frank Denis " ];
+ sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr";
+ inherit dependencies buildDependencies features;
+ };
+ target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "target_build_utils";
+ version = "0.3.1";
+ authors = [ "Simonas Kazlauskas " ];
+ sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ thread_id_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "thread-id";
+ version = "2.0.0";
+ authors = [ "Ruud van Asseldonk " ];
+ sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3";
+ inherit dependencies buildDependencies features;
+ };
+ thread_local_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "thread_local";
+ version = "0.2.7";
+ authors = [ "Amanieu d'Antras " ];
+ sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7";
+ inherit dependencies buildDependencies features;
+ };
+ token_store_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "token_store";
+ version = "0.1.2";
+ authors = [ "Victor Berger " ];
+ sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq";
+ inherit dependencies buildDependencies features;
+ };
+ utf8_ranges_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "utf8-ranges";
+ version = "0.1.3";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
+ inherit dependencies buildDependencies features;
+ };
+ uuid_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "uuid";
+ version = "0.3.1";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "16ak1c84dfkd8h33cvkxrkvc30k7b0bhrnza8ni2c0jsx85fpbip";
+ inherit dependencies buildDependencies features;
+ };
+ void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "void";
+ version = "1.0.2";
+ authors = [ "Jonathan Reem " ];
+ sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
+ inherit dependencies buildDependencies features;
+ };
+ way_cooler_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "way-cooler";
+ version = "0.8.0";
+ authors = [ "Snirk Immington " "Timidger " ];
+ sha256 = "1xg7sg0ssc7a8nx7g6pjdfz9ndf0l7p2n0ydh3sqym3k5ifxi965";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_scanner_0_12_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-scanner";
+ version = "0.12.4";
+ authors = [ "Victor Berger " ];
+ sha256 = "043s30i7da64a7inmwiib36ax681vw7zr0pfl54alcyc6pgyanb1";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_server_0_12_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-server";
+ version = "0.12.4";
+ authors = [ "Victor Berger " ];
+ sha256 = "0m8565848l8f1h3mwlyxy3nfqv11vpl50y9qcpmp60hw8w2vw124";
+ build = "build.rs";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-sys";
+ version = "0.6.0";
+ authors = [ "Victor Berger " ];
+ sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_sys_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-sys";
+ version = "0.9.10";
+ authors = [ "Victor Berger " ];
+ sha256 = "011q7lfii222whvif39asvryl1sf3rc1fxp8qs8gh84kr4mna0k8";
+ inherit dependencies buildDependencies features;
+ };
+ wayland_sys_0_12_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "wayland-sys";
+ version = "0.12.4";
+ authors = [ "Victor Berger " ];
+ sha256 = "1q9qyjl6bz356kh50lzvk48qbs87zbaqh5mhm6nlngkg1qrbvi6c";
+ inherit dependencies buildDependencies features;
+ };
+ winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "winapi";
+ version = "0.2.8";
+ authors = [ "Peter Atashian " ];
+ sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
+ inherit dependencies buildDependencies features;
+ };
+ winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+ crateName = "winapi-build";
+ version = "0.1.1";
+ authors = [ "Peter Atashian